diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 3695f4a3df..b9ac941a32 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -441,6 +441,9 @@ public interface DaoMessage {
     @Query("UPDATE message SET received = :sent, sent = :sent WHERE id = :id")
     int setMessageSent(long id, Long sent);
 
+    @Query("UPDATE message SET error = :warning WHERE id = :id")
+    int setMessageWarning(long id, String warning);
+
     @Query("UPDATE message SET error = :error WHERE id = :id")
     int setMessageError(long id, String error);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 2fc3b6aa6a..19efeac4bf 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4175,7 +4175,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             else if (sresult == RESULT_VALID_KEY_CONFIRMED)
                                 Snackbar.make(view, R.string.title_signature_valid, Snackbar.LENGTH_LONG).show();
                             else
-                                db.message().setMessageError(id, getString(R.string.title_signature_invalid));
+                                db.message().setMessageWarning(id, getString(R.string.title_signature_invalid));
 
                             break;