diff --git a/build/langs.php b/build/langs.php
index dc875fd32..b5a3cb8d3 100644
--- a/build/langs.php
+++ b/build/langs.php
@@ -21,7 +21,7 @@ function mergeLangStructure($aFromLang, $aEngLang, &$iCount = 0)
 			}
 			else
 			{
-//				echo $sSectionKey.'/'.$sParamKey.','."\n";
+				echo $sSectionKey.'/'.$sParamKey.','."\n";
 				$iCount++;
 			}
 		}
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsIdentity.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
index 1ccbc8c3e..9ea11e3dd 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
@@ -4,8 +4,8 @@
 			<div class="modal-header">
 				<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
 				<h3>
-					<span data-bind="visible: !edit()" class="i18n" data-i18n-text="POPUPS_IDENTITIES/TITLE_ADD_IDENTITY"></span>
-					<span data-bind="visible: edit" class="i18n" data-i18n-text="POPUPS_IDENTITIES/TITLE_UPDATE_IDENTITY"></span>
+					<span data-bind="visible: !edit()" class="i18n" data-i18n-text="POPUPS_IDENTITY/TITLE_ADD_IDENTITY"></span>
+					<span data-bind="visible: edit" class="i18n" data-i18n-text="POPUPS_IDENTITY/TITLE_UPDATE_IDENTITY"></span>
 				</h3>
 			</div>
 			<div class="modal-body">
@@ -16,7 +16,7 @@
 					</div>
 					<br />
 					<div class="control-group" data-bind="visible: !owner(), css: {'error': email.hasError}">
-						<label class="i18n control-label" data-i18n-text="POPUPS_IDENTITIES/LABEL_EMAIL"></label>
+						<label class="i18n control-label" data-i18n-text="POPUPS_IDENTITY/LABEL_EMAIL"></label>
 						<div class="controls">
 							<input type="email" class="inputEmail input-xlarge"
 								autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -24,13 +24,13 @@
 						</div>
 					</div>
 					<div class="control-group" data-bind="visible: owner">
-						<label class="i18n control-label" data-i18n-text="POPUPS_IDENTITIES/LABEL_EMAIL"></label>
+						<label class="i18n control-label" data-i18n-text="POPUPS_IDENTITY/LABEL_EMAIL"></label>
 						<div class="controls">
 							<div class="textEmail" data-bind="text: email"></div>
 						</div>
 					</div>
 					<div class="control-group">
-						<label class="i18n control-label" data-i18n-text="POPUPS_IDENTITIES/LABEL_NAME"></label>
+						<label class="i18n control-label" data-i18n-text="POPUPS_IDENTITY/LABEL_NAME"></label>
 						<div class="controls">
 							<input type="text" class="inputName input-xlarge"
 								autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -38,7 +38,7 @@
 						</div>
 					</div>
 					<div class="control-group" data-bind="visible: showReplyTo, css: {'error': replyTo.hasError}">
-						<label class="i18n control-label" data-i18n-text="POPUPS_IDENTITIES/LABEL_REPLY_TO"></label>
+						<label class="i18n control-label" data-i18n-text="POPUPS_IDENTITY/LABEL_REPLY_TO"></label>
 						<div class="controls">
 							<input type="text" class="inputReplyTo input-xlarge"
 								autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -46,7 +46,7 @@
 						</div>
 					</div>
 					<div class="control-group" data-bind="visible: showBcc, css: {'error': bcc.hasError}">
-						<label class="i18n control-label" data-i18n-text="POPUPS_IDENTITIES/LABEL_BCC"></label>
+						<label class="i18n control-label" data-i18n-text="POPUPS_IDENTITY/LABEL_BCC"></label>
 						<div class="controls">
 							<input type="text" class="inputBcc input-xlarge"
 								autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -56,12 +56,12 @@
 					<div class="control-group" data-bind="visible: !showReplyTo() || !showBcc()">
 						<div class="controls">
 							<span data-bind="visible: !showReplyTo()">
-								<span class="i18n g-ui-link" data-i18n-text="POPUPS_IDENTITIES/LABEL_REPLY_TO"
+								<span class="i18n g-ui-link" data-i18n-text="POPUPS_IDENTITY/LABEL_REPLY_TO"
 									data-bind="click: function () { showReplyTo(true); }"></span>
 								&nbsp;&nbsp;
 							</span>
 							<span data-bind="visible: !showBcc()">
-								<span class="i18n g-ui-link" data-i18n-text="POPUPS_IDENTITIES/LABEL_BCC"
+								<span class="i18n g-ui-link" data-i18n-text="POPUPS_IDENTITY/LABEL_BCC"
 									data-bind="click: function () { showBcc(true); }"></span>
 							</span>
 						</div>
@@ -72,7 +72,7 @@
 							<div data-bind="component: {
 								name: 'Checkbox',
 								params: {
-									label: 'POPUPS_IDENTITIES/LABEL_SIGNATURE_INSERT_BEFORE',
+									label: 'POPUPS_IDENTITY/LABEL_SIGNATURE_INSERT_BEFORE',
 									value: signatureInsertBefore
 								}
 							}"></div>
@@ -88,8 +88,8 @@
 					<i data-bind="visible: !edit(), css: {'icon-user-add': !submitRequest(), 'icon-spinner animated': submitRequest()}"></i>
 					<i data-bind="visible: edit, css: {'icon-ok': !submitRequest(), 'icon-spinner animated': submitRequest()}"></i>
 					&nbsp;&nbsp;
-					<span data-bind="visible: !edit()" class="i18n" data-i18n-text="POPUPS_IDENTITIES/BUTTON_ADD_IDENTITY"></span>
-					<span data-bind="visible: edit" class="i18n" data-i18n-text="POPUPS_IDENTITIES/BUTTON_UPDATE_IDENTITY"></span>
+					<span data-bind="visible: !edit()" class="i18n" data-i18n-text="POPUPS_IDENTITY/BUTTON_ADD_IDENTITY"></span>
+					<span data-bind="visible: edit" class="i18n" data-i18n-text="POPUPS_IDENTITY/BUTTON_UPDATE_IDENTITY"></span>
 				</a>
 			</div>
 		</div>
diff --git a/rainloop/v/0.0.0/langs/bg.ini b/rainloop/v/0.0.0/langs/bg.ini
index 4fc5f4d31..70e86cedd 100644
--- a/rainloop/v/0.0.0/langs/bg.ini
+++ b/rainloop/v/0.0.0/langs/bg.ini
@@ -131,10 +131,12 @@ LABEL_TO = "До"
 LABEL_TO_SHORT = "до"
 LABEL_CC = "CC"
 LABEL_BCC = "BCC"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "От"
 PRINT_LABEL_TO = "До"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "BCC"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Дата"
 PRINT_LABEL_SUBJECT = "Заглавие"
 PRINT_LABEL_ATTACHMENTS = "Прикрепени файлове"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Добави"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Добавяне на идентичност?"
 TITLE_UPDATE_IDENTITY = "Обновяване на идентичност?"
 BUTTON_ADD_IDENTITY = "Добавяне"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Обновяване"
 LABEL_EMAIL = "Имейл"
 LABEL_NAME = "Име"
 LABEL_REPLY_TO = "Отговорете на"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Bcc"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Създаване на папка?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Акаунти"
 LABEL_IDENTITY_NAME = "Идентичност"
 LABEL_IDENTITIES_NAME = "Идентичности"
 LABEL_FILTERS_NAME = "Филтри"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Сигурност"
 LABEL_SOCIAL_NAME = "Социални"
 LABEL_THEMES_NAME = "Теми"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Списък с акаунти"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Добавяне на акаунт"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Изтрий"
 LOADING_PROCESS = "Обновяване на списъка с акаунти"
 DELETING_ASK = "Сигурни ли сте?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Поддръжката на Бисквитки не е нал
 Моля, разрешете поддръжката на Бисквитки в настройките на вашия браузър и опитайте отново."
 BAD_BROWSER_TITLE = "Вашият браузър е остарял."
 BAD_BROWSER_DESC = "За да използвате всички функции на приложението,
