diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index 79e15fd742..e67ffa11b3 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -117,11 +117,8 @@ public class EmailService implements AutoCloseable {
     private static final Pattern SSL_CIPHER_BLACKLIST =
             Pattern.compile(".*(_DES|DH_|DSS|EXPORT|MD5|NULL|RC4|TLS_FALLBACK_SCSV).*");
 
-    // TLS_FALLBACK_SCSV
-    // TLS_EMPTY_RENEGOTIATION_INFO_SCSV
-    // https://security.stackexchange.com/questions/112531/is-tls-fallback-scsv-useless-if-only-tls-1-0-1-1-1-2-is-supported
-    // https://en.wikipedia.org/wiki/POODLE
-    // https://tools.ietf.org/html/rfc5746
+    // TLS_FALLBACK_SCSV https://tools.ietf.org/html/rfc7507
+    // TLS_EMPTY_RENEGOTIATION_INFO_SCSV https://tools.ietf.org/html/rfc5746
 
     private EmailService() {
         // Prevent instantiation
@@ -794,7 +791,7 @@ public class EmailService implements AutoCloseable {
                         secure ? sslSocket.getEnabledCipherSuites() : sslSocket.getSupportedCipherSuites()) {
                     if (secure && harden && SSL_CIPHER_BLACKLIST.matcher(cipher).matches())
                         Log.i("SSL disabling cipher=" + cipher);
-                    else
+                    else if (secure || !cipher.endsWith("_SCSV"))
                         ciphers.add(cipher);
                 }
                 Log.i("SSL ciphers=" + TextUtils.join(",", ciphers));