diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index b04c78c9bc..a1edb1493c 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -199,7 +199,10 @@ public class ApplicationEx extends Application {
 
                     if (ex instanceof MessagingException &&
                             ("connection failure".equals(ex.getMessage()) ||
-                                    "failed to create new store connection".equals(ex.getMessage())))
+                                    "failed to create new store connection".equals(ex.getMessage()) ||
+                                    "Failed to fetch headers".equals(ex.getMessage()) ||
+                                    "Failed to load IMAP envelope".equals(ex.getMessage()) ||
+                                    "Unable to load BODYSTRUCTURE".equals(ex.getMessage())))
                         return false;
 
                     if (ex instanceof IllegalStateException &&