diff --git a/dev/Common/HtmlEditor.js b/dev/Common/HtmlEditor.js
index e607339df..beae736d3 100644
--- a/dev/Common/HtmlEditor.js
+++ b/dev/Common/HtmlEditor.js
@@ -342,6 +342,18 @@
 		}
 	};
 
+	HtmlEditor.prototype.hasFocus = function ()
+	{
+		if (this.editor)
+		{
+			try {
+				return !!this.editor.focusManager.hasFocus;
+			} catch (e) {}
+		}
+
+		return false;
+	};
+
 	HtmlEditor.prototype.blur = function ()
 	{
 		if (this.editor)
diff --git a/dev/Model/Folder.js b/dev/Model/Folder.js
index 909645706..ee67902df 100644
--- a/dev/Model/Folder.js
+++ b/dev/Model/Folder.js
@@ -82,7 +82,7 @@
 
 		this.hasSubScribedSubfolders = ko.computed(function () {
 			return !!_.find(this.subFolders(), function (oFolder) {
-				return oFolder.subScribed() && !oFolder.isSystemFolder();
+				return (oFolder.subScribed() || oFolder.hasSubScribedSubfolders()) && !oFolder.isSystemFolder();
 			});
 		}, this);
 
diff --git a/dev/Promises/User/Populator.js b/dev/Promises/User/Populator.js
index 87a41bcf9..42ac66e1e 100644
--- a/dev/Promises/User/Populator.js
+++ b/dev/Promises/User/Populator.js
@@ -150,6 +150,8 @@
 			FolderStore.displaySpecSetting(0 >= iC || iLimit < iC);
 			FolderStore.folderList(this.folderResponseParseRec(
 				Utils.isUnd(oData.Namespace) ? '' : oData.Namespace, oData['@Collection']));
+
+			FolderStore.reComputeFolderListSubFolders();
 		}
 	};
 
diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index 9d826f69b..b9602177b 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -172,6 +172,7 @@
 		Remote.folderSetSubscribe(Utils.emptyFunction, oFolder.fullNameRaw, true);
 
 		oFolder.subScribed(true);
+		FolderStore.reComputeFolderListSubFolders();
 	};
 
 	FoldersUserSettings.prototype.unSubscribeFolder = function (oFolder)
@@ -180,6 +181,7 @@
 		Remote.folderSetSubscribe(Utils.emptyFunction, oFolder.fullNameRaw, false);
 
 		oFolder.subScribed(false);
+		FolderStore.reComputeFolderListSubFolders();
 	};
 
 	FoldersUserSettings.prototype.checkableTrueFolder = function (oFolder)
diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js
index 57081f7b1..a4a1e57d2 100644
--- a/dev/Stores/User/Folder.js
+++ b/dev/Stores/User/Folder.js
@@ -241,6 +241,26 @@
 		return aResult;
 	};
 
+	FolderUserStore.prototype.reComputeFolderListSubFolders = function ()
+	{
+		return;
+		
+		var
+			func = function (aList) {
+				_.each(aList, function (oFolder) {
+					if (oFolder && oFolder.subFolders)
+					{
+						func(oFolder.subFolders());
+
+						oFolder.subFolders.valueHasMutated();
+					}
+				});
+			}
+		;
+
+		func(this.folderList());
+	};
+
 	module.exports = new FolderUserStore();
 
 }());
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 9d50057dc..0691c5de1 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -124,6 +124,8 @@
 		}, this).extend({'notify': 'always'});
 
 		this.subject = ko.observable('');
+		this.subject.focused = ko.observable(false);
+
 		this.isHtml = ko.observable(false);
 
 		this.requestDsn = ko.observable(false);
@@ -1423,11 +1425,28 @@
 			oScript = null
 		;
 
