diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index 3f3004d796..463b821a96 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -460,17 +460,10 @@ public class EmailService implements AutoCloseable {
                             context.getString(R.string.title_service_auth, msg),
                             ex.getNextException());
                 }
-            } else if (purpose == PURPOSE_CHECK) {
-                String msg = ex.getMessage();
-                if (msg != null)
-                    msg = msg.trim();
-                if (TextUtils.isEmpty(msg))
-                    throw ex;
-                throw new AuthenticationFailedException(
-                        context.getString(R.string.title_service_auth, msg),
-                        ex.getNextException());
             } else
-                throw ex;
+                throw new AuthenticationFailedException(
+                        context.getString(R.string.title_service_auth, ex.getMessage()),
+                        ex.getNextException());
         } catch (MailConnectException ex) {
             if (ConnectionHelper.vpnActive(context)) {
                 MailConnectException mex = new MailConnectException(