diff --git a/app/src/main/java/eu/faircode/email/MailService.java b/app/src/main/java/eu/faircode/email/MailService.java
index 0a4f810527..7e88157602 100644
--- a/app/src/main/java/eu/faircode/email/MailService.java
+++ b/app/src/main/java/eu/faircode/email/MailService.java
@@ -113,13 +113,13 @@ public class MailService implements AutoCloseable {
                             if (matches(server, name))
                                 trusted = true;
 
+                        if (getFingerPrint(certificate).equals(trustedFingerprint))
+                            trusted = true;
+
                         if (!trusted)
                             Log.e("Certificate mismatch" +
                                     " server=" + server + " names=" + TextUtils.join(",", names));
 
-                        if (getFingerPrint(certificate).equals(trustedFingerprint))
-                            trusted = true;
-
                         Log.i("Is trusted? server=" + server + " trusted=" + trusted);
                         return trusted;
                     } catch (Throwable ex) {