diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js
index 20a1c5508..614bc33e0 100644
--- a/dev/Model/FolderCollection.js
+++ b/dev/Model/FolderCollection.js
@@ -273,7 +273,7 @@ export class FolderCollectionModel extends AbstractCollectionModel
 		// 'THREAD=REFS', 'THREAD=REFERENCES', 'THREAD=ORDEREDSUBJECT'
 		AppUserStore.threadsAllowed(!!this.capabilities.some(capa => capa.startsWith('THREAD=')));
 
-//		FolderUserStore.folderListOptimized(!!this.optimized);
+//		FolderUserStore.optimized(!!this.optimized);
 		FolderUserStore.quotaUsage(this.quotaUsage);
 		FolderUserStore.quotaLimit(this.quotaLimit);
 		FolderUserStore.capabilities(this.capabilities);
diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index a7cb877c2..fa6693db6 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -41,7 +41,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 
 		this.displaySpecSetting = FolderUserStore.displaySpecSetting;
 		this.folderList = FolderUserStore.folderList;
-		this.folderListOptimized = FolderUserStore.folderListOptimized;
+		this.folderListOptimized = FolderUserStore.optimized;
 		this.folderListError = FolderUserStore.folderListError;
 		this.hideUnsubscribed = SettingsUserStore.hideUnsubscribed;
 		this.unhideKolabFolders = SettingsUserStore.unhideKolabFolders;
diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js
index 36ea0da3f..50105e1f5 100644
--- a/dev/Stores/User/Folder.js
+++ b/dev/Stores/User/Folder.js
@@ -70,7 +70,7 @@ FolderUserStore = new class {
 			trashFolder: '',
 			archiveFolder: '',
 
-			folderListOptimized: false,
+			optimized: false,
 			folderListError: '',
 
 			foldersLoading: false,