-изтеглете и инсталирайте един от тези браузъри:"
+изтеглете и инсталирайте един от тези браузъри:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/de.ini b/rainloop/v/0.0.0/langs/de.ini
index d055cac68..04733ed06 100644
--- a/rainloop/v/0.0.0/langs/de.ini
+++ b/rainloop/v/0.0.0/langs/de.ini
@@ -131,10 +131,12 @@ LABEL_TO = "An"
 LABEL_TO_SHORT = "an"
 LABEL_CC = "CC"
 LABEL_BCC = "BCC"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "Von"
 PRINT_LABEL_TO = "An"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "BCC"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Datum"
 PRINT_LABEL_SUBJECT = "Betreff"
 PRINT_LABEL_ATTACHMENTS = "Anhänge"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Hinzufügen"
 TITLE_UPDATE_ACCOUNT = "Konto aktualisieren?"
 BUTTON_UPDATE_ACCOUNT = "Aktualisieren"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Identität hinzufügen?"
 TITLE_UPDATE_IDENTITY = "Identität aktualisieren?"
 BUTTON_ADD_IDENTITY = "Hinzufügen"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Aktualisieren"
 LABEL_EMAIL = "E-Mail"
 LABEL_NAME = "Name"
 LABEL_REPLY_TO = "Antwort an"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "BCC"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Ordner anlegen?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Konten"
 LABEL_IDENTITY_NAME = "Identität"
 LABEL_IDENTITIES_NAME = "Identitäten"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Sicherheit"
 LABEL_SOCIAL_NAME = "Sozial"
 LABEL_THEMES_NAME = "Vorlagen"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "Wir zeigen aus Leistungsgründen nur einen Teil von ih
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Liste der Konten"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Konto hinzufügen"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Löschen"
 LOADING_PROCESS = "Liste der Konten wird geladen"
 DELETING_ASK = "Sind Sie sicher?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Ihr Browser unterstützt Cookies nicht.
 Aktivieren Sie bitte die Cookie-Unterstützung in Ihrem Browser und versuchen Sie es noch einmal."
 BAD_BROWSER_TITLE = "Ihr Browser ist veraltet."
 BAD_BROWSER_DESC = "Um alle Features dieser Anwendung nutzen zu können,
-sollten Sie einen aktuellen Browser installieren!"
+sollten Sie einen aktuellen Browser installieren!"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/en.ini b/rainloop/v/0.0.0/langs/en.ini
index 8f6d9219a..058e51e9c 100644
--- a/rainloop/v/0.0.0/langs/en.ini
+++ b/rainloop/v/0.0.0/langs/en.ini
@@ -249,15 +249,7 @@ BUTTON_ADD_ACCOUNT = "Add"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_ADD_TEMPLATE]
-TITLE_ADD_TEMPLATE = "Add Template?"
-BUTTON_ADD_TEMPLATE = "Add"
-TITLE_UPDATE_TEMPLATE = "Update Template?"
-BUTTON_UPDATE_TEMPLATE = "Update"
-LABEL_NAME = "Name"
-LABEL_TEXT = "Text"
-
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Add Identity?"
 TITLE_UPDATE_IDENTITY = "Update Identity?"
 BUTTON_ADD_IDENTITY = "Add"
@@ -543,14 +535,7 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 LEGEND_ACCOUNTS = "Account List"
 LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Add an Account"
-BUTTON_ADD_IDENTITY= "Add an Identity"
-BUTTON_DELETE = "Delete"
-LOADING_PROCESS = "Updating..."
-DELETING_ASK = "Are you sure?"
-
-[SETTINGS_TEMPLATES]
-LEGEND_TEMPLATES = "Templates"
-BUTTON_ADD_TEMPLATE = "Add a Template"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Delete"
 LOADING_PROCESS = "Updating..."
 DELETING_ASK = "Are you sure?"
@@ -698,4 +683,4 @@ NO_COOKIE_DESC = "Cookies support is not available in your browser.
 Please enable Cookie support in your browser settings and retry."
 BAD_BROWSER_TITLE = "Your browser is outdated."
 BAD_BROWSER_DESC = "To use all the features of the application,
-download and install one of these browsers:"
+download and install one of these browsers:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/es.ini b/rainloop/v/0.0.0/langs/es.ini
index c41f06c64..64e2a7160 100644
--- a/rainloop/v/0.0.0/langs/es.ini
+++ b/rainloop/v/0.0.0/langs/es.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Para"
 LABEL_TO_SHORT = "para"
 LABEL_CC = "CC"
 LABEL_BCC = "BCC"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "De"
 PRINT_LABEL_TO = "Para"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "BCC"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Fecha"
 PRINT_LABEL_SUBJECT = "Asunto"
 PRINT_LABEL_ATTACHMENTS = "Adjuntos"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Añadir"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "¿Añadir Identidad?"
 TITLE_UPDATE_IDENTITY = "¿Actualizar identidad?"
 BUTTON_ADD_IDENTITY = "Agregar"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Actualizar"
 LABEL_EMAIL = "Email"
 LABEL_NAME = "Nombre"
 LABEL_REPLY_TO = "Responder a"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Bcc"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Crear una carpeta"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Cuentas"
 LABEL_IDENTITY_NAME = "Identidad"
 LABEL_IDENTITIES_NAME = "Identidades"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Seguridad"
 LABEL_SOCIAL_NAME = "Social"
 LABEL_THEMES_NAME = "Temas"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Lista de cuentas"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Añadir cuenta"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Eliminar"
 LOADING_PROCESS = "Actualizando lista de cuentas"
 DELETING_ASK = "¿Está usted seguro?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "El soporte de Cookies no esta disponible en su navegador.
 Por favor habilite los Cookie en la configuración de su navegador e inténtelo de nuevo."
 BAD_BROWSER_TITLE = "Su navegador no está actualizado."
 BAD_BROWSER_DESC = "Para usar todas las características de esta aplicación,
-descargue e instale uno de estos navegadores:"
+descargue e instale uno de estos navegadores:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/fr.ini b/rainloop/v/0.0.0/langs/fr.ini
index 872bcb175..285bbc121 100644
--- a/rainloop/v/0.0.0/langs/fr.ini
+++ b/rainloop/v/0.0.0/langs/fr.ini
@@ -131,10 +131,12 @@ LABEL_TO = "A"
 LABEL_TO_SHORT = "à"
 LABEL_CC = "CC"
 LABEL_BCC = "BCC"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "De"
 PRINT_LABEL_TO = "A"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "BCC"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Date"
 PRINT_LABEL_SUBJECT = "Sujet"
 PRINT_LABEL_ATTACHMENTS = "Pièces jointes"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Ajouter"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Ajouter une identité ?"
 TITLE_UPDATE_IDENTITY = "Mettre à jour l'identité ?"
 BUTTON_ADD_IDENTITY = "Ajouter"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Mettre à jour"
 LABEL_EMAIL = "Adresse email"
 LABEL_NAME = "Nom"
 LABEL_REPLY_TO = "Répondre à"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "CCI"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Créer un dossier ?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Comptes"
 LABEL_IDENTITY_NAME = "Identité"
 LABEL_IDENTITIES_NAME = "Identities"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Securité"
 LABEL_SOCIAL_NAME = "Social"
 LABEL_THEMES_NAME = "Thèmes"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Liste des comptes"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Ajouter un compte"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Supprimer"
 LOADING_PROCESS = "Mise à jour de la liste des comptes"
 DELETING_ASK = "Êtes-vous sûr ?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Le support des cookies n'est pas disponible dans votre navigat
 S'il vous plaît activer le support des cookies dans les paramètres de votre navigateur et réessayez."
 BAD_BROWSER_TITLE = "Votre navigateur n'est pas à jour."
 BAD_BROWSER_DESC = "Pour utiliser toutes les fonctionnalités de l'application,
