diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index cab4a29749..105e2d1893 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -499,6 +499,11 @@ public class Log {
                     ex.getCause() instanceof SocketException)
                 return null;
 
+            if (ex instanceof MessagingException &&
+                    ("connection failure".equals(ex.getMessage()) ||
+                            "failed to create new store connection".equals(ex.getMessage())))
+                return null;
+
             if (ex instanceof MessagingException &&
                     ex.getCause() instanceof ConnectionException &&
                     ex.getCause().getMessage() != null &&