diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 1d779e17e6..c896931079 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -562,6 +562,12 @@ class Core {
                     } catch (Throwable ex) {
                         iservice.dump(account.name + "/" + folder.name);
                         if (ex instanceof OperationCanceledException ||
+                                (ex instanceof IOException &&
+                                        "NIL".equals(ex.getMessage())) ||
+                                (ex instanceof IOException &&
+                                        context.getString(R.string.app_cake).equals(ex.getMessage())) ||
+                                (ex instanceof MessagingException &&
+                                        "Cannot load header".equals(ex.getMessage())) ||
                                 (ex instanceof IllegalArgumentException &&
                                         ex.getMessage() != null &&
                                         ex.getMessage().startsWith("Message not found for")))
@@ -720,7 +726,10 @@ class Core {
                                     (op.tries > 1 ||
                                             ex.getCause() instanceof BadCommandException ||
                                             ex.getCause() instanceof CommandFailedException))
-                                Log.e(new Throwable(msg, ex));
+                                if (BuildConfig.PLAY_STORE_RELEASE)
+                                    Log.i(new Throwable(msg, ex));
+                                else
+                                    Log.e(new Throwable(msg, ex));
 
                             try {
                                 db.beginTransaction();
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 9786988712..23777dbd69 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -5639,7 +5639,10 @@ public class MessageHelper {
 
             return count;
         } catch (Throwable ex) {
-            Log.e(ex);
+            if (BuildConfig.PLAY_STORE_RELEASE)
+                Log.i(ex);
+            else
+                Log.e(ex);
             return -1;
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 211040f397..89bc066735 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -2349,7 +2349,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
 
                                                                 try {
                                                                     ifolder = iservice.getStore().getFolder(folder.name);
-                                                                } catch (IllegalStateException ex) {
+                                                                } catch (IllegalStateException | MessagingException ex) {
                                                                     if ("Not connected".equals(ex.getMessage())) {
                                                                         Log.i(ex);
                                                                         return; // Store closed
diff --git a/app/src/main/java/eu/faircode/email/UnknownCharsetProvider.java b/app/src/main/java/eu/faircode/email/UnknownCharsetProvider.java
index 2d66225d83..70231133ce 100644
--- a/app/src/main/java/eu/faircode/email/UnknownCharsetProvider.java
+++ b/app/src/main/java/eu/faircode/email/UnknownCharsetProvider.java
@@ -99,7 +99,10 @@ public class UnknownCharsetProvider extends CharsetProvider {
             String jname = MimeUtility.javaCharset(name);
             return Charset.forName(jname);
         } catch (Throwable ex) {
-            Log.e("Unknown charset " + name, ex);
+            if (BuildConfig.PLAY_STORE_RELEASE)
+                Log.i("Unknown charset " + name, ex);
+            else
+                Log.e("Unknown charset " + name, ex);
             return null;
         }
     }