diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index fd5c95c2b3..c896931079 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2992,10 +2992,7 @@ class Core {
                 try {
                     db.beginTransaction();
 
-                    if (EntityFolder.INBOX.equals(type)) // Case insensitive
-                        folder = db.folder().getFolderByType(account.id, type);
-                    else
-                        folder = db.folder().getFolderByName(account.id, fullName);
+                    folder = db.folder().getFolderByName(account.id, fullName);
                     if (folder == null) {
                         EntityFolder parent = null;
                         char separator = ifolder.first.getSeparator();
@@ -3039,12 +3036,6 @@ class Core {
                         if (!Objects.equals(type, folder.type))
                             EntityLog.log(context, "Folder name=" + folder.name + " type old=" + folder.type + " new=" + type);
 
-                        if (EntityFolder.INBOX.equals(folder.type) &&
-                                !Objects.equals(fullName, folder.name)) {
-                            folder.name = fullName;
-                            db.folder().setFolderName(folder.id, folder.name);
-                        }
-
                         folder.namespace = ifolder.first.getFullName();
                         folder.separator = ifolder.first.getSeparator();
                         db.folder().setFolderNamespace(folder.id, folder.namespace, folder.separator);