-télécharger et installer l'un de ces navigateurs :"
+télécharger et installer l'un de ces navigateurs :"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/hu.ini b/rainloop/v/0.0.0/langs/hu.ini
index 43d184406..47c2c8b77 100644
--- a/rainloop/v/0.0.0/langs/hu.ini
+++ b/rainloop/v/0.0.0/langs/hu.ini
@@ -131,10 +131,12 @@ LABEL_TO = "To"
 LABEL_TO_SHORT = "to"
 LABEL_CC = "CC"
 LABEL_BCC = "BCC"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "From"
 PRINT_LABEL_TO = "To"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "BCC"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Dátum"
 PRINT_LABEL_SUBJECT = "Tárgy"
 PRINT_LABEL_ATTACHMENTS = "Mellékletek"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Hozzáadás"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Új identitás?"
 TITLE_UPDATE_IDENTITY = "Frissítsük az identitást?"
 BUTTON_ADD_IDENTITY = "Hozzáadás"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Frissítés"
 LABEL_EMAIL = "E-mail"
 LABEL_NAME = "Név"
 LABEL_REPLY_TO = "Válasz"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Bcc"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Létrehozzuk a mappát?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Fiókok"
 LABEL_IDENTITY_NAME = "Identitás"
 LABEL_IDENTITIES_NAME = "Identitások"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Security"
 LABEL_SOCIAL_NAME = "Közösség"
 LABEL_THEMES_NAME = "Sablonok"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Fiók lista"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Új fiók"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Tőrlés"
 LOADING_PROCESS = "Fiók lista frissítés"
 DELETING_ASK = "Biztosak vagyunk benne?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Cookies support is not available in your browser.
 Please enable Cookie support in your browser settings and retry."
 BAD_BROWSER_TITLE = "A böngésző elavult."
 BAD_BROWSER_DESC = "To use all the features of the application,
-download and install one of these browsers:"
+download and install one of these browsers:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/is.ini b/rainloop/v/0.0.0/langs/is.ini
index e1a63c748..61e71adf7 100644
--- a/rainloop/v/0.0.0/langs/is.ini
+++ b/rainloop/v/0.0.0/langs/is.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Til"
 LABEL_TO_SHORT = "til"
 LABEL_CC = "CC"
 LABEL_BCC = "BCC"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "Frá"
 PRINT_LABEL_TO = "Til"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "BCC"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Dagsetning"
 PRINT_LABEL_SUBJECT = "Viðhengi"
 PRINT_LABEL_ATTACHMENTS = "Viðhengi"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Bæta við"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Add Identity?"
 TITLE_UPDATE_IDENTITY = "Update Identity?"
 BUTTON_ADD_IDENTITY = "Add"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Update"
 LABEL_EMAIL = "Email"
 LABEL_NAME = "Name"
 LABEL_REPLY_TO = "Reply To"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Bcc"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Búa til möppu?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Aðgangar"
 LABEL_IDENTITY_NAME = "Identity"
 LABEL_IDENTITIES_NAME = "Identities"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Security"
 LABEL_SOCIAL_NAME = "Social"
 LABEL_THEMES_NAME = "Þemur"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Aðgangslisti"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Bæta við aðgangi"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Eyða"
 LOADING_PROCESS = "Uppfæri aðgangslista"
 DELETING_ASK = "Ertu viss?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Köku stuðningur er ekki til staðar í vafranum þínum.
 Vinsamlegast gerðu JavaScript virkt í vafranum þínum og reyndu aftur."
 BAD_BROWSER_TITLE = "Vafrinn þinn er úreltur."
 BAD_BROWSER_DESC = "Til að geta notað alla valmöguleika í þessu forriti,
-niðurhalaðu og settu upp einn af þessum vöfrum:"
+niðurhalaðu og settu upp einn af þessum vöfrum:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/it.ini b/rainloop/v/0.0.0/langs/it.ini
index 7cac9c88b..cc1ef0382 100644
--- a/rainloop/v/0.0.0/langs/it.ini
+++ b/rainloop/v/0.0.0/langs/it.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Email"
 LABEL_LOGIN = "Login"
@@ -130,10 +131,12 @@ LABEL_TO = "A"
 LABEL_TO_SHORT = "a"
 LABEL_CC = "CC"
 LABEL_BCC = "CCN"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "Da"
 PRINT_LABEL_TO = "A"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "CCN"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Data"
 PRINT_LABEL_SUBJECT = "Oggetto"
 PRINT_LABEL_ATTACHMENTS = "Allegati"
@@ -246,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Aggiungi"
 TITLE_UPDATE_ACCOUNT = "Aggiorno account?"
 BUTTON_UPDATE_ACCOUNT = "Aggiorna"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Aggiungo un'identità?"
 TITLE_UPDATE_IDENTITY = "Aggiorno identità?"
 BUTTON_ADD_IDENTITY = "Aggiungi"
@@ -254,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Aggiorna"
 LABEL_EMAIL = "Email"
 LABEL_NAME = "Nome"
 LABEL_REPLY_TO = "Rispondi a"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "CCN"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Creo una cartella?"
@@ -311,7 +317,7 @@ BUTTON_TEST = "Esegui test"
 TITLE_CREATE_FILTER = "Creo un filtro?"
 TITLE_EDIT_FILTER = "Aggiorno il filtro?"
 FILTER_NAME = "Nome"
-LEGEND_CONDIFIONS = "Condizioni"
+LEGEND_CONDITIONS = "Conditions"
 LEGEND_ACTIONS = "Azioni"
 BUTTON_DONE = "Fatto"
 BUTTON_ADD_CONDITION = "Aggiungi una condizione"
@@ -360,13 +366,10 @@ BUTTON_CLOSE = "Chiudi"
 NOTIFICATION_SENT = "Non hai selezionato una cartella di sistema per la posta inviata.
 Se non vuoi salvare i messaggi inviati seleziona \"Non usarla\"."
 NOTIFICATION_DRAFTS = "Non hai selezionato una cartella di sistema per le bozze."
-
 NOTIFICATION_SPAM = "Non hai selezionato una cartella di sistema per i messaggi spam.
 Se li vuoi eliminare permanentemente seleziona \"Non usarla\"."
-
 NOTIFICATION_TRASH = "Non hai selezionato una cartella di sistema per il cestino.
 Se non lo vuoi usare (e quindi eliminare i messaggi permanentemente) seleziona \"Non usarla\"."
-
 NOTIFICATION_ARCHIVE = "Non hai selezionato una cartella di sistema per i messaggi archiviati."
 
 [TITLES]
@@ -399,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Account"
 LABEL_IDENTITY_NAME = "Identità"
 LABEL_IDENTITIES_NAME = "Identità"
 LABEL_FILTERS_NAME = "Filtri"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Sicurezza"
 LABEL_SOCIAL_NAME = "Social"
 LABEL_THEMES_NAME = "Temi"
@@ -529,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "Vengono visualizzate solo una parte per evitare proble
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Lista degli account"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Aggiungi account"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Elimina"
 LOADING_PROCESS = "Aggiornamento della lista degli account..."
 DELETING_ASK = "Sei sicuro?"
@@ -588,14 +594,12 @@ LABEL_FULLSCREEN_ENTER = "Schermo intero (con anteprima messaggi)"
 LABEL_VIEW_MESSAGE_ENTER = "Visualizza messaggio (senza anteprima messaggi)"
 LABEL_SWITCH_TO_MESSAGE = "Sposta la selezione sul messaggio corrente"
 LABEL_SWITCH_TO_FOLDER_LIST = "Sposta la selezione sulla lista delle cartelle"
