diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 1c6763c94f..0d88d4ef12 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -2030,6 +2030,8 @@ public class ServiceSynchronize extends LifecycleService {
                             db.folder().setFolderType(folder.id, EntityFolder.USER);
                         if (EntityFolder.USER.equals(folder.type) && EntityFolder.SYSTEM.equals(type))
                             db.folder().setFolderType(folder.id, type);
+                        if (EntityFolder.SYSTEM.equals(folder.type) && EntityFolder.USER.equals(type))
+                            db.folder().setFolderType(folder.id, type);
                     }
                 }
             }