diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index c45333ecd..2ba3246d2 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -21,7 +21,6 @@
 	 */
 	function FoldersUserSettings()
 	{
-		this.foldersListError = Data.foldersListError;
 		this.folderList = Data.folderList;
 
 		this.processText = ko.computed(function () {
@@ -105,7 +104,7 @@
 				Data.foldersRenaming(false);
 				if (Enums.StorageResultType.Success !== sResult || !oData || !oData.Result)
 				{
-					Data.foldersListError(
+					Data.folderList.error(
 						oData && oData.ErrorCode ? Utils.getNotification(oData.ErrorCode) : Utils.i18n('NOTIFICATIONS/CANT_RENAME_FOLDER'));
 				}
 
@@ -131,7 +130,7 @@
 
 	FoldersUserSettings.prototype.onShow = function ()
 	{
-		Data.foldersListError('');
+		Data.folderList.error('');
 	};
 
 	FoldersUserSettings.prototype.createFolder = function ()
@@ -176,7 +175,7 @@
 					Data.foldersDeleting(false);
 					if (Enums.StorageResultType.Success !== sResult || !oData || !oData.Result)
 					{
-						Data.foldersListError(
+						Data.folderList.error(
 							oData && oData.ErrorCode ? Utils.getNotification(oData.ErrorCode) : Utils.i18n('NOTIFICATIONS/CANT_DELETE_FOLDER'));
 					}
 
@@ -189,7 +188,7 @@
 		}
 		else if (0 < oFolderToRemove.privateMessageCountAll())
 		{
-			Data.foldersListError(Utils.getNotification(Enums.Notification.CantDeleteNonEmptyFolder));
+			Data.folderList.error(Utils.getNotification(Enums.Notification.CantDeleteNonEmptyFolder));
 		}
 	};
 
diff --git a/dev/Storage/User/Data.js b/dev/Storage/User/Data.js
index 485773641..563c2ca69 100644
--- a/dev/Storage/User/Data.js
+++ b/dev/Storage/User/Data.js
@@ -134,8 +134,8 @@
 		this.namespace = '';
 		this.folderList = ko.observableArray([]);
 		this.folderList.focused = ko.observable(false);
-
-		this.foldersListError = ko.observable('');
+		this.folderList.optimized = ko.observable(false);
+		this.folderList.error = ko.observable('');
 
 		this.foldersLoading = ko.observable(false);
 		this.foldersCreating = ko.observable(false);
diff --git a/dev/View/Popup/FolderCreate.js b/dev/View/Popup/FolderCreate.js
index 4eb7dd3a8..869e96998 100644
--- a/dev/View/Popup/FolderCreate.js
+++ b/dev/View/Popup/FolderCreate.js
@@ -83,7 +83,7 @@
 				}
 				else
 				{
-					Data.foldersListError(
+					Data.folderList.error(
 						oData && oData.ErrorCode ? Utils.getNotification(oData.ErrorCode) : Utils.i18n('NOTIFICATIONS/CANT_CREATE_FOLDER'));
 				}
 
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html
index c47bb9f27..8f7d4f516 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html
@@ -15,9 +15,14 @@
 		&nbsp;&nbsp;
 		<span class="i18n" data-i18n-text="SETTINGS_FOLDERS/BUTTON_SYSTEM"></span>
 	</a>
-	<div class="alert folders-list-error" data-bind="visible: '' !== foldersListError()">
-		<button type="button" class="close" data-bind="click: function () { foldersListError(''); }">&times;</button>
-		<span data-bind="text: foldersListError"></span>
+	<div class="alert folders-list-error" data-bind="visible: folderList.optimized">
+		<b class="i18n" data-i18n-text="SETTINGS_FOLDERS/TO_MANY_FOLDERS_DESC_1"></b>
+		<br />
+		<span class="i18n" data-i18n-text="SETTINGS_FOLDERS/TO_MANY_FOLDERS_DESC_2"></span>
+	</div>
+	<div class="alert folders-list-error" data-bind="visible: '' !== folderList.error()">
+		<button type="button" class="close" data-bind="click: function () { folderList.error(''); }">&times;</button>
+		<span data-bind="text: folderList.error"></span>
 	</div>
 	<div class="process-place" data-bind="style: {'visibility': visibility }">
 		<i class="icon-spinner animated"></i>
diff --git a/rainloop/v/0.0.0/langs/bg.ini b/rainloop/v/0.0.0/langs/bg.ini
index 1a0eef289..8c24d887b 100644
--- a/rainloop/v/0.0.0/langs/bg.ini
+++ b/rainloop/v/0.0.0/langs/bg.ini
@@ -470,6 +470,8 @@ CREATING_PROCESS = "Creating a folder"
 DELETING_PROCESS = "Deleting a folder"
 RENAMING_PROCESS = "Renaming a folder"
 DELETING_ASK = "Are you sure?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Списък с акаунти"
diff --git a/rainloop/v/0.0.0/langs/de.ini b/rainloop/v/0.0.0/langs/de.ini
index a3edc1e53..4ef3c72eb 100644
--- a/rainloop/v/0.0.0/langs/de.ini
+++ b/rainloop/v/0.0.0/langs/de.ini
@@ -470,6 +470,8 @@ CREATING_PROCESS = "Ordner wird angelegt"
 DELETING_PROCESS = "Ordner wird gelöscht"
 RENAMING_PROCESS = "Ordner wird umbenannt"
 DELETING_ASK = "Sind Sie sicher?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Liste der Konten"
diff --git a/rainloop/v/0.0.0/langs/en.ini b/rainloop/v/0.0.0/langs/en.ini
index 5f1a4a317..6eaa80e3e 100644
--- a/rainloop/v/0.0.0/langs/en.ini
+++ b/rainloop/v/0.0.0/langs/en.ini
@@ -484,6 +484,8 @@ CREATING_PROCESS = "Creating a folder"
 DELETING_PROCESS = "Deleting a folder"
 RENAMING_PROCESS = "Renaming a folder"
 DELETING_ASK = "Are you sure?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Account List"
diff --git a/rainloop/v/0.0.0/langs/es.ini b/rainloop/v/0.0.0/langs/es.ini
index 9c2be23a1..e8c7aebfc 100644
--- a/rainloop/v/0.0.0/langs/es.ini
+++ b/rainloop/v/0.0.0/langs/es.ini
@@ -469,6 +469,8 @@ CREATING_PROCESS = "Creando carpeta"
 DELETING_PROCESS = "Eliminado carpeta"
 RENAMING_PROCESS = "Renombrando carpeta"
 DELETING_ASK = "¿Está usted seguro?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Lista de cuentas"
diff --git a/rainloop/v/0.0.0/langs/fr.ini b/rainloop/v/0.0.0/langs/fr.ini
index e05b25184..0f7dae154 100644
--- a/rainloop/v/0.0.0/langs/fr.ini
+++ b/rainloop/v/0.0.0/langs/fr.ini
@@ -469,6 +469,8 @@ CREATING_PROCESS = "Création d'un dossier"
 DELETING_PROCESS = "Suppression d'un dossier"
 RENAMING_PROCESS = "Renommer un dossier"
 DELETING_ASK = "Êtes-vous sûr ?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Liste des comptes"
diff --git a/rainloop/v/0.0.0/langs/hu.ini b/rainloop/v/0.0.0/langs/hu.ini
index 9f31d218d..4550cc20f 100644
--- a/rainloop/v/0.0.0/langs/hu.ini
+++ b/rainloop/v/0.0.0/langs/hu.ini
@@ -468,7 +468,9 @@ LOADING_PROCESS = "Updating folder list"
 CREATING_PROCESS = "Creating a folder"
 DELETING_PROCESS = "Deleting a folder"
 RENAMING_PROCESS = "Renaming a folder"
-DELETING_ASK = "Biztosak vagyunk benneAre you sure?"
+DELETING_ASK = "Biztosak vagyunk benne?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Fiók lista"
diff --git a/rainloop/v/0.0.0/langs/is.ini b/rainloop/v/0.0.0/langs/is.ini
index 67e70b9e7..5e660a4ef 100644
--- a/rainloop/v/0.0.0/langs/is.ini
+++ b/rainloop/v/0.0.0/langs/is.ini
@@ -469,6 +469,8 @@ CREATING_PROCESS = "Bý til möppu"
 DELETING_PROCESS = "Eyði möppu"
 RENAMING_PROCESS = "Endurnefna möppu"
 DELETING_ASK = "Ertu viss?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Aðgangslisti"
diff --git a/rainloop/v/0.0.0/langs/it.ini b/rainloop/v/0.0.0/langs/it.ini
index edf0ca6a7..8d5bc5516 100644
--- a/rainloop/v/0.0.0/langs/it.ini
+++ b/rainloop/v/0.0.0/langs/it.ini
@@ -470,6 +470,8 @@ CREATING_PROCESS = "Creazione della cartella..."
 DELETING_PROCESS = "Cancellazione della cartella..."
 RENAMING_PROCESS = "Rinominazione della cartella..."
 DELETING_ASK = "Ne sei sicuro?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Lista degli account"
diff --git a/rainloop/v/0.0.0/langs/ja-jp.ini b/rainloop/v/0.0.0/langs/ja-jp.ini
index f4a449a08..251861bdd 100644
--- a/rainloop/v/0.0.0/langs/ja-jp.ini
+++ b/rainloop/v/0.0.0/langs/ja-jp.ini
@@ -469,6 +469,8 @@ CREATING_PROCESS = "Creating a folder"
 DELETING_PROCESS = "Deleting a folder"
 RENAMING_PROCESS = "Renaming a folder"
 DELETING_ASK = "Are you sure?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Account List"
diff --git a/rainloop/v/0.0.0/langs/ko-kr.ini b/rainloop/v/0.0.0/langs/ko-kr.ini
index c74432895..283d01038 100644
--- a/rainloop/v/0.0.0/langs/ko-kr.ini
+++ b/rainloop/v/0.0.0/langs/ko-kr.ini
@@ -466,6 +466,8 @@ CREATING_PROCESS = "폴더를 생성하고 있습니다."
 DELETING_PROCESS = "폴더를 삭제하고 있습니다."
 RENAMING_PROCESS = "폴더명을 변경하고 있습니다."
 DELETING_ASK = "정말로 삭제하시겠습니까?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "계정 목록"
diff --git a/rainloop/v/0.0.0/langs/lt.ini b/rainloop/v/0.0.0/langs/lt.ini
index 3912fc94d..26c2ce09c 100644
--- a/rainloop/v/0.0.0/langs/lt.ini
+++ b/rainloop/v/0.0.0/langs/lt.ini
@@ -470,6 +470,8 @@ CREATING_PROCESS = "Kuriamas katalogas"
 DELETING_PROCESS = "Šalinamas katalogas"
 RENAMING_PROCESS = "Pervardinamas katalogas"
 DELETING_ASK = "Ar Jūs įsitikinę?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Paskyrų sąrašas"
diff --git a/rainloop/v/0.0.0/langs/lv.ini b/rainloop/v/0.0.0/langs/lv.ini
index ac0d37f7f..497011c54 100644
--- a/rainloop/v/0.0.0/langs/lv.ini
+++ b/rainloop/v/0.0.0/langs/lv.ini
@@ -469,6 +469,8 @@ CREATING_PROCESS = "Izveidot mapi"
 DELETING_PROCESS = "Dzēst mapi"
 RENAMING_PROCESS = "Pārsaukt mapi"
 DELETING_ASK = "Tiešām?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Kontu saraksts"
diff --git a/rainloop/v/0.0.0/langs/nl.ini b/rainloop/v/0.0.0/langs/nl.ini
index d380e14f6..5f7463c12 100644
--- a/rainloop/v/0.0.0/langs/nl.ini
+++ b/rainloop/v/0.0.0/langs/nl.ini
@@ -469,6 +469,8 @@ CREATING_PROCESS = "Map aan het aanmaken"
 DELETING_PROCESS = "Map aan het wissen"
 RENAMING_PROCESS = "Map hernoemen"
 DELETING_ASK = "Weet u het zeker?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Account Lijst"
diff --git a/rainloop/v/0.0.0/langs/no.ini b/rainloop/v/0.0.0/langs/no.ini
index b956846a7..5c7e623ca 100644
--- a/rainloop/v/0.0.0/langs/no.ini
+++ b/rainloop/v/0.0.0/langs/no.ini
@@ -468,6 +468,8 @@ CREATING_PROCESS = "Oppretter mappen"
 DELETING_PROCESS = "Slette en mappe"
 RENAMING_PROCESS = "Endre navn på en mappe"
 DELETING_ASK = "Er du sikker?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Kontoer"
diff --git a/rainloop/v/0.0.0/langs/pl.ini b/rainloop/v/0.0.0/langs/pl.ini
index 2e1ad034c..e70c1939d 100644
--- a/rainloop/v/0.0.0/langs/pl.ini
+++ b/rainloop/v/0.0.0/langs/pl.ini
@@ -484,6 +484,8 @@ CREATING_PROCESS = "Tworzenie folderu"
 DELETING_PROCESS = "Usuwanie folderu"
 RENAMING_PROCESS = "Zmiana nazwy folderu"
 DELETING_ASK = "Czy na pewno usunąć?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Lista kont"
diff --git a/rainloop/v/0.0.0/langs/pt-br.ini b/rainloop/v/0.0.0/langs/pt-br.ini
index 5e5043e63..e0ce371ee 100644
--- a/rainloop/v/0.0.0/langs/pt-br.ini
+++ b/rainloop/v/0.0.0/langs/pt-br.ini
@@ -470,6 +470,8 @@ CREATING_PROCESS = "Criando a pasta"
 DELETING_PROCESS = "Excluindo a pasta"
 RENAMING_PROCESS = "Renomeando a pasta"
 DELETING_ASK = "Você tem certeza?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Lista de contas"
diff --git a/rainloop/v/0.0.0/langs/pt-pt.ini b/rainloop/v/0.0.0/langs/pt-pt.ini
index 87432e0d7..0eba53d88 100644
--- a/rainloop/v/0.0.0/langs/pt-pt.ini
+++ b/rainloop/v/0.0.0/langs/pt-pt.ini
@@ -469,6 +469,8 @@ CREATING_PROCESS = "Criar a pasta"
 DELETING_PROCESS = "Excluir a pasta"
 RENAMING_PROCESS = "Renomear a pasta"
 DELETING_ASK = "Você tem certeza?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Lista de contas"
diff --git a/rainloop/v/0.0.0/langs/ro.ini b/rainloop/v/0.0.0/langs/ro.ini
index 650002ec3..d3ea1b33a 100644
--- a/rainloop/v/0.0.0/langs/ro.ini
+++ b/rainloop/v/0.0.0/langs/ro.ini
@@ -468,6 +468,8 @@ CREATING_PROCESS = "Crearea dosarului..."
 DELETING_PROCESS = "Șterg dosarul..."
 RENAMING_PROCESS = "Redenumesc dosarul"
 DELETING_ASK = "Sunteți sigur?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Lista de Conturi"
diff --git a/rainloop/v/0.0.0/langs/ru.ini b/rainloop/v/0.0.0/langs/ru.ini
index 264dbc0e9..035a74936 100644
--- a/rainloop/v/0.0.0/langs/ru.ini
+++ b/rainloop/v/0.0.0/langs/ru.ini
@@ -469,6 +469,8 @@ CREATING_PROCESS = "Cоздание папки"
 DELETING_PROCESS = "Удаление папки"
 RENAMING_PROCESS = "Переименование папки"
 DELETING_ASK = "Точно?"
+TO_MANY_FOLDERS_DESC_1 = "У вас слишком много папок!"
+TO_MANY_FOLDERS_DESC_2 = "Мы показали только часть из них, чтобы избежать проблем с производительностью."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Список Аккаунтов"
diff --git a/rainloop/v/0.0.0/langs/sk.ini b/rainloop/v/0.0.0/langs/sk.ini
index a4cdadb16..e4fb64330 100644
--- a/rainloop/v/0.0.0/langs/sk.ini
+++ b/rainloop/v/0.0.0/langs/sk.ini
@@ -469,6 +469,8 @@ CREATING_PROCESS = "Vytváram priečinok"
 DELETING_PROCESS = "Odstraňujem priečinok"
 RENAMING_PROCESS = "Premenovávam prečinok"
 DELETING_ASK = "Ste si istý?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Zoznam účtov"
diff --git a/rainloop/v/0.0.0/langs/sv.ini b/rainloop/v/0.0.0/langs/sv.ini
index 56f317bd9..7e951fb66 100644
--- a/rainloop/v/0.0.0/langs/sv.ini
+++ b/rainloop/v/0.0.0/langs/sv.ini
@@ -484,6 +484,8 @@ CREATING_PROCESS = "Skapar en mapp"
 DELETING_PROCESS = "Ta bort en mapp"
 RENAMING_PROCESS = "Byter namn på en mapp"
 DELETING_ASK = "Är du säker?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Kontolista"
diff --git a/rainloop/v/0.0.0/langs/tr.ini b/rainloop/v/0.0.0/langs/tr.ini
index bc1eb5b43..5680f3e5e 100644
--- a/rainloop/v/0.0.0/langs/tr.ini
+++ b/rainloop/v/0.0.0/langs/tr.ini
@@ -468,6 +468,8 @@ CREATING_PROCESS = "Klasör oluşturuluyor"
 DELETING_PROCESS = "Klasör siliniyor"
 RENAMING_PROCESS = "Klasör değiştiriliyor"
 DELETING_ASK = "Eminmisiniz?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Hesap Listesi"
diff --git a/rainloop/v/0.0.0/langs/ua.ini b/rainloop/v/0.0.0/langs/ua.ini
index 1ce80a809..a63fd5bad 100644
--- a/rainloop/v/0.0.0/langs/ua.ini
+++ b/rainloop/v/0.0.0/langs/ua.ini
@@ -469,6 +469,8 @@ CREATING_PROCESS = "Створення теки"
 DELETING_PROCESS = "Видалення теки"
 RENAMING_PROCESS = "Перейменування теки"
 DELETING_ASK = "Впевнені?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Список акаунтів"
diff --git a/rainloop/v/0.0.0/langs/zh-cn.ini b/rainloop/v/0.0.0/langs/zh-cn.ini
index ab7a7a22f..679ba6e7d 100644
--- a/rainloop/v/0.0.0/langs/zh-cn.ini
+++ b/rainloop/v/0.0.0/langs/zh-cn.ini
@@ -469,6 +469,8 @@ CREATING_PROCESS = "文件夹创建中"
 DELETING_PROCESS = "文件夹删除中"
 RENAMING_PROCESS = "文件夹重命名"
 DELETING_ASK = "确定?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "账户列表"
diff --git a/rainloop/v/0.0.0/langs/zh-tw.ini b/rainloop/v/0.0.0/langs/zh-tw.ini
index d13f2dd8d..c36959ce4 100644
--- a/rainloop/v/0.0.0/langs/zh-tw.ini
+++ b/rainloop/v/0.0.0/langs/zh-tw.ini
@@ -470,6 +470,8 @@ CREATING_PROCESS = "資料夾創建中"
 DELETING_PROCESS = "資料夾刪除中"
 RENAMING_PROCESS = "資料夾重命名"
 DELETING_ASK = "確定?"
+TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
+TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "帳戶列表"