diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index 4eaba7d2c7..20f219e11c 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -349,6 +349,11 @@ public class EmailService implements AutoCloseable {
                 throw mex;
             } else
                 throw ex;
+        } catch (MessagingException ex) {
+            if (port == 995 && !("pop3".equals(protocol) || "pop3s".equals(protocol)))
+                throw new MessagingException("Please double check the port number", ex);
+            else
+                throw ex;
         }
     }