diff --git a/src/core/imap/MCIMAPSession.cpp b/src/core/imap/MCIMAPSession.cpp
index e72576d1d..a1b2ef44e 100644
--- a/src/core/imap/MCIMAPSession.cpp
+++ b/src/core/imap/MCIMAPSession.cpp
@@ -669,18 +669,24 @@ void IMAPSession::connect(ErrorCode * pError)
             * pError = ErrorTLSNotAvailable;
             goto close;
         }
+        if (!checkCertificate()) {
+            MCLog("StartTLS ssl connect certificate ERROR %d", r);
+            * pError = ErrorCertificate;
+            goto close;
+        }
+
         break;
 
         case ConnectionTypeTLS:
         r = mailimap_ssl_connect_voip(mImap, MCUTF8(mHostname), mPort, isVoIPEnabled());
-        MCLog("ssl connect %s %u %u", MCUTF8(mHostname), mPort, r);
+        MCLog("TLS ssl connect %s %u %u", MCUTF8(mHostname), mPort, r);
         if (hasError(r)) {
             MCLog("connect error %i", r);
             * pError = ErrorConnection;
             goto close;
         }
         if (!checkCertificate()) {
-            MCLog("ssl connect certificate ERROR %d", r);
+            MCLog("TLS ssl connect certificate ERROR %d", r);
             * pError = ErrorCertificate;
             goto close;
         }