diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 454d61792d..51576be7f5 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -263,7 +263,7 @@ class Core {
                         reportError(context, account, folder, ex);
 
                         db.operation().setOperationError(op.id, Helper.formatThrowable(ex));
-                        if (message != null)
+                        if (message != null && !(ex instanceof IllegalArgumentException))
                             db.message().setMessageError(message.id, Helper.formatThrowable(ex, true));
 
                         if (ex instanceof OutOfMemoryError ||