diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index f3b64a562d..4344d2899e 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1088,10 +1088,9 @@ 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);
+                                db.folder().setFolderError(folder.id, Log.formatThrowable(ex));
+                                db.folder().setFolderSynchronize(folder.id, false);
                                 continue;
                             } catch (Throwable ex) {
                                 db.folder().setFolderError(folder.id, Log.formatThrowable(ex));