diff --git a/app/src/main/java/eu/faircode/email/MailService.java b/app/src/main/java/eu/faircode/email/MailService.java
index 9477f84a47..5c9e0f2e95 100644
--- a/app/src/main/java/eu/faircode/email/MailService.java
+++ b/app/src/main/java/eu/faircode/email/MailService.java
@@ -206,9 +206,9 @@ public class MailService implements AutoCloseable {
                         }
 
                     throw new IllegalArgumentException("Account not found");
-                } catch (Throwable ex1) {
+                } catch (Exception ex1) {
                     Log.e(ex1);
-                    throw ex;
+                    throw new AuthenticationFailedException(ex.getMessage(), ex1);
                 }
             else
                 throw ex;