diff --git a/app/src/main/java/eu/faircode/email/CharsetHelper.java b/app/src/main/java/eu/faircode/email/CharsetHelper.java
index 5ccd124e81..84dafc6db5 100644
--- a/app/src/main/java/eu/faircode/email/CharsetHelper.java
+++ b/app/src/main/java/eu/faircode/email/CharsetHelper.java
@@ -82,7 +82,7 @@ class CharsetHelper {
                     "UTF-8".equals(detected))
                 Log.w("compact_enc_det result=" + detected);
             else
-                // ISO-2022-JP, ISO-8859-2, windows-1250, windows-1257
+                // ISO-2022-JP, ISO-8859-2, windows-1250, windows-1252, windows-1257
                 Log.e("compact_enc_det result=" + detected);
 
             return Charset.forName(detected);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 2985683219..c1ac4d72de 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1088,6 +1088,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                     throw ex1;
                                 }
                             } catch (FolderNotFoundException ex) {
+                                if ("INBOX".equalsIgnoreCase(folder.name))
+                                    throw ex;
                                 Log.w(folder.name, ex);
                                 db.folder().deleteFolder(folder.id);
                                 continue;