diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index 3ea99a2ef7..55a4a92da1 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -714,6 +714,9 @@ public class EmailService implements AutoCloseable {
             crumb.put("exception", ex + "\n" + android.util.Log.getStackTraceString(ex));
             Log.breadcrumb("Connection failed", crumb);
 
+            if (ex.getMessage() != null && ex.getMessage().contains("Session invalidated"))
+                throw new AuthenticationFailedException("Session invalidated", ex);
+
             /*
                 com.sun.mail.util.MailConnectException: Couldn't connect to host, port: 74.125.140.108, 993; timeout 20000;
                   nested exception is: