Added option to (un)hide Kolab folders

dev/Model/FolderCollection.js

@@ -364,7 +364,8 @@ export class FolderModel extends AbstractModel {
 
 				canBeEdited: () => FolderType.User === folder.type() && folder.exists/* && folder.selectable()*/,
 
-				isSystemFolder: () => FolderType.User !== folder.type() /*| !!folder.kolabType()*/,
+				isSystemFolder: () => FolderType.User !== folder.type()
+					| (FolderUserStore.allowKolab() && !!folder.kolabType() & !SettingsUserStore.unhideKolabFolders()),
 
 				canBeSelected: () => folder.selectable() && !folder.isSystemFolder(),
 

dev/Settings/User/Folders.js

@@ -46,6 +46,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 		this.folderListOptimized = FolderUserStore.folderListOptimized;
 		this.folderListError = FolderUserStore.folderListError;
 		this.hideUnsubscribed = SettingsUserStore.hideUnsubscribed;
+		this.unhideKolabFolders = SettingsUserStore.unhideKolabFolders;
 
 		this.loading = FolderUserStore.foldersChanging;
 
@@ -54,6 +55,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 		this.folderForEdit = ko.observable(null).extend({ toggleSubscribeProperty: [this, 'editing'] });
 
 		SettingsUserStore.hideUnsubscribed.subscribe(value => Remote.saveSetting('HideUnsubscribed', value));
+		SettingsUserStore.unhideKolabFolders.subscribe(value => Remote.saveSetting('UnhideKolabFolders', value));
 	}
 
 	folderEditOnEnter(folder) {

dev/Stores/User/Settings.js

@@ -25,6 +25,7 @@ export const SettingsUserStore = new class {
 			replySameFolder: 0,
 			hideUnsubscribed: 0,
 			hideDeleted: 1,
+			unhideKolabFolders: 0,
 			autoLogout: 0,
 
 			requestReadReceipt: 0,
@@ -84,6 +85,7 @@ export const SettingsUserStore = new class {
 
 		self.hideUnsubscribed(SettingsGet('HideUnsubscribed'));
 		self.hideDeleted(SettingsGet('HideDeleted'));
+		self.unhideKolabFolders(SettingsGet('UnhideKolabFolders'));
 
 		self.requestReadReceipt(SettingsGet('requestReadReceipt'));
 		self.requestDsn(SettingsGet('requestDsn'));

snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -738,6 +738,7 @@ class Actions
 			'ContactsAutosave' => (bool) $oConfig->Get('defaults', 'contacts_autosave', true),
 			'HideUnsubscribed' => false,
 			'HideDeleted' => true,
+			'UnhideKolabFolders' => false,
 			'MainEmail' => '',
 			'UserBackgroundName' => '',
 			'UserBackgroundHash' => ''
@@ -837,6 +838,7 @@ class Actions
 					$aResult['UseThreads'] = (bool)$oSettingsLocal->GetConf('UseThreads', $aResult['UseThreads']);
 					$aResult['ReplySameFolder'] = (bool)$oSettingsLocal->GetConf('ReplySameFolder', $aResult['ReplySameFolder']);
 					$aResult['HideDeleted'] = (bool)$oSettingsLocal->GetConf('HideDeleted', $aResult['HideDeleted']);
+					$aResult['UnhideKolabFolders'] = (bool)$oSettingsLocal->GetConf('UnhideKolabFolders', $aResult['UnhideKolabFolders']);
 				}
 
 				if ($oConfig->Get('login', 'determine_user_language', true)) {

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php

@@ -160,6 +160,7 @@ trait Accounts
 				$aResult['UseThreads'] = (bool) $oSettingsLocal->GetConf('UseThreads', $oConfig->Get('defaults', 'mail_use_threads', false));
 				$aResult['ReplySameFolder'] = (bool) $oSettingsLocal->GetConf('ReplySameFolder', $oConfig->Get('defaults', 'mail_reply_same_folder', false));
 				$aResult['HideDeleted'] = (bool) $oSettingsLocal->GetConf('HideDeleted', true);
+				$aResult['UnhideKolabFolders'] = (bool) $oSettingsLocal->GetConf('UnhideKolabFolders', false);
 			}
 //			$this->Plugins()->InitAppData($bAdmin, $aResult, $oAccount);
 

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php

@@ -356,6 +356,7 @@ trait User
 		$this->setSettingsFromParams($oSettingsLocal, 'ReplySameFolder', 'bool');
 		$this->setSettingsFromParams($oSettingsLocal, 'HideUnsubscribed', 'bool');
 		$this->setSettingsFromParams($oSettingsLocal, 'HideDeleted', 'bool');
+		$this->setSettingsFromParams($oSettingsLocal, 'UnhideKolabFolders', 'bool');
 
 		return $this->DefaultResponse(__FUNCTION__,
 			$this->SettingsProvider()->Save($oAccount, $oSettings) &&

snappymail/v/0.0.0/app/localization/ar-SA/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "إخفاء\\إظهار المجلد",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "تأكد\\لاتتأكد من وصول ايميلات جديدة",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/bg-BG/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Покажи\/скрий папка",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Провери\/не проверявай за нови съобщения",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/cs-CZ/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Zobrazit\/skrýt složku",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Kontrovat\/nekontrolovat nové příchozí zprávy",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/da-DK/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Vis\/skjul mappe",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Markér\/fjern markering for nye meddelelser",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/de-DE/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Ordner ein-\/ausblenden",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Auf neue Nachrichten prüfen\/nicht prüfen",
 		"HIDE_UNSUBSCRIBED": "Nicht abonnierte Ordner ausblenden",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Kalender",
 		"TYPE_CONFIGURATION": "Konfiguration",
 		"TYPE_CONTACTS": "Kontakte",

snappymail/v/0.0.0/app/localization/el-GR/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/en-GB/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/en/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/es-ES/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Mostrar\/ocultar carpeta",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Chequear\/no chequear nuevos mensajes",
 		"HIDE_UNSUBSCRIBED": "Ocultar carpetas dadas de baja",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendario",
 		"TYPE_CONFIGURATION": "Configuración",
 		"TYPE_CONTACTS": "Contactos",

snappymail/v/0.0.0/app/localization/et-EE/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Näita\/peida kaust",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Kontrolli\/ära kontrolli uusi kirju",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/fa-IR/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "نمایش\/مخفی‌بودن پوشه",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "بررسی\/عدم‌بررسی برای پیام جدید",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/fi-FI/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Näytä\/Piilota kansio",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Tarkista\/Älä tarkista uudet viestit",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/fr-FR/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Afficher\/masquer le dossier",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Cocher\/Décocher pour les nouveaux messages",
 		"HIDE_UNSUBSCRIBED": "Masquer les dossiers désabonnés",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendrier",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/hu-HU/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Mappa mutatás\/elrejtés",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Ellenőrizze\/ne ellenőrizze az új üzeneteket",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Naptár",
 		"TYPE_CONFIGURATION": "Konfiguráció",
 		"TYPE_CONTACTS": "Kapcsolatok",

snappymail/v/0.0.0/app/localization/id-ID/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Tampil\/lenyapkan folder",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Cek\/jangan cek pesan baru",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/is-IS/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Birta\/fela möppu",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Athuga\/ekki athuga með ný skilaboð",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/it-IT/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Mostra\/nascondi cartella",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Controlla\/non controlla la presenza di nuovi messaggi",
 		"HIDE_UNSUBSCRIBED": "Nascondi le cartelle non sottoscritte",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendario",
 		"TYPE_CONFIGURATION": "Configurazione",
 		"TYPE_CONTACTS": "Contatti",

snappymail/v/0.0.0/app/localization/ja-JP/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "フォルダーの表示\/非表示",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "新しいメッセージをチェックする\/しない",
 		"HIDE_UNSUBSCRIBED": "購読していないフォルダを隠す",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/ko-KR/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "폴더 표시\/숨기기",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "새 메시지 확인\/확인 취소",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/lt-LT/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Rodyti\/Slėpti katalogą",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Tikrinti\/Netikrinti ar yra naujų laiškų",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/lv-LV/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/nb-NO/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Vis\/skjul mappe",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Se\/ikke se etter nye meldinger",
 		"HIDE_UNSUBSCRIBED": "Skjul mapper som bruker ikke abonnerer på",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Kalender",
 		"TYPE_CONFIGURATION": "Oppsett",
 		"TYPE_CONTACTS": "Kontakter",

snappymail/v/0.0.0/app/localization/nl-NL/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Toon\/verberg map",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Controleer wel of niet op nieuwe berichten",
 		"HIDE_UNSUBSCRIBED": "Verberg niet geabonneerde mappen",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Kalender",
 		"TYPE_CONFIGURATION": "Configuratie",
 		"TYPE_CONTACTS": "Contacten",

snappymail/v/0.0.0/app/localization/pl-PL/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Pokaż\/ukryj folder",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Sprawdzaj\/nie sprawdzaj nowych wiadomości",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/pt-BR/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Mostrar\/esconder pasta",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Ativar\/Desativar verificação por novas mensagens",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/pt-PT/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Mostrar\/ocultar pasta",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Procurar\/não procurar novas mensagens",
 		"HIDE_UNSUBSCRIBED": "Esconder pastas não-subscritas",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendário",
 		"TYPE_CONFIGURATION": "Configuração",
 		"TYPE_CONTACTS": "Contactos",

snappymail/v/0.0.0/app/localization/pt/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Mostrar\/ocultar pasta",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Procurar\/não procurar novas mensagens",
 		"HIDE_UNSUBSCRIBED": "Esconder pastas não-subscritas",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendário",
 		"TYPE_CONFIGURATION": "Configuração",
 		"TYPE_CONTACTS": "Contactos",

snappymail/v/0.0.0/app/localization/ro-RO/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/ru-RU/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Показывать\/прятать папку",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Проверять\/не проверять новые сообщения",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/sk-SK/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/sl-SI/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Prikaži\/skrij mapo",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Preverjaj\/ne preverjaj za nova sporočila",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/sv-SE/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Visa\/dölj mapp",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Kontrollera\/inte söka efter nya meddelanden",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Kalender",
 		"TYPE_CONFIGURATION": "Konfiguration",
 		"TYPE_CONTACTS": "Kontakter",

snappymail/v/0.0.0/app/localization/tr-TR/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/uk-UA/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Відобразити\/приховати теку",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/localization/vi-VN/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Hiển thị\/ẩn đi thư mục",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Kiểm tra\/không kiểm tra xem có thư mới không",
 		"HIDE_UNSUBSCRIBED": "Ẩn đi những thư mục đã bỏ theo dõi",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Lịch",
 		"TYPE_CONFIGURATION": "Cấu hình",
 		"TYPE_CONTACTS": "Danh bạ",

snappymail/v/0.0.0/app/localization/zh-CN/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "显示\/隐藏文件夹",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "检查\/不检查新邮件",
 		"HIDE_UNSUBSCRIBED": "隐藏未订阅的文件夹",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "日历",
 		"TYPE_CONFIGURATION": "配置",
 		"TYPE_CONTACTS": "联系人",

snappymail/v/0.0.0/app/localization/zh-TW/user.json

@@ -454,6 +454,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",

snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html

@@ -3,6 +3,7 @@
 	   
 	<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i>
 </div>
+
 <div style="margin-bottom:20px;" data-bind="component: {
 	name: 'Checkbox',
 	params: {
@@ -10,6 +11,17 @@
 		value: hideUnsubscribed
 	}
 }"></div>
+
+<!-- ko if: showKolab -->
+<div style="margin-bottom:20px;" data-bind="component: {
+	name: 'Checkbox',
+	params: {
+		label: 'SETTINGS_FOLDERS/UNHIDE_KOLAB_FOLDERS',
+		value: unhideKolabFolders
+	}
+}"></div>
+<!-- /ko -->
+
 <a class="btn" data-bind="click: createFolder">
 	<i class="icon-folder-add"></i>
 	<span data-i18n="SETTINGS_FOLDERS/BUTTON_CREATE"></span>