diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index db83769a6e..b14f18eb7d 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -264,7 +264,7 @@ class Core {
                         Log.e(folder.name, ex);
                         reportError(context, account, folder, ex);
 
-                        db.operation().setOperationError(op.id, Helper.formatThrowable(ex));
+                        db.operation().setOperationError(op.id, Helper.formatThrowable(ex, true));
                         if (message != null && !(ex instanceof IllegalArgumentException))
                             db.message().setMessageError(message.id, Helper.formatThrowable(ex, true));
 
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 674c536e49..e207d7a196 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -376,11 +376,10 @@ public class Helper {
                 return null;
             if (ex instanceof FolderClosedException)
                 return null;
-            if (ex instanceof IllegalStateException)
-                // sync when store disconnected
+            if (ex instanceof IllegalStateException &&
+                    ("Not connected".equals(ex.getMessage()) ||
+                            "This operation is not allowed on a closed folder".equals(ex.getMessage())))
                 return null;
-            //if (ex instanceof SSLException || ex.getCause() instanceof SSLException)
-            //    return null;
             if (ex instanceof MailConnectException && ex.getCause() instanceof UnknownHostException)
                 return null;
         }