-
 LABEL_FULLSCREEN_TOGGLE = "Attiva/disattiva la modalità a schermo intero"
 LABEL_BLOCKQUOTES_TOGGLE = "Mostra/nascondi le citazioni"
 LABEL_PRINT = "Stampa"
 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_OPEN_IDENTITIES_DROPDOWN = "Apri il menu di selezione delle identità"
 LABEL_SAVE_MESSAGE = "Salva messaggio"
@@ -671,7 +675,6 @@ BACK_LINK = "Ricarica"
 DOMAIN_LIST_DESC = "Lista dei domini abilitati ad accedere"
 PHP_EXSTENSIONS_ERROR_DESC = "È richiesta un'estensione di PHP non installata!"
 PHP_VERSION_ERROR_DESC = "La tua versione di PHP (%VERSION%) è meno recente della 5.3.0!"
-
 NO_SCRIPT_TITLE = "È richiesto JavaScript per questa applicazione."
 NO_SCRIPT_DESC = "Il supporto a JavaScript è disabilitato.
 Abilitare il supporto a JavaScript e riprovare."
@@ -680,4 +683,4 @@ NO_COOKIE_DESC = "Il supporto ai Cookie è disabilitato.
 Abilitare il supporto ai Cookie e riprovare."
 BAD_BROWSER_TITLE = "Il tuo browser è troppo vecchio"
 BAD_BROWSER_DESC = "Per usare tutte le funzionalità dell'applicazione,
-scarica ed installa uno dei seguenti browser:"
+scarica ed installa uno dei seguenti browser:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/ja-jp.ini b/rainloop/v/0.0.0/langs/ja-jp.ini
index bdf528c74..3e4097344 100644
--- a/rainloop/v/0.0.0/langs/ja-jp.ini
+++ b/rainloop/v/0.0.0/langs/ja-jp.ini
@@ -131,10 +131,12 @@ LABEL_TO = "宛先"
 LABEL_TO_SHORT = "宛先"
 LABEL_CC = "CC"
 LABEL_BCC = "BCC"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "差出人"
 PRINT_LABEL_TO = "宛先"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "BCC"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "日付"
 PRINT_LABEL_SUBJECT = "件名"
 PRINT_LABEL_ATTACHMENTS = "添付ファイル"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "追加"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "メールの表示名を追加しますか？"
 TITLE_UPDATE_IDENTITY = "メールの表示名を更新しますか？"
 BUTTON_ADD_IDENTITY = "追加"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "更新"
 LABEL_EMAIL = "メールアドレス"
 LABEL_NAME = "表示名"
 LABEL_REPLY_TO = "返信先"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Bcc"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "フォルダを作成しますか？"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "アカウント"
 LABEL_IDENTITY_NAME = "Identity"
 LABEL_IDENTITIES_NAME = "表示名"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Security"
 LABEL_SOCIAL_NAME = "Social"
 LABEL_THEMES_NAME = "テーマ"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Account List"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Add Account"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Delete"
 LOADING_PROCESS = "Updating account list"
 DELETING_ASK = "Are you sure?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Cookies support is not available in your browser.
 Please enable Cookie support in your browser settings and retry."
 BAD_BROWSER_TITLE = "Your browser is outdated."
 BAD_BROWSER_DESC = "To use all the features of the application,
-download and install one of these browsers:"
+download and install one of these browsers:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/ko-kr.ini b/rainloop/v/0.0.0/langs/ko-kr.ini
index 7fbae000e..4d065da94 100644
--- a/rainloop/v/0.0.0/langs/ko-kr.ini
+++ b/rainloop/v/0.0.0/langs/ko-kr.ini
@@ -131,10 +131,12 @@ LABEL_TO = "받는이"
 LABEL_TO_SHORT = "받는이"
 LABEL_CC = "참조"
 LABEL_BCC = "숨은 참조"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "보낸 이"
 PRINT_LABEL_TO = "받는 이"
 PRINT_LABEL_CC = "참조"
 PRINT_LABEL_BCC = "숨은 참조"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "날짜"
 PRINT_LABEL_SUBJECT = "제목"
 PRINT_LABEL_ATTACHMENTS = "첨부파일"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "추가"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "새 서명 추가?"
 TITLE_UPDATE_IDENTITY = "서명을 수정하시겠습니까?"
 BUTTON_ADD_IDENTITY = "추가"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "수정"
 LABEL_EMAIL = "이메일"
 LABEL_NAME = "이름"
 LABEL_REPLY_TO = "답장"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "숨은 참조"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "새 폴더 생성?"
@@ -394,6 +399,7 @@ LABEL_ACCOUNTS_NAME = "계정"
 LABEL_IDENTITY_NAME = "신원"
 LABEL_IDENTITIES_NAME = "신원"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Security"
 LABEL_SOCIAL_NAME = "소셜"
 LABEL_THEMES_NAME = "테마"
@@ -524,7 +530,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "계정 목록"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "계정 추가"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "삭제"
 LOADING_PROCESS = "계정 목록을 업데이트하고 있습니다."
 DELETING_ASK = "정말로 삭제하시겠습니까?"
@@ -669,4 +677,4 @@ NO_SCRIPT_DESC = "사용 중인 브라우저가 자바스크립트를 지원하
 NO_COOKIE_TITLE = "이 어플리케이션을 사용하려면 쿠키 사용이 지원되야 합니다."
 NO_COOKIE_DESC = "사용 중인 브라우저가 쿠키를 지원하지 않습니다. 브라우저 설정을 확인하여 쿠키 사용을 활성화하고 다시 시도해주세요."
 BAD_BROWSER_TITLE = "사용 중인 브라우저가 구버전입니다."
-BAD_BROWSER_DESC = "이 어플리케이션을 정상적으로 사용하시려면 아래의 브라우저들 중 하나를 설치해주세요:"
+BAD_BROWSER_DESC = "이 어플리케이션을 정상적으로 사용하시려면 아래의 브라우저들 중 하나를 설치해주세요:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/lt.ini b/rainloop/v/0.0.0/langs/lt.ini
index b216dfb09..a037e4ad8 100644
--- a/rainloop/v/0.0.0/langs/lt.ini
+++ b/rainloop/v/0.0.0/langs/lt.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Kam"
 LABEL_TO_SHORT = "kam"
 LABEL_CC = "Kopija"
 LABEL_BCC = "Nematoma kopija"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "Nuo"
 PRINT_LABEL_TO = "Kam"
 PRINT_LABEL_CC = "Kopija"
 PRINT_LABEL_BCC = "Nematoma kopija"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Data"
 PRINT_LABEL_SUBJECT = "Tema"
 PRINT_LABEL_ATTACHMENTS = "Priedai"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Pridėti"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Pridėti tapatybę?"
 TITLE_UPDATE_IDENTITY = "Atnaujinti tapatybę?"
 BUTTON_ADD_IDENTITY = "Pridėti"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Atnaujinti"
 LABEL_EMAIL = "E-paštas"
 LABEL_NAME = "Vardas"
 LABEL_REPLY_TO = "Atsakyti"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Nematoma kopija"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Sukurti aplanką?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Paskyros"
 LABEL_IDENTITY_NAME = "Tapatybės"
 LABEL_IDENTITIES_NAME = "Tapatybės"
 LABEL_FILTERS_NAME = "Filtrai"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Sauga"
 LABEL_SOCIAL_NAME = "Socialiniai"
 LABEL_THEMES_NAME = "Temos"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Paskyrų sąrašas"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Pridėti paskyrą"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Šalinti"
 LOADING_PROCESS = "Atnaujinamas paskyrų sąrašas"
 DELETING_ASK = "Ar Jūs įsitikinę?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Slapukų paialikymas negalimas jūsų naršyklėje.
 Įjunkite slapukų palaikymą naršyklėje ir bandykite vėl."
 BAD_BROWSER_TITLE = "Jūsų naršyklė pasenusi."
 BAD_BROWSER_DESC = "Norint naudotis visais šios aplikacijos privalumais,
-parsisiųskite ir įsidiekite vieną iš šių naršyklių:"
+parsisiųskite ir įsidiekite vieną iš šių naršyklių:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/lv.ini b/rainloop/v/0.0.0/langs/lv.ini
index 6e685200c..e5114ef05 100644
--- a/rainloop/v/0.0.0/langs/lv.ini
+++ b/rainloop/v/0.0.0/langs/lv.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Kam"
 LABEL_TO_SHORT = "kam"
 LABEL_CC = "CC"
 LABEL_BCC = "BCC"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "No"
 PRINT_LABEL_TO = "Kam"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "BCC"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Datums"
 PRINT_LABEL_SUBJECT = "Tēma"
 PRINT_LABEL_ATTACHMENTS = "Pielikumi"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Pievienot"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Add Identity?"
 TITLE_UPDATE_IDENTITY = "Update Identity?"
 BUTTON_ADD_IDENTITY = "Add"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Update"
 LABEL_EMAIL = "Email"
 LABEL_NAME = "Name"
 LABEL_REPLY_TO = "Reply To"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Bcc"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Izveidot mapi?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Konti"
 LABEL_IDENTITY_NAME = "Identity"
 LABEL_IDENTITIES_NAME = "Identities"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Security"
 LABEL_SOCIAL_NAME = "Sociālie"
 LABEL_THEMES_NAME = "Tēmas"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Kontu saraksts"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Pievienot kontu"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Dzēst"
 LOADING_PROCESS = "Atjauno kontu sarakstu"
 DELETING_ASK = "Tiešām?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Cookies atbalsts nav pieejams šai pārlūkprogrammai.
 Lūdzu ieslēdziet Cookies atbalstu."
 BAD_BROWSER_TITLE = "Jūsu pārlūkprogramma ir novecojusi."
 BAD_BROWSER_DESC = "Lai izmantotu pilnas šis aplikācijas iespējas,
-lejupielādējat un uzinstalējas kādu no šīm pārlukprogrammām:"
+lejupielādējat un uzinstalējas kādu no šīm pārlukprogrammām:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/nl.ini b/rainloop/v/0.0.0/langs/nl.ini
index 6c39b0565..c15a6fc01 100644
--- a/rainloop/v/0.0.0/langs/nl.ini
+++ b/rainloop/v/0.0.0/langs/nl.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Naar"
 LABEL_TO_SHORT = "naar"
 LABEL_CC = "CC"
 LABEL_BCC = "BCC"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "Van"
 PRINT_LABEL_TO = "Naar"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "BCC"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Datum"
 PRINT_LABEL_SUBJECT = "Onderwerp"
 PRINT_LABEL_ATTACHMENTS = "Bijlagen"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Toevoegen"
 TITLE_UPDATE_ACCOUNT = "Account updaten?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Identiteit toevoegen?"
 TITLE_UPDATE_IDENTITY = "Identiteit bijwerken?"
 BUTTON_ADD_IDENTITY = "Toevoegen"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Bijwerken"
 LABEL_EMAIL = "E-mail adres"
 LABEL_NAME = "Naam"
 LABEL_REPLY_TO = "Antwoordadres"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "BCC"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Map aanmaken?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Accounts"
 LABEL_IDENTITY_NAME = "Identiteit"
 LABEL_IDENTITIES_NAME = "Identiteiten"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Beveiliging"
 LABEL_SOCIAL_NAME = "Social"
 LABEL_THEMES_NAME = "Thema's"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "Er worden er maar een deel weergegeven om prestatiepro
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Account Lijst"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Account toevoegen"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Wissen"
 LOADING_PROCESS = "Account lijst aan het bijwerken"
 DELETING_ASK = "Weet u het zeker?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Cookies ondersteuning is niet beschikbaar in uw browser.
 Gelieve Cookies in te schakelen en opnieuw te proberen."
 BAD_BROWSER_TITLE = "Uw browser is verouderd"
 BAD_BROWSER_DESC = "Om alle functies van deze applicatie te gebruiken,
-download en installeer een van de volgende browsers:"
+download en installeer een van de volgende browsers:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/no.ini b/rainloop/v/0.0.0/langs/no.ini
index d3b344e84..650616ce8 100644
--- a/rainloop/v/0.0.0/langs/no.ini
+++ b/rainloop/v/0.0.0/langs/no.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Til"
 LABEL_TO_SHORT = "til"
 LABEL_CC = "Kopi"
 LABEL_BCC = "Blindkopi"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "Fra"
 PRINT_LABEL_TO = "Til"
 PRINT_LABEL_CC = "Kopi"
 PRINT_LABEL_BCC = "Blindkopi"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Dato"
 PRINT_LABEL_SUBJECT = "Emne"
 PRINT_LABEL_ATTACHMENTS = "Vedlegg"
@@ -246,7 +248,7 @@ BUTTON_ADD_ACCOUNT = "Legg til"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Legg til identitet?"
 TITLE_UPDATE_IDENTITY = "Oppdater identitet?"
 BUTTON_ADD_IDENTITY = "Legg til"
@@ -254,7 +256,10 @@ BUTTON_UPDATE_IDENTITY = "Oppdater"
 LABEL_EMAIL = "E-post"
 LABEL_NAME = "Navn"
 LABEL_REPLY_TO = "Svar til"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Blindkopi"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Opprett en mappe ?"
@@ -396,6 +401,7 @@ LABEL_ACCOUNTS_NAME = "Kontoer"
 LABEL_IDENTITY_NAME = "Identitet"
 LABEL_IDENTITIES_NAME = "Identiteter"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Sikkerhet"
 LABEL_SOCIAL_NAME = "Sosialt"
 LABEL_THEMES_NAME = "Tema"
@@ -526,7 +532,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Kontoer"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Legg til konto"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Slett"
 LOADING_PROCESS = "Oppdaterer kontoer"
 DELETING_ASK = "Er du sikker?"
@@ -674,4 +682,4 @@ NO_COOKIE_DESC = "Cookies-støtte er ikke tilgjengelig i nettleseren din .
 Vennligst aktiver Cookie-støtte i nettleserens innstillinger, og prøv på nytt ."
 BAD_BROWSER_TITLE = "Nettleseren din er utdatert."
 BAD_BROWSER_DESC = "Hvis du vil bruke alle funksjonene i programmet,
-last ned og installerer en av disse nettleserne:"
+last ned og installerer en av disse nettleserne:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/pl.ini b/rainloop/v/0.0.0/langs/pl.ini
index 3b19e64fa..0ce2cbad9 100644
--- a/rainloop/v/0.0.0/langs/pl.ini
+++ b/rainloop/v/0.0.0/langs/pl.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Do"
 LABEL_TO_SHORT = "Do"
 LABEL_CC = "Kopia do"
 LABEL_BCC = "Ukryci odbiorcy"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "Od"
 PRINT_LABEL_TO = "Do"
 PRINT_LABEL_CC = "Kopia do"
 PRINT_LABEL_BCC = "Ukryci odbiorcy"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Data"
 PRINT_LABEL_SUBJECT = "Temat"
 PRINT_LABEL_ATTACHMENTS = "Załączniki"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Dodaj"
 TITLE_UPDATE_ACCOUNT = "Zaktualizować konto ?"
 BUTTON_UPDATE_ACCOUNT = "Aktualizuj"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Dodawanie tożsamości"
 TITLE_UPDATE_IDENTITY = "Aktualizacja tożsamości"
 BUTTON_ADD_IDENTITY = "Dodaj"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Aktualizuj"
 LABEL_EMAIL = "E-mail"
 LABEL_NAME = "Nazwa"
 LABEL_REPLY_TO = "Odpowiedz do"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Ukryci odbiorcy"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Tworzenie folderu"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Konta"
 LABEL_IDENTITY_NAME = "Tożsamość"
 LABEL_IDENTITIES_NAME = "Tożsamości"
 LABEL_FILTERS_NAME = "Filtry"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Bezpieczeństwo"
 LABEL_SOCIAL_NAME = "Sieci społecznościowe"
 LABEL_THEMES_NAME = "Skórki"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Lista kont"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Dodaj konto"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Usuń"
 LOADING_PROCESS = "Trwa aktualizowanie listy kont"
 DELETING_ASK = "Czy na pewno usunąć?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Obsługa Cookies jest wyłączona w twojej przeglądarce
 Proszę o umożliwienie obsługi plików Cookie w przeglądarce oraz ponowne uruchomienie tej strony."
 BAD_BROWSER_TITLE = "Twoja przeglądarka jest przestarzała!"
 BAD_BROWSER_DESC = "W celu wykorzystania wszystkich funkcji tej aplikacji,
