diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 867c66dab6..f2693ddc09 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -62,6 +62,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.concurrent.TimeoutException;
 
 import javax.mail.MessagingException;
 
@@ -380,6 +381,11 @@ public class ApplicationEx extends Application {
         if (ex instanceof RemoteException)
             return false;
 
+        if (ex instanceof TimeoutException &&
+                ex.getMessage() != null &&
+                ex.getMessage().startsWith("com.sun.mail.imap.IMAPStore.finalize"))
+            return false;
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
             if (ex instanceof RuntimeException && ex.getCause() instanceof DeadSystemException)
                 return false;