diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 0b843aa191..a4b35a86c4 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -589,10 +589,11 @@ class Core {
                             op.error = Log.formatThrowable(ex, !EntityOperation.BODY.equals(op.name));
                             db.operation().setOperationError(op.id, op.error);
 
-                            if (message != null &&
+                            if (message != null && op.error != null &&
                                     !EntityOperation.FETCH.equals(op.name) &&
                                     !EntityOperation.ATTACHMENT.equals(op.name) &&
-                                    !(ex instanceof IllegalArgumentException))
+                                    !(ex instanceof IllegalArgumentException) &&
+                                    !(account.isGmail() && op.error.toLowerCase(Locale.ROOT).contains("system error")))
                                 db.message().setMessageError(message.id, op.error);
 
                             db.setTransactionSuccessful();
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 80ae778565..aaa0457aa3 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -1559,10 +1559,6 @@ public class Log {
                             ex.getCause().getMessage().contains("Socket is closed")))
                 return null;
 
-            if ((ex instanceof MessagingException || ex instanceof ProtocolException) &&
-                    ex.getMessage() != null && ex.getMessage().contains("System Error (Failure)"))
-                return null; // Gmail
-
             // javax.mail.MessagingException: AU3 BAD User is authenticated but not connected.;
             //   nested exception is:
             //  com.sun.mail.iap.BadCommandException: AU3 BAD User is authenticated but not connected.