diff --git a/app/src/main/java/eu/faircode/email/MailService.java b/app/src/main/java/eu/faircode/email/MailService.java
index 0e42e94740..7e88157602 100644
--- a/app/src/main/java/eu/faircode/email/MailService.java
+++ b/app/src/main/java/eu/faircode/email/MailService.java
@@ -23,7 +23,6 @@ import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.security.GeneralSecurityException;
-import java.security.KeyStore;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
@@ -49,7 +48,6 @@ import javax.mail.Session;
 import javax.mail.Store;
 import javax.mail.event.StoreListener;
 import javax.net.ssl.SSLSocket;
-import javax.net.ssl.TrustManagerFactory;
 
 public class MailService implements AutoCloseable {
     private Context context;
@@ -131,10 +129,6 @@ public class MailService implements AutoCloseable {
                 }
             };
 
-            TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            tmf.init((KeyStore) null);
-            sf.setTrustManagers(tmf.getTrustManagers());
-
             properties.put("mail." + protocol + ".ssl.socketFactory", sf);
             properties.put("mail." + protocol + ".socketFactory.fallback", "false");
         } catch (GeneralSecurityException ex) {