diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 2ea33a97fc..5889d6db7c 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -228,6 +228,7 @@ public class Log {
 
         ignore.add("com.sun.mail.util.MailConnectException");
 
+        ignore.add("android.accounts.AuthenticatorException");
         ignore.add("android.accounts.OperationCanceledException");
         ignore.add("android.app.RemoteServiceException");
 
@@ -242,10 +243,11 @@ public class Log {
         ignore.add("java.net.UnknownHostException");
 
         ignore.add("javax.mail.AuthenticationFailedException");
-        ignore.add("javax.mail.FolderClosedException");
         ignore.add("javax.mail.internet.AddressException");
         ignore.add("javax.mail.MessageRemovedException");
+        ignore.add("javax.mail.FolderNotFoundException");
         ignore.add("javax.mail.ReadOnlyFolderException");
+        ignore.add("javax.mail.FolderClosedException");
         ignore.add("javax.mail.StoreClosedException");
 
         ignore.add("org.xmlpull.v1.XmlPullParserException");
@@ -295,7 +297,8 @@ public class Log {
                     return false;
 
                 if (ex instanceof IOException &&
-                        "Resetting to invalid mark".equals(ex.getMessage()))
+                        ("NetworkError".equals(ex.getMessage()) || // account manager
+                                "Resetting to invalid mark".equals(ex.getMessage())))
                     return false;
 
                 // Rate limit