diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index a3f587c1ca..7074f091b3 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -633,6 +633,8 @@ public class EmailService implements AutoCloseable {
     }
 
     static String getDefaultEhlo() {
+        if (BuildConfig.APPLICATION_ID.startsWith("eu.faircode.email"))
+            return "dummy.faircode.eu";
         String[] c = BuildConfig.APPLICATION_ID.split("\\.");
         Collections.reverse(Arrays.asList(c));
         return TextUtils.join(".", c);