-zaktualizuj aktualnie używaną lub pobierz i zainstaluj jedną z poniższych przeglądarek:"
+zaktualizuj aktualnie używaną lub pobierz i zainstaluj jedną z poniższych przeglądarek:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/pt-br.ini b/rainloop/v/0.0.0/langs/pt-br.ini
index 845dfa7b5..e44a54c54 100644
--- a/rainloop/v/0.0.0/langs/pt-br.ini
+++ b/rainloop/v/0.0.0/langs/pt-br.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Para"
 LABEL_TO_SHORT = "para"
 LABEL_CC = "Cc"
 LABEL_BCC = "Cco"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "De"
 PRINT_LABEL_TO = "Para"
 PRINT_LABEL_CC = "Cc"
 PRINT_LABEL_BCC = "Cco"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Data"
 PRINT_LABEL_SUBJECT = "Assunto"
 PRINT_LABEL_ATTACHMENTS = "Anexos"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Adicionar"
 TITLE_UPDATE_ACCOUNT = "Atualizar Conta?"
 BUTTON_UPDATE_ACCOUNT = "Atualizar"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Adicionar identidade"
 TITLE_UPDATE_IDENTITY = "Atualizar identidade?"
 BUTTON_ADD_IDENTITY = "Adicionar"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Atualizar"
 LABEL_EMAIL = "E-mail"
 LABEL_NAME = "Nome"
 LABEL_REPLY_TO = "Responder para"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Cco"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Nova pasta"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Contas"
 LABEL_IDENTITY_NAME = "Identidade"
 LABEL_IDENTITIES_NAME = "Identidades"
 LABEL_FILTERS_NAME = "Filtros"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Segurança"
 LABEL_SOCIAL_NAME = "Social"
 LABEL_THEMES_NAME = "Temas"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "Mostraremos apenas uma parte delas, para evitar proble
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Lista de contas"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Adicionar conta"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Excluir"
 LOADING_PROCESS = "Atualizando a lista de contas"
 DELETING_ASK = "Você tem certeza?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Os Cookies não estão disponíveis em seu navegador.
 Por favor ative o suporte a Cookies nas configurações do seu navegador e tente novamente."
 BAD_BROWSER_TITLE = "Seu navegador está desatualizado."
 BAD_BROWSER_DESC = "Para usar todos os recursos do aplicativo,
-baixe e instale um desses navegadores:"
+baixe e instale um desses navegadores:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/pt-pt.ini b/rainloop/v/0.0.0/langs/pt-pt.ini
index bbb1974b2..6bfa239b3 100644
--- a/rainloop/v/0.0.0/langs/pt-pt.ini
+++ b/rainloop/v/0.0.0/langs/pt-pt.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Para"
 LABEL_TO_SHORT = "para"
 LABEL_CC = "CC"
 LABEL_BCC = "BCC"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "De"
 PRINT_LABEL_TO = "Para"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "BCC"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Data"
 PRINT_LABEL_SUBJECT = "Assunto"
 PRINT_LABEL_ATTACHMENTS = "Anexos"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Adicionar"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Adicionar identidade?"
 TITLE_UPDATE_IDENTITY = "Atualizar identidade?"
 BUTTON_ADD_IDENTITY = "Adicionar"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Atualizar"
 LABEL_EMAIL = "E-mail"
 LABEL_NAME = "Nome"
 LABEL_REPLY_TO = "Reenviar para"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Bcc"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Criar pasta?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Contas"
 LABEL_IDENTITY_NAME = "Identidade"
 LABEL_IDENTITIES_NAME = "Identidades"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Security"
 LABEL_SOCIAL_NAME = "Social"
 LABEL_THEMES_NAME = "Temas"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Lista de contas"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Adicionar contas"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Excluir"
 LOADING_PROCESS = "Atualizar a lista de contas"
 DELETING_ASK = "Você tem certeza?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "O Cookies não está disponível em seu navegador.
 Por favor ativar o suporte a Cookie nas configurações do seu navegador e tente novamente."
 BAD_BROWSER_TITLE = "Seu navegador está desatualizado."
 BAD_BROWSER_DESC = "Para usar todos os recursos do aplicativo,
-baixar e instalar um desses navegadores:"
+baixar e instalar um desses navegadores:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/ro.ini b/rainloop/v/0.0.0/langs/ro.ini
index 5afaf3837..ead620f78 100644
--- a/rainloop/v/0.0.0/langs/ro.ini
+++ b/rainloop/v/0.0.0/langs/ro.ini
@@ -131,10 +131,12 @@ LABEL_TO = "către"
 LABEL_TO_SHORT = "către"
 LABEL_CC = "copie către"
 LABEL_BCC = "copie 2 către"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "de la"
 PRINT_LABEL_TO = "către"
 PRINT_LABEL_CC = "copie către"
 PRINT_LABEL_BCC = "a doua copie către"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Data"
 PRINT_LABEL_SUBJECT = "Subiect"
 PRINT_LABEL_ATTACHMENTS = "Atașament"
@@ -246,7 +248,7 @@ BUTTON_ADD_ACCOUNT = "Adaugă"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Adăugați un profil"
 TITLE_UPDATE_IDENTITY = "Actualizați profilul"
 BUTTON_ADD_IDENTITY = "Adăugați"
@@ -254,7 +256,10 @@ BUTTON_UPDATE_IDENTITY = "Actualizați"
 LABEL_EMAIL = "eMail"
 LABEL_NAME = "Nume"
 LABEL_REPLY_TO = "Răspune la"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Copie"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Creați un dosar"
@@ -396,6 +401,7 @@ LABEL_ACCOUNTS_NAME = "Conturi"
 LABEL_IDENTITY_NAME = "Profil"
 LABEL_IDENTITIES_NAME = "Profiluri"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Security"
 LABEL_SOCIAL_NAME = "Social"
 LABEL_THEMES_NAME = "Subiecte"
@@ -526,7 +532,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Lista de Conturi"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Adaugă un alt cont"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Șterge"
 LOADING_PROCESS = "Actualizez lista de conturi"
 DELETING_ASK = "Sunteți sigur?"
@@ -674,4 +682,4 @@ NO_COOKIE_DESC = "Aparent, Cookie sau nu este acceptat de browser-ul dvs. sau op
 Întoarceți Cookie, schimband optiunile browserului dvs., apoi încercați din nou."
 BAD_BROWSER_TITLE = "Browser-ul dvs. este depășit."
 BAD_BROWSER_DESC = "Pentru a utiliza toate caracteristicile cererii,
