diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js
index 614bc33e0..52cda31e5 100644
--- a/dev/Model/FolderCollection.js
+++ b/dev/Model/FolderCollection.js
@@ -505,7 +505,7 @@ export class FolderModel extends AbstractModel {
 					}
 				})
 				.catch(error => {
-					FolderUserStore.folderListError(
+					FolderUserStore.error(
 						getNotification(error.code, '', Notifications.CantRenameFolder)
 						+ '.\n' + error.message);
 				});
diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index fa6693db6..418113cb6 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -42,7 +42,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 		this.displaySpecSetting = FolderUserStore.displaySpecSetting;
 		this.folderList = FolderUserStore.folderList;
 		this.folderListOptimized = FolderUserStore.optimized;
-		this.folderListError = FolderUserStore.folderListError;
+		this.folderListError = FolderUserStore.error;
 		this.hideUnsubscribed = SettingsUserStore.hideUnsubscribed;
 		this.unhideKolabFolders = SettingsUserStore.unhideKolabFolders;
 
@@ -55,7 +55,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 	}
 
 	onShow() {
-		FolderUserStore.folderListError('');
+		FolderUserStore.error('');
 	}
 /*
 	onBuild(oDom) {
@@ -75,7 +75,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 		 && folderToRemove.askDelete()
 		) {
 			if (0 < folderToRemove.totalEmails()) {
-//				FolderUserStore.folderListError(getNotification(Notifications.CantDeleteNonEmptyFolder));
+//				FolderUserStore.error(getNotification(Notifications.CantDeleteNonEmptyFolder));
 				folderToRemove.errorMsg(getNotification(Notifications.CantDeleteNonEmptyFolder));
 			} else {
 				folderForDeletion(null);
@@ -96,7 +96,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 								}
 							},
 							error => {
-								FolderUserStore.folderListError(
+								FolderUserStore.error(
 									getNotification(error.code, '', Notifications.CantDeleteFolder)
 									+ '.\n' + error.message
 								);
@@ -108,7 +108,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 	}
 
 	hideError() {
-		this.folderListError('');
+		this.error('');
 	}
 
 	toggleFolderKolabType(folder, event) {
diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js
index 50105e1f5..283329fdd 100644
--- a/dev/Stores/User/Folder.js
+++ b/dev/Stores/User/Folder.js
@@ -71,7 +71,7 @@ FolderUserStore = new class {
 			archiveFolder: '',
 
 			optimized: false,
-			folderListError: '',
+			error: '',
 
 			foldersLoading: false,
 			foldersCreating: false,
diff --git a/dev/View/Popup/FolderCreate.js b/dev/View/Popup/FolderCreate.js
index 4618ef7b8..6b33d5a44 100644
--- a/dev/View/Popup/FolderCreate.js
+++ b/dev/View/Popup/FolderCreate.js
@@ -63,7 +63,7 @@ export class FolderCreatePopupView extends AbstractViewPopup {
 */
 					},
 					error => {
-						FolderUserStore.folderListError(
+						FolderUserStore.error(
 							getNotification(error.code, '', Notifications.CantCreateFolder)
 							+ '.\n' + error.message);
 					}