diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 060b918694..46f20dd8f8 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2246,7 +2246,8 @@ class Core {
 
         void error(Throwable ex) {
             if (ex instanceof MessagingException &&
-                    (ex.getCause() instanceof SocketException ||
+                    ("connection failure".equals(ex.getMessage()) ||
+                            ex.getCause() instanceof SocketException ||
                             ex.getCause() instanceof ConnectionException))
                 recoverable = false;