-descărcați și instalați unul dintre aceste browsere:"
+descărcați și instalați unul dintre aceste browsere:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/ru.ini b/rainloop/v/0.0.0/langs/ru.ini
index 7215b6ac2..5c6d3f655 100644
--- a/rainloop/v/0.0.0/langs/ru.ini
+++ b/rainloop/v/0.0.0/langs/ru.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Кому"
 LABEL_TO_SHORT = "кому"
 LABEL_CC = "Копия"
 LABEL_BCC = "Скрытая"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "От"
 PRINT_LABEL_TO = "Кому"
 PRINT_LABEL_CC = "Копия"
 PRINT_LABEL_BCC = "Скрытая"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Дата"
 PRINT_LABEL_SUBJECT = "Тема"
 PRINT_LABEL_ATTACHMENTS = "Файлы"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Добавить"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Добавить Профиль?"
 TITLE_UPDATE_IDENTITY = "Обновить Профиль?"
 BUTTON_ADD_IDENTITY = "Добавить"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Обновить"
 LABEL_EMAIL = "Почта"
 LABEL_NAME = "Имя"
 LABEL_REPLY_TO = "Отвечать на"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Скрытая"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Создать папку?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Аккаунты"
 LABEL_IDENTITY_NAME = "Профиль"
 LABEL_IDENTITIES_NAME = "Профили"
 LABEL_FILTERS_NAME = "Фильтры"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Безопасность"
 LABEL_SOCIAL_NAME = "Социальные"
 LABEL_THEMES_NAME = "Темы"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "Мы показали только часть из н
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Список Аккаунтов"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Добавить ещё аккаунт"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Удалить"
 LOADING_PROCESS = "Обновление списка аккаунтов"
 DELETING_ASK = "Точно?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "По-видимому, Cookie либо не поддержив
 Включите Cookie, изменив настройки браузера, затем повторите попытку."
 BAD_BROWSER_TITLE = "Ваш браузер устарел."
 BAD_BROWSER_DESC = "Чтобы использовать все возможности приложения,
-загрузите и установите один из этих браузеров:"
+загрузите и установите один из этих браузеров:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/sk.ini b/rainloop/v/0.0.0/langs/sk.ini
index bfe036c55..9dffe9703 100644
--- a/rainloop/v/0.0.0/langs/sk.ini
+++ b/rainloop/v/0.0.0/langs/sk.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Príjemca"
 LABEL_TO_SHORT = "to"
 LABEL_CC = "Kópia"
 LABEL_BCC = "Skrytá kópia"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "Odosielateľ"
 PRINT_LABEL_TO = "Príjemca"
 PRINT_LABEL_CC = "Kópia"
 PRINT_LABEL_BCC = "Skrytá kópia"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Dátum"
 PRINT_LABEL_SUBJECT = "Predmet"
 PRINT_LABEL_ATTACHMENTS = "Prílohy"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Pridať"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Pridať Identitu?"
 TITLE_UPDATE_IDENTITY = "Upraviť Identitu?"
 BUTTON_ADD_IDENTITY = "Pridať"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Upraviť"
 LABEL_EMAIL = "Email"
 LABEL_NAME = "Meno"
 LABEL_REPLY_TO = "Adresa pre odpoveď"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Skrytá kópia"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Vytvoriť priečinok?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Účty"
 LABEL_IDENTITY_NAME = "Identita"
 LABEL_IDENTITIES_NAME = "Identity"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Security"
 LABEL_SOCIAL_NAME = "Social"
 LABEL_THEMES_NAME = "Motívy"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Zoznam účtov"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Pridať účet"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Odstrániť"
 LOADING_PROCESS = "Aktualizácia zoznamu účtov"
 DELETING_ASK = "Ste si istý?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Váš internetový prehliadač nepodporuje Cookies.
 Prosím povoľte podporu Cookies v nastaveniach vášho internetového prehliadača a skúste to znova."
 BAD_BROWSER_TITLE = "Používate zastaralý internetový prehliadač."
 BAD_BROWSER_DESC = "Aby ste mohli využívať všetky funkcie tejto aplikácie,
-použite niektorý z nasledujúcich internetových prehliadačov:"
+použite niektorý z nasledujúcich internetových prehliadačov:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/sv.ini b/rainloop/v/0.0.0/langs/sv.ini
index 175a24d02..02202667f 100644
--- a/rainloop/v/0.0.0/langs/sv.ini
+++ b/rainloop/v/0.0.0/langs/sv.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Till"
 LABEL_TO_SHORT = "till"
 LABEL_CC = "CC"
 LABEL_BCC = "BCC"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "Från"
 PRINT_LABEL_TO = "Till"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "BCC"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Datum"
 PRINT_LABEL_SUBJECT = "Ämne"
 PRINT_LABEL_ATTACHMENTS = "Bilagor"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Lägg till"
 TITLE_UPDATE_ACCOUNT = "Uppdatera konto?"
 BUTTON_UPDATE_ACCOUNT = "Uppdatera"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Lägg till identitet"
 TITLE_UPDATE_IDENTITY = "Uppdatera identitet"
 BUTTON_ADD_IDENTITY = "Lägg till"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Uppdatera"
 LABEL_EMAIL = "Epost"
 LABEL_NAME = "Namn"
 LABEL_REPLY_TO = "Svara"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Bcc"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Skapa mapp?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Konton"
 LABEL_IDENTITY_NAME = "Identitet"
 LABEL_IDENTITIES_NAME = "Identiteter"
 LABEL_FILTERS_NAME = "Filter"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Säkerhet"
 LABEL_SOCIAL_NAME = "Socialt"
 LABEL_THEMES_NAME = "Teman"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Kontolista"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Lägg till konto"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Ta bort"
 LOADING_PROCESS = "Uppdaterar kontolista"
 DELETING_ASK = "Är du säker?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Kakstöd är inte tillgängligt i webbläsaren.
 Aktivera kakstöd och försök igen."
 BAD_BROWSER_TITLE = "Webbläsaren är för gammal."
 BAD_BROWSER_DESC = "För att använda funktioner i denna applikation,
-ladda ner och installera någon av följande webbläsare:"
+ladda ner och installera någon av följande webbläsare:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/tr.ini b/rainloop/v/0.0.0/langs/tr.ini
index f4fa83905..169e8d35f 100644
--- a/rainloop/v/0.0.0/langs/tr.ini
+++ b/rainloop/v/0.0.0/langs/tr.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Kime"
 LABEL_TO_SHORT = "kime"
 LABEL_CC = "CC"
 LABEL_BCC = "BCC"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "Kimden"
 PRINT_LABEL_TO = "To"
 PRINT_LABEL_CC = "CC"
 PRINT_LABEL_BCC = "BCC"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Tarih"
 PRINT_LABEL_SUBJECT = "Konu"
 PRINT_LABEL_ATTACHMENTS = "Ekler"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Ekle"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Kimlik Ekle?"
 TITLE_UPDATE_IDENTITY = "Kimlik Güncelle?"
 BUTTON_ADD_IDENTITY = "Ekle"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Güncelle"
 LABEL_EMAIL = "E-Posta"
 LABEL_NAME = "Ad"
 LABEL_REPLY_TO = "Yanıtla"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Bcc"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Klasör Oluştur?"
@@ -395,6 +400,7 @@ LABEL_ACCOUNTS_NAME = "Hesaplar"
 LABEL_IDENTITY_NAME = "Kimlik"
 LABEL_IDENTITIES_NAME = "Kimlikler"
 LABEL_FILTERS_NAME = "Filtreler"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Güvenlik"
 LABEL_SOCIAL_NAME = "Sosyal Media"
 LABEL_THEMES_NAME = "Temalar"
@@ -525,7 +531,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Hesap Listesi"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Hesap Ekle"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Sil"
 LOADING_PROCESS = "Hesap listesi güncelleniyor"
 DELETING_ASK = "Eminmisiniz?"