-		key('ctrl+q, command+q', Enums.KeyState.Compose, function () {
+		key('ctrl+q, command+q, ctrl+w, command+w', Enums.KeyState.Compose, function () {
+			return false;
+		});
+
+		key('`', Enums.KeyState.Compose, function () {
+			if (self.oEditor && !self.oEditor.hasFocus() && !Utils.inFocus())
+			{
+				self.identitiesDropdownTrigger(true);
+				return false;
+			}
+		});
+
+		key('ctrl+`', Enums.KeyState.Compose, function () {
 			self.identitiesDropdownTrigger(true);
 			return false;
 		});
 
+		key('esc, ctrl+down, command+down', Enums.KeyState.Compose, function () {
+			self.skipCommand();
+			return false;
+		});
+
 		if (this.allowFolders)
 		{
 			key('ctrl+s, command+s', Enums.KeyState.Compose, function () {
@@ -1444,7 +1463,7 @@
 			});
 		}
 
-		key('esc', Enums.KeyState.Compose, function () {
+		key('shift+esc', Enums.KeyState.Compose, function () {
 			if (self.modalVisibility())
 			{
 				self.tryToClosePopup();
diff --git a/rainloop/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html b/rainloop/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html
index 0ded19103..dc3579c36 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html
@@ -75,10 +75,11 @@
 <table class="table table-striped table-bordered">
 <tbody>
 	<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_OPEN_COMPOSE_POPUP"></td><td>W, C</td></tr>
-	<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_OPEN_IDENTITIES_DROPDOWN"></td><td>Ctrl + Q, Cmd + Q</td></tr>
+	<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_OPEN_IDENTITIES_DROPDOWN"></td><td>` (tilde), Ctrl + `, Cmd + `</td></tr>
 	<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_SAVE_MESSAGE"></td><td>Ctrl + S, Cmd + S</td></tr>
 	<!--<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_SEND_MESSAGE"></td><td>Ctrl + Enter, Cmd + Enter</td></tr>-->
-	<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_CLOSE_COMPOSE"></td><td>Esc</td></tr>
+	<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_MINIMIZE_COMPOSE_POPUP"></td><td>Esc</td></tr>
+	<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_CLOSE_COMPOSE"></td><td>Shift + Esc</td></tr>
 </tbody>
 </table>
 
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
index 82d7ed3c5..6f307b5ac 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
@@ -146,7 +146,7 @@
 								<span class="i18n" data-i18n="COMPOSE/TITLE_SUBJECT"></span>
 							</div>
 							<div class="e-cell e-value">
-								<input type="text" size="70" autocomplete="off" data-bind="textInput: subject" />
+								<input type="text" size="70" autocomplete="off" data-bind="textInput: subject, hasFocus: subject.focused" />
 							</div>
 						</div>
 						<div class="e-row">
diff --git a/rainloop/v/0.0.0/langs/ar.ini b/rainloop/v/0.0.0/langs/ar.ini
index 1fffb29a1..a55cb15ae 100644
--- a/rainloop/v/0.0.0/langs/ar.ini
+++ b/rainloop/v/0.0.0/langs/ar.ini
@@ -642,6 +642,7 @@ LABEL_EXIT_FULLSCREEN = "الخروج من وضع ملء الشاشة"
 LABEL_CLOSE_MESSAGE = "إغلاق الرسالة (بدون نافذة العرض)"
 LABEL_SWITCH_TO_LIST = "تحويل التركيز الى قائمة الرسائل"
 LABEL_OPEN_COMPOSE_POPUP = "إفتح نافذة خاصة لإنشاء الرسائل"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "فتح قائمة الهويات"
 LABEL_SAVE_MESSAGE = "حفظ الرسالة"
 LABEL_SEND_MESSAGE = "إرسال الرسالة"
diff --git a/rainloop/v/0.0.0/langs/bg.ini b/rainloop/v/0.0.0/langs/bg.ini
index dea61f5e9..8945c1e6c 100644
--- a/rainloop/v/0.0.0/langs/bg.ini
+++ b/rainloop/v/0.0.0/langs/bg.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Излез от режим на цял екран"
 LABEL_CLOSE_MESSAGE = "Затвори съобщението (Няма изглед за преглед)"
 LABEL_SWITCH_TO_LIST = "Превключи фокуса обратно към списъка със съобщения"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Запази съобщението"
 LABEL_SEND_MESSAGE = "Изпрати съобщението"
diff --git a/rainloop/v/0.0.0/langs/cs.ini b/rainloop/v/0.0.0/langs/cs.ini
index 2505d5170..badd610ae 100644
--- a/rainloop/v/0.0.0/langs/cs.ini
+++ b/rainloop/v/0.0.0/langs/cs.ini
@@ -644,6 +644,7 @@ LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
 LABEL_SEND_MESSAGE = "Send message"
diff --git a/rainloop/v/0.0.0/langs/de.ini b/rainloop/v/0.0.0/langs/de.ini
index b91b50d7d..cafe06264 100644
--- a/rainloop/v/0.0.0/langs/de.ini
+++ b/rainloop/v/0.0.0/langs/de.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Vollbildmodus verlassen"
 LABEL_CLOSE_MESSAGE = "Nachricht schließen (kein Vorschaubereich-Layout)"
 LABEL_SWITCH_TO_LIST = "Fokus auf Nachrichtenliste zurückschalten"
 LABEL_OPEN_COMPOSE_POPUP = "Erstellen-Popup öffnen"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Identitätsauswahl öffnen"
 LABEL_SAVE_MESSAGE = "Nachricht speichern"
 LABEL_SEND_MESSAGE = "Nachricht senden"
diff --git a/rainloop/v/0.0.0/langs/en-gb.ini b/rainloop/v/0.0.0/langs/en-gb.ini
index 53fcf762c..b0bec426b 100644
--- a/rainloop/v/0.0.0/langs/en-gb.ini
+++ b/rainloop/v/0.0.0/langs/en-gb.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
 LABEL_SEND_MESSAGE = "Send message"
diff --git a/rainloop/v/0.0.0/langs/en.ini b/rainloop/v/0.0.0/langs/en.ini
index 53fcf762c..b0bec426b 100644
--- a/rainloop/v/0.0.0/langs/en.ini
+++ b/rainloop/v/0.0.0/langs/en.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
 LABEL_SEND_MESSAGE = "Send message"
diff --git a/rainloop/v/0.0.0/langs/es.ini b/rainloop/v/0.0.0/langs/es.ini
index 2b8461b1a..a75bdfc32 100644
--- a/rainloop/v/0.0.0/langs/es.ini
+++ b/rainloop/v/0.0.0/langs/es.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Salir del modo de pantalla completa"
 LABEL_CLOSE_MESSAGE = "Cerrar el mensaje (No hay diseño panel de vista previa)"
 LABEL_SWITCH_TO_LIST = "Cambiar foco de nuevo a la lista de mensajes"
 LABEL_OPEN_COMPOSE_POPUP = "Abrir ventana de redacción"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Abrir ventana de identidades"
 LABEL_SAVE_MESSAGE = "Guardar aviso"
 LABEL_SEND_MESSAGE = "Enviar mensaje"
diff --git a/rainloop/v/0.0.0/langs/fr.ini b/rainloop/v/0.0.0/langs/fr.ini
index bbbc30d75..f6a286042 100644
--- a/rainloop/v/0.0.0/langs/fr.ini
+++ b/rainloop/v/0.0.0/langs/fr.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Quitter le mode plein écran"
 LABEL_CLOSE_MESSAGE = "Fermer le message (Mise en page sans aperçu)"
 LABEL_SWITCH_TO_LIST = "Retourner à la liste des messages"
 LABEL_OPEN_COMPOSE_POPUP = "Ouvrir la fenêtre d'écriture"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Liste de sélection des identitiés"
 LABEL_SAVE_MESSAGE = "Enregistrer le message"
 LABEL_SEND_MESSAGE = "Envoyer le message"
diff --git a/rainloop/v/0.0.0/langs/hu.ini b/rainloop/v/0.0.0/langs/hu.ini
index 30759e708..c5084e192 100644
--- a/rainloop/v/0.0.0/langs/hu.ini
+++ b/rainloop/v/0.0.0/langs/hu.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Levél mentés"
 LABEL_SEND_MESSAGE = "Levél küldés"
diff --git a/rainloop/v/0.0.0/langs/is.ini b/rainloop/v/0.0.0/langs/is.ini
index bdeab25e0..61cda09c2 100644
--- a/rainloop/v/0.0.0/langs/is.ini
+++ b/rainloop/v/0.0.0/langs/is.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
 LABEL_SEND_MESSAGE = "Send message"
diff --git a/rainloop/v/0.0.0/langs/it.ini b/rainloop/v/0.0.0/langs/it.ini
index a0152eb0b..26eba586c 100644
--- a/rainloop/v/0.0.0/langs/it.ini
+++ b/rainloop/v/0.0.0/langs/it.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Esci dalla modalità a schermo intero"
 LABEL_CLOSE_MESSAGE = "Chiudi messaggio (senza anteprima messaggi)"
 LABEL_SWITCH_TO_LIST = "Sposta la selezione sulla lista messaggi"
 LABEL_OPEN_COMPOSE_POPUP = "Apri finestra di scrittura"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Apri il menu di selezione delle identità"
 LABEL_SAVE_MESSAGE = "Salva messaggio"
 LABEL_SEND_MESSAGE = "Invia messaggio"
diff --git a/rainloop/v/0.0.0/langs/ja-jp.ini b/rainloop/v/0.0.0/langs/ja-jp.ini
index 3ec6ea96c..b59db07ff 100644
--- a/rainloop/v/0.0.0/langs/ja-jp.ini
+++ b/rainloop/v/0.0.0/langs/ja-jp.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
 LABEL_SEND_MESSAGE = "Send message"
diff --git a/rainloop/v/0.0.0/langs/ko-kr.ini b/rainloop/v/0.0.0/langs/ko-kr.ini
index ad8f59480..19d25ec00 100644
--- a/rainloop/v/0.0.0/langs/ko-kr.ini
+++ b/rainloop/v/0.0.0/langs/ko-kr.ini
@@ -642,6 +642,7 @@ LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
 LABEL_SEND_MESSAGE = "Send message"
diff --git a/rainloop/v/0.0.0/langs/lt.ini b/rainloop/v/0.0.0/langs/lt.ini
index aa38a2768..d81f72bed 100644
--- a/rainloop/v/0.0.0/langs/lt.ini
+++ b/rainloop/v/0.0.0/langs/lt.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Išeiti iš viso ekrano režimo"
 LABEL_CLOSE_MESSAGE = "Uždaryti laišką (Be peržiūros lauko)"
 LABEL_SWITCH_TO_LIST = "Perjungti atgal į laiškų sąrašą"
 LABEL_OPEN_COMPOSE_POPUP = "Sukurti naują laišką atskirame lange"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Atidaryti tapatybių sąrašą"
 LABEL_SAVE_MESSAGE = "Išsaugoti laišką"
 LABEL_SEND_MESSAGE = "Siųsti laišką"
diff --git a/rainloop/v/0.0.0/langs/lv.ini b/rainloop/v/0.0.0/langs/lv.ini
index 8c99991e7..8742c5196 100644
--- a/rainloop/v/0.0.0/langs/lv.ini
+++ b/rainloop/v/0.0.0/langs/lv.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
 LABEL_SEND_MESSAGE = "Send message"
diff --git a/rainloop/v/0.0.0/langs/nl.ini b/rainloop/v/0.0.0/langs/nl.ini
index a34a5bad0..2ca814ee6 100644
--- a/rainloop/v/0.0.0/langs/nl.ini
+++ b/rainloop/v/0.0.0/langs/nl.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Volledig scherm sluiten"
 LABEL_CLOSE_MESSAGE = "Bericht sluiten (leesvenster uitgeschakeld)"
 LABEL_SWITCH_TO_LIST = "Schakel focus terug naar berichtenlijst"
 LABEL_OPEN_COMPOSE_POPUP = "Open nieuw bericht venster"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identiteiten menu"
 LABEL_SAVE_MESSAGE = "Concept opslaan"
 LABEL_SEND_MESSAGE = "Bericht versturen"
diff --git a/rainloop/v/0.0.0/langs/no.ini b/rainloop/v/0.0.0/langs/no.ini
index 197fa8757..8fb8c1aa4 100644
--- a/rainloop/v/0.0.0/langs/no.ini
+++ b/rainloop/v/0.0.0/langs/no.ini
@@ -644,6 +644,7 @@ LABEL_EXIT_FULLSCREEN = "Avslutt fullskjerm modus"
 LABEL_CLOSE_MESSAGE = "Lukk melding"
 LABEL_SWITCH_TO_LIST = "Flytt fokus til meldingsliste"
 LABEL_OPEN_COMPOSE_POPUP = "Ny melding i popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Åpne identitetsliste"
 LABEL_SAVE_MESSAGE = "Lagre melding"
 LABEL_SEND_MESSAGE = "Send melding"
diff --git a/rainloop/v/0.0.0/langs/pl.ini b/rainloop/v/0.0.0/langs/pl.ini
index 46aa87dab..1f19bdf8a 100644
--- a/rainloop/v/0.0.0/langs/pl.ini
+++ b/rainloop/v/0.0.0/langs/pl.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Opuść tryb pełnoekranowy"
 LABEL_CLOSE_MESSAGE = "Zamknij wiadomość (nieaktywny podgląd wiadomości)"
 LABEL_SWITCH_TO_LIST = "Wróć do widoku listy wiadomości"
 LABEL_OPEN_COMPOSE_POPUP = "Otwórz okno tworzenia wiadomości"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Otwórz menu wyboru tożsamości"
 LABEL_SAVE_MESSAGE = "Zapisz wiadomość"
 LABEL_SEND_MESSAGE = "Wyślij wiadomość"
diff --git a/rainloop/v/0.0.0/langs/pt-br.ini b/rainloop/v/0.0.0/langs/pt-br.ini
index 72109099c..020634224 100644
--- a/rainloop/v/0.0.0/langs/pt-br.ini
+++ b/rainloop/v/0.0.0/langs/pt-br.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Sair do modo tela-cheia"
 LABEL_CLOSE_MESSAGE = "Fechar mensagem (Sem pré-visualização)"
 LABEL_SWITCH_TO_LIST = "Mudar o foco volta para a lista de mensagens"
 LABEL_OPEN_COMPOSE_POPUP = "Abrir pop-up de composição"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Abrir menu de identidades"
 LABEL_SAVE_MESSAGE = "Salvar mensagem"
 LABEL_SEND_MESSAGE = "Enviar mensagem"
diff --git a/rainloop/v/0.0.0/langs/pt-pt.ini b/rainloop/v/0.0.0/langs/pt-pt.ini
index ebc827efd..b81373498 100644
--- a/rainloop/v/0.0.0/langs/pt-pt.ini
+++ b/rainloop/v/0.0.0/langs/pt-pt.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Sair do modo ecrã-inteiro"
 LABEL_CLOSE_MESSAGE = "Fechar mensagem (sem janela de pré-visualização)"
 LABEL_SWITCH_TO_LIST = "Dar foco à lista de mensagens"
 LABEL_OPEN_COMPOSE_POPUP = "Abrir janela de composição"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Abrir menu de identidades"
 LABEL_SAVE_MESSAGE = "Guardar mensagem"
 LABEL_SEND_MESSAGE = "Enviar mensagem"
diff --git a/rainloop/v/0.0.0/langs/ro.ini b/rainloop/v/0.0.0/langs/ro.ini
index eba8053f2..001dfba83 100644
--- a/rainloop/v/0.0.0/langs/ro.ini
+++ b/rainloop/v/0.0.0/langs/ro.ini
@@ -644,6 +644,7 @@ LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
 LABEL_SEND_MESSAGE = "Send message"
diff --git a/rainloop/v/0.0.0/langs/ru.ini b/rainloop/v/0.0.0/langs/ru.ini
index 373cccaab..0da1e0fc6 100644
--- a/rainloop/v/0.0.0/langs/ru.ini
+++ b/rainloop/v/0.0.0/langs/ru.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Выйти из полноэкранного режим
 LABEL_CLOSE_MESSAGE = "Закрыть сообщение"
 LABEL_SWITCH_TO_LIST = "Переключить фокус на список писем"
 LABEL_OPEN_COMPOSE_POPUP = "Написать письмо"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Выбрать отправителя"
 LABEL_SAVE_MESSAGE = "Сохранить сообщение"
 LABEL_SEND_MESSAGE = "Отправить сообщение"
diff --git a/rainloop/v/0.0.0/langs/sk.ini b/rainloop/v/0.0.0/langs/sk.ini
index 10eac6d9a..d8c7384eb 100644
--- a/rainloop/v/0.0.0/langs/sk.ini
+++ b/rainloop/v/0.0.0/langs/sk.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
 LABEL_SEND_MESSAGE = "Send message"
diff --git a/rainloop/v/0.0.0/langs/sv.ini b/rainloop/v/0.0.0/langs/sv.ini
index 9c0ca8f1a..6c8099917 100644
--- a/rainloop/v/0.0.0/langs/sv.ini
+++ b/rainloop/v/0.0.0/langs/sv.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Avsluta fullskärmsläge"
 LABEL_CLOSE_MESSAGE = "Stäng meddelande (Ingen förhandsgransknings-layout)"
 LABEL_SWITCH_TO_LIST = "Växla fokus tillbaka till meddelandelistan"
 LABEL_OPEN_COMPOSE_POPUP = "Öppna skrivfönster"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Öppna identitetsval"
 LABEL_SAVE_MESSAGE = "Spara meddelande"
 LABEL_SEND_MESSAGE = "Skicka meddelande"
diff --git a/rainloop/v/0.0.0/langs/tr.ini b/rainloop/v/0.0.0/langs/tr.ini
index c51c31911..5f8be2dba 100644
--- a/rainloop/v/0.0.0/langs/tr.ini
+++ b/rainloop/v/0.0.0/langs/tr.ini
@@ -643,6 +643,7 @@ LABEL_EXIT_FULLSCREEN = "Tam ekran modundan çık"
 LABEL_CLOSE_MESSAGE = "Mesajı kapat (önizleme bölmedüzen taslağı bulunamadı)"
 LABEL_SWITCH_TO_LIST = "Görüntülenen'den mesaj listesine geri dön"
 LABEL_OPEN_COMPOSE_POPUP = "Yazma pencresini popup olarak aç"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Kimlik açılır pencresini aç"
 LABEL_SAVE_MESSAGE = "Mesajı Kaydet"
 LABEL_SEND_MESSAGE = "Mesajı Gönder"
diff --git a/rainloop/v/0.0.0/langs/ua.ini b/rainloop/v/0.0.0/langs/ua.ini
index 4fb9855e4..c87b0a4ec 100644
--- a/rainloop/v/0.0.0/langs/ua.ini
+++ b/rainloop/v/0.0.0/langs/ua.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Вийти з повноекранного режиму
 LABEL_CLOSE_MESSAGE = "Закрити повідомлення"
 LABEL_SWITCH_TO_LIST = "Переключити фокус на список листів"
 LABEL_OPEN_COMPOSE_POPUP = "Написати листа"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Вибрати відправника"
 LABEL_SAVE_MESSAGE = "Зберегти повідомлення"
 LABEL_SEND_MESSAGE = "Надіслати повідомлення"
diff --git a/rainloop/v/0.0.0/langs/zh-cn.ini b/rainloop/v/0.0.0/langs/zh-cn.ini
index a607ada0d..033a1afa6 100644
--- a/rainloop/v/0.0.0/langs/zh-cn.ini
+++ b/rainloop/v/0.0.0/langs/zh-cn.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
 LABEL_SEND_MESSAGE = "Send message"
diff --git a/rainloop/v/0.0.0/langs/zh-tw.ini b/rainloop/v/0.0.0/langs/zh-tw.ini
index 0278c11bc..f0e91bce3 100644
--- a/rainloop/v/0.0.0/langs/zh-tw.ini
+++ b/rainloop/v/0.0.0/langs/zh-tw.ini
@@ -645,6 +645,7 @@ LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
+LABEL_MINIMIZE_COMPOSE_POPUP = "Minimize compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
 LABEL_SEND_MESSAGE = "Send message"