diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index fa8d7c933e..4e4038362c 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1628,7 +1628,14 @@ class Core {
             } else {
                 if (EntityFolder.DRAFTS.equals(folder.type))
                     drafts = true;
-                if (!folder.local) {
+
+                if (folder.local) {
+                    if (!EntityFolder.DRAFTS.equals(folder.type)) {
+                        List<Long> ids = db.message().getMessageByFolder(folder.id);
+                        if (ids == null || ids.size() == 0)
+                            db.folder().deleteFolder(folder.id);
+                    }
+                } else {
                     local.put(folder.name, folder);
                     if (folder.synchronize && folder.initialize != 0)
                         sync_folders = true;