diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index 38ebc497ce..6dbdc5f989 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -170,11 +170,9 @@ public class EmailService implements AutoCloseable {
         if (!auth_login)
             properties.put("mail." + protocol + ".auth.login.disable", "true");
 
-        properties.put("mail." + protocol + ".sasl.enable", "true");
-        if (auth_sasl) {
-            properties.put("mail." + protocol + ".sasl.mechanisms", "CRAM-MD5");
-            properties.put("mail." + protocol + ".sasl.realm", realm == null ? "" : realm);
-        }
+        properties.put("mail." + protocol + ".sasl.enable", Boolean.toString(auth_sasl));
+        properties.put("mail." + protocol + ".sasl.mechanisms", "CRAM-MD5");
+        properties.put("mail." + protocol + ".sasl.realm", realm == null ? "" : realm);
         properties.put("mail." + protocol + ".auth.ntlm.domain", realm == null ? "" : realm);
 
         // writetimeout: one thread overhead