diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index ef1b397b63..792d8c53da 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -502,6 +502,8 @@ public class EmailService implements AutoCloseable {
                     }
                 } catch (MessagingException ex) {
                     Log.w(ex);
+                    if (purpose == PURPOSE_CHECK)
+                        throw ex;
                 }
 
         } else if ("smtp".equals(protocol) || "smtps".equals(protocol)) {