diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index fae0826dd2..197d9cd6ef 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -99,6 +99,7 @@ import javax.mail.MessagingException;
 import javax.mail.Part;
 import javax.mail.StoreClosedException;
 import javax.mail.internet.InternetAddress;
+import javax.net.ssl.SSLPeerUnverifiedException;
 
 public class Log {
     private static final int MAX_CRASH_REPORTS = 5;
@@ -304,6 +305,10 @@ public class Log {
                                 "Resetting to invalid mark".equals(ex.getMessage())))
                     return false;
 
+                if (ex instanceof SSLPeerUnverifiedException ||
+                        ex instanceof EmailService.UntrustedException)
+                    return false;
+
                 // Rate limit
                 int count = prefs.getInt("crash_report_count", 0) + 1;
                 prefs.edit().putInt("crash_report_count", count).apply();