diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index fdd11d4119..aede3bd0fb 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -216,12 +216,8 @@ class Core {
                         reportError(context, account, folder, ex);
 
                         db.operation().setOperationError(op.id, Helper.formatThrowable(ex));
-
-                        if (message != null &&
-                                !(ex instanceof MessageRemovedException) &&
-                                !(ex instanceof FolderClosedException) &&
-                                !(ex instanceof IllegalStateException))
-                            db.message().setMessageError(message.id, Helper.formatThrowable(ex));
+                        if (message != null)
+                            db.message().setMessageError(message.id, Helper.formatThrowable(ex, true));
 
                         if (ex instanceof MessageRemovedException ||
                                 ex instanceof FolderNotFoundException ||
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 7862259e61..2dd2c143c7 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -307,8 +307,8 @@ public class Helper {
             if (ex instanceof IllegalStateException)
                 // sync when store disconnected
                 return null;
-            if (ex instanceof SSLException || ex.getCause() instanceof SSLException)
-                return null;
+            //if (ex instanceof SSLException || ex.getCause() instanceof SSLException)
+            //    return null;
             if (ex instanceof MailConnectException && ex.getCause() instanceof UnknownHostException)
                 return null;
         }