@@ -673,4 +681,4 @@ NO_COOKIE_DESC = "Çerezler destek tarayıcınızda mevcut değil.
 Tarayıcı ayarlarında Cookie desteği etkinleştirin ve yeniden deneyin."
 BAD_BROWSER_TITLE = "Tarayıcınız çok eski."
 BAD_BROWSER_DESC = "Uygulamanın tüm özelliklerini kullanmak için,
-Bu tarayıcılardan birini indirmek ve yükleyin:"
+Bu tarayıcılardan birini indirmek ve yükleyin:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/ua.ini b/rainloop/v/0.0.0/langs/ua.ini
index fe30b8d52..4f3d4cf46 100644
--- a/rainloop/v/0.0.0/langs/ua.ini
+++ b/rainloop/v/0.0.0/langs/ua.ini
@@ -131,10 +131,12 @@ LABEL_TO = "Кому"
 LABEL_TO_SHORT = "кому"
 LABEL_CC = "Копія"
 LABEL_BCC = "Прихована"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "Від"
 PRINT_LABEL_TO = "Кому"
 PRINT_LABEL_CC = "Копія"
 PRINT_LABEL_BCC = "Прихована"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "Дата"
 PRINT_LABEL_SUBJECT = "Тема"
 PRINT_LABEL_ATTACHMENTS = "Файли"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "Додати"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "Додати Профіль?"
 TITLE_UPDATE_IDENTITY = "Оновити Профіль?"
 BUTTON_ADD_IDENTITY = "Додати"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "Оновити"
 LABEL_EMAIL = "Пошта"
 LABEL_NAME = "Ім'я"
 LABEL_REPLY_TO = "Відповісти на"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "Прихована"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "Створити теку?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "Акаунти"
 LABEL_IDENTITY_NAME = "Профіль"
 LABEL_IDENTITIES_NAME = "Профілі"
 LABEL_FILTERS_NAME = "Фильтры"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "Безпека"
 LABEL_SOCIAL_NAME = "Соціальні"
 LABEL_THEMES_NAME = "Теми"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "Список акаунтів"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "Додати ще акаунт"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "Видалити"
 LOADING_PROCESS = "Оновлення списку акаунтів"
 DELETING_ASK = "Впевнені?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "Здається, Cookie або не підтримуютьс
 Увімкніть Cookie, змінив налаштівання браузера, і спробуйте знову."
 BAD_BROWSER_TITLE = "Ваш браузер застарів."
 BAD_BROWSER_DESC = "Щоб використовувати всі можливості додатку,
-завантажте і встановіть один з цих браузерів:"
+завантажте і встановіть один з цих браузерів:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/zh-cn.ini b/rainloop/v/0.0.0/langs/zh-cn.ini
index eaf316911..93d3c8a3b 100644
--- a/rainloop/v/0.0.0/langs/zh-cn.ini
+++ b/rainloop/v/0.0.0/langs/zh-cn.ini
@@ -131,10 +131,12 @@ LABEL_TO = "发送到"
 LABEL_TO_SHORT = "to"
 LABEL_CC = "抄送"
 LABEL_BCC = "密送"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "发送自"
 PRINT_LABEL_TO = "发送到"
 PRINT_LABEL_CC = "抄送"
 PRINT_LABEL_BCC = "密送"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "日期"
 PRINT_LABEL_SUBJECT = "主题"
 PRINT_LABEL_ATTACHMENTS = "附件"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "添加"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "添加签名?"
 TITLE_UPDATE_IDENTITY = "更新签名?"
 BUTTON_ADD_IDENTITY = "添加"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "更新"
 LABEL_EMAIL = "Email"
 LABEL_NAME = "姓名"
 LABEL_REPLY_TO = "回复"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "密送"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "创建文件夹?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "账户"
 LABEL_IDENTITY_NAME = "签名"
 LABEL_IDENTITIES_NAME = "签名"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "安全"
 LABEL_SOCIAL_NAME = "社交"
 LABEL_THEMES_NAME = "主题"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "账户列表"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "添加一个账户"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "删除"
 LOADING_PROCESS = "更新账户列表中"
 DELETING_ASK = "确定?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "您的浏览器不支持Cookies。
 请启用浏览器的Cookies支持并重试。"
 BAD_BROWSER_TITLE = "您的浏览器过时了"
 BAD_BROWSER_DESC = "为了使用所有特性，
-下载并安装其中一款浏览器："
+下载并安装其中一款浏览器："
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/zh-tw.ini b/rainloop/v/0.0.0/langs/zh-tw.ini
index 6ce43d8f4..d86fef597 100644
--- a/rainloop/v/0.0.0/langs/zh-tw.ini
+++ b/rainloop/v/0.0.0/langs/zh-tw.ini
@@ -131,10 +131,12 @@ LABEL_TO = "發送到"
 LABEL_TO_SHORT = "to"
 LABEL_CC = "複本"
 LABEL_BCC = "密件複本"
+LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_FROM = "發送自"
 PRINT_LABEL_TO = "發送到"
 PRINT_LABEL_CC = "複本"
 PRINT_LABEL_BCC = "密件複本"
+PRINT_LABEL_REPLY_TO = "Reply-To"
 PRINT_LABEL_DATE = "日期"
 PRINT_LABEL_SUBJECT = "主題"
 PRINT_LABEL_ATTACHMENTS = "附件"
@@ -247,7 +249,7 @@ BUTTON_ADD_ACCOUNT = "添加"
 TITLE_UPDATE_ACCOUNT = "Update Account?"
 BUTTON_UPDATE_ACCOUNT = "Update"
 
-[POPUPS_IDENTITIES]
+[POPUPS_IDENTITY]
 TITLE_ADD_IDENTITY = "添加簽名?"
 TITLE_UPDATE_IDENTITY = "更新簽名?"
 BUTTON_ADD_IDENTITY = "添加"
@@ -255,7 +257,10 @@ BUTTON_UPDATE_IDENTITY = "更新"
 LABEL_EMAIL = "Email"
 LABEL_NAME = "姓名"
 LABEL_REPLY_TO = "回復"
+LABEL_SIGNATURE = "Signature"
+LABEL_CC = "Cc"
 LABEL_BCC = "密件複本"
+LABEL_SIGNATURE_INSERT_BEFORE = "Insert this signature before quoted text in replies"
 
 [POPUPS_CREATE_FOLDER]
 TITLE_CREATE_FOLDER = "創建資料夾?"
@@ -397,6 +402,7 @@ LABEL_ACCOUNTS_NAME = "帳戶"
 LABEL_IDENTITY_NAME = "簽名"
 LABEL_IDENTITIES_NAME = "簽名"
 LABEL_FILTERS_NAME = "Filters"
+LABEL_TEMPLATES_NAME = "Templates"
 LABEL_SECURITY_NAME = "安全"
 LABEL_SOCIAL_NAME = "社交"
 LABEL_THEMES_NAME = "主題"
@@ -527,7 +533,9 @@ TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performanc
 
 [SETTINGS_ACCOUNTS]
 LEGEND_ACCOUNTS = "帳戶列表"
+LEGEND_ACCOUNTS_AND_IDENTITIES = "Accounts and Identities"
 BUTTON_ADD_ACCOUNT = "添加一個帳戶"
+BUTTON_ADD_IDENTITY = "Add an Identity"
 BUTTON_DELETE = "刪除"
 LOADING_PROCESS = "更新帳戶列表中"
 DELETING_ASK = "確定?"
@@ -675,4 +683,4 @@ NO_COOKIE_DESC = "您的瀏覽器不支持Cookies。
 請啟用瀏覽器的Cookies支持並重試。"
 BAD_BROWSER_TITLE = "您的瀏覽器過時了"
 BAD_BROWSER_DESC = "為了使用所有特性，
-下載並安裝其中一款瀏覽器："
+下載並安裝其中一款瀏覽器："
\ No newline at end of file