diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index d86a7e3e9d..99ab0f98dc 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -794,6 +794,10 @@ class Core {
                             db.folder().setFolderType(folder.id, type);
                         else if (EntityFolder.SYSTEM.equals(folder.type) && EntityFolder.USER.equals(type))
                             db.folder().setFolderType(folder.id, type);
+                        else if (EntityFolder.INBOX.equals(type) && !EntityFolder.INBOX.equals(folder.type)) {
+                            if (db.folder().getFolderByType(folder.account, EntityFolder.INBOX) == null)
+                                db.folder().setFolderType(folder.id, type);
+                        }
                     }
                 }
             }