diff --git a/dev/Model/Identity.js b/dev/Model/Identity.js
index 481fe492f..4afa6f05e 100644
--- a/dev/Model/Identity.js
+++ b/dev/Model/Identity.js
@@ -11,6 +11,7 @@ export class IdentityModel extends AbstractModel {
 
 		addObservablesTo(this, {
 			id: '',
+			label: '',
 			email: '',
 			name: '',
 
@@ -29,8 +30,8 @@ export class IdentityModel extends AbstractModel {
 	 */
 	formattedName() {
 		const name = this.name(),
-			email = this.email();
-
-		return name ? name + ' <' + email + '>' : email;
+			email = this.email(),
+			label = this.label();
+		return (name ? `${name} ` : '') + `<${email}>` + (label ? ` (${label})` : '');
 	}
 }
diff --git a/dev/Styles/User/Identity.less b/dev/Styles/User/Identity.less
index bc3ce5c58..bdcd7e917 100644
--- a/dev/Styles/User/Identity.less
+++ b/dev/Styles/User/Identity.less
@@ -2,9 +2,15 @@
 
 	max-width: 770px;
 
+	.tab-content {
+		grid-column-end: 4;
+		padding-top: 20px;
+	}
+
 	.e-signature-place {
 		border: 1px solid #ccc;
 		border-radius: var(--input-border-radius, 3px);
+		margin-bottom: 1.43em;
 	}
 
 	.textEmail {
diff --git a/dev/View/Popup/Identity.js b/dev/View/Popup/Identity.js
index 61ec7a3a3..d1d8b20be 100644
--- a/dev/View/Popup/Identity.js
+++ b/dev/View/Popup/Identity.js
@@ -17,17 +17,15 @@ export class IdentityPopupView extends AbstractViewPopup {
 			id: '',
 			edit: false,
 
-			email: '',
-			emailFocused: false,
+			label: '',
+			labelFocused: false,
 
+			email: '',
 			name: '',
 			nameFocused: false,
 
 			replyTo: '',
-			showReplyTo: false,
-
 			bcc: '',
-			showBcc: false,
 
 			signature: '',
 			signatureInsertBefore: false,
@@ -66,9 +64,6 @@ export class IdentityPopupView extends AbstractViewPopup {
 	 * @param {?IdentityModel} oIdentity
 	 */
 	onShow(identity) {
-		this.showBcc(false);
-		this.showReplyTo(false);
-
 		this.submitRequest(false);
 		this.submitError('');
 
@@ -80,17 +75,16 @@ export class IdentityPopupView extends AbstractViewPopup {
 			identity.id(Jua.randomId());
 		}
 		this.id(identity.id() || '');
+		this.label(identity.label() || '');
 		this.name(identity.name());
 		this.email(identity.email());
 		this.replyTo(identity.replyTo());
-		this.showReplyTo(0 < identity.replyTo().length);
 		this.bcc(identity.bcc());
-		this.showBcc(0 < identity.bcc().length);
 		this.signature(identity.signature());
 		this.signatureInsertBefore(identity.signatureInsertBefore());
 	}
 
 	afterShow() {
-		this.id() ? this.emailFocused(true) : this.nameFocused(true);
+		this.id() ? this.labelFocused(true) : this.nameFocused(true);
 	}
 }
diff --git a/plugins/nextcloud/index.php b/plugins/nextcloud/index.php
index ce0ce50f6..e96b63674 100644
--- a/plugins/nextcloud/index.php
+++ b/plugins/nextcloud/index.php
@@ -5,7 +5,7 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 	const
 		NAME = 'Nextcloud',
 		VERSION = '2.30',
-		RELEASE  = '2024-02-05',
+		RELEASE  = '2024-02-08',
 		CATEGORY = 'Integrations',
 		DESCRIPTION = 'Integrate with Nextcloud v20+',
 		REQUIRED = '2.34.0';
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
index 921d73b6d..e9ba1d9f3 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
@@ -8,6 +8,8 @@ class Identity implements \JsonSerializable
 {
 	private string $sId;
 
+	private string $sLabel = '';
+
 	private string $sEmail;
 
 	private string $sName = '';
@@ -26,6 +28,11 @@ class Identity implements \JsonSerializable
 		$this->sEmail = $sEmail;
 	}
 
+	function toMime() : \MailSo\Mime\Email
+	{
+		return new \MailSo\Mime\Email($this->sEmail, $this->sName);
+	}
+
 	public function Id(bool $bFillOnEmpty = false): string
 	{
 		return $bFillOnEmpty ? ('' === $this->sId ? '---' : $this->sId) : $this->sId;
@@ -48,16 +55,6 @@ class Identity implements \JsonSerializable
 		return $this->sName;
 	}
 
-	public function ReplyTo(): string
-	{
-		return $this->sReplyTo;
-	}
-
-	public function Bcc(): string
-	{
-		return $this->sBcc;
-	}
-
 	public function SetId(string $sId): Identity
 	{
 		$this->sId = $sId;
@@ -70,10 +67,9 @@ class Identity implements \JsonSerializable
 		return $this;
 	}
 
-	public function SetReplyTo(string $sReplyTo): Identity
+	public function ReplyTo(): string
 	{
-		$this->sReplyTo = $sReplyTo;
-		return $this;
+		return $this->sReplyTo;
 	}
 
 	public function SetBcc(string $sBcc): Identity
@@ -82,22 +78,11 @@ class Identity implements \JsonSerializable
 		return $this;
 	}
 
-	public function SetSignature(string $sSignature): Identity
-	{
-		$this->sSignature = $sSignature;
-		return $this;
-	}
-
-	public function SetSignatureInsertBefore(bool $bSignatureInsertBefore): Identity
-	{
-		$this->bSignatureInsertBefore = $bSignatureInsertBefore;
-		return $this;
-	}
-
 	public function FromJSON(array $aData, bool $bJson = false): bool
 	{
 		if (!empty($aData['Email'])) {
 			$this->sId = !empty($aData['Id']) ? $aData['Id'] : '';
+			$this->sLabel = isset($aData['Label']) ? $aData['Label'] : '';
 			$this->sEmail = $bJson ? Utils::IdnToAscii($aData['Email'], true) : $aData['Email'];
 			$this->sName = isset($aData['Name']) ? $aData['Name'] : '';
 			$this->sReplyTo = !empty($aData['ReplyTo']) ? $aData['ReplyTo'] : '';
@@ -116,6 +101,7 @@ class Identity implements \JsonSerializable
 	{
 		return array(
 			'Id' => $this->sId,
+			'Label' => $this->sLabel,
 			'Email' => $this->sEmail,
 			'Name' => $this->sName,
 			'ReplyTo' => $this->sReplyTo,
@@ -131,6 +117,7 @@ class Identity implements \JsonSerializable
 		return array(
 			'@Object' => 'Object/Identity',
 			'id' => $this->sId,
+			'label' => $this->sLabel,
 			'email' => Utils::IdnToUtf8($this->sEmail),
 			'name' => $this->sName,
 			'replyTo' => $this->sReplyTo,
diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/user.json b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
index 16f557483..d6996273f 100644
--- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "إضافة هوية؟",
 		"TITLE_UPDATE_IDENTITY": "تحديث الهوية؟",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "إضافة",
 		"BUTTON_UPDATE_IDENTITY": "تحديث",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "قم بوضع التوقيع قبل النص المأخوذ من الرسائل في عملية الرد"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "أبداَ"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "عام",
 		"LANGUAGE": "اللغة",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "الهوية",
diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/user.json b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
index b0ade8c10..5e57fdcf9 100644
--- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Добавяне на идентичност?",
 		"TITLE_UPDATE_IDENTITY": "Обновяване на идентичност?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Добавяне",
 		"BUTTON_UPDATE_IDENTITY": "Обновяване",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Подписа да се поставя преди цитирания текст при отговор"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Никога"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Общи",
 		"LANGUAGE": "Език",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Идентичност",
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
index 819d673c2..45e56eed6 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Opravdu přidat?",
 		"TITLE_UPDATE_IDENTITY": "Uložit změny?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Přidat",
 		"BUTTON_UPDATE_IDENTITY": "Uložit",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "V odpovědích vložit podpis před citovaný text."
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Nikdy"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Všeobecné",
 		"LANGUAGE": "Jazyk",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Uživatel",
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/user.json b/snappymail/v/0.0.0/app/localization/da-DK/user.json
index 704922380..2e73c2bb9 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/user.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Tilføj identitet?",
 		"TITLE_UPDATE_IDENTITY": "Opdater identitet?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Tilføj",
 		"BUTTON_UPDATE_IDENTITY": "Opdater",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Indsæt signatur før citeret tekst"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Aldrig"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Generelt",
 		"LANGUAGE": "Sprog",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identitet",
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de-DE/user.json
index f645ad389..6dc3d3883 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/user.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Identität hinzufügen?",
 		"TITLE_UPDATE_IDENTITY": "Identität aktualisieren?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Hinzufügen",
 		"BUTTON_UPDATE_IDENTITY": "Aktualisieren",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Diese Signatur in Antworten vor dem zitierten Text einfügen"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Nie"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Allgemein",
 		"LANGUAGE": "Sprache",
 		"HOUR_FORMAT": "Stundenformat",
 		"IDENTITY": "Identität",
diff --git a/snappymail/v/0.0.0/app/localization/el-GR/user.json b/snappymail/v/0.0.0/app/localization/el-GR/user.json
index eb8002a5a..c1b9044e7 100644
--- a/snappymail/v/0.0.0/app/localization/el-GR/user.json
+++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Προσθήκη ταυτότητας;",
 		"TITLE_UPDATE_IDENTITY": "Ενημέρωση ταυτότητας;",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Προσθήκη",
 		"BUTTON_UPDATE_IDENTITY": "Ενημέρωση",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Προσθήκη της υπογραφής πριν το προτότυπο κείμενο στις απαντήσεις"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Ποτέ"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Γενικό",
 		"LANGUAGE": "Γλώσσα",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Ταυτότητα",
diff --git a/snappymail/v/0.0.0/app/localization/en-GB/user.json b/snappymail/v/0.0.0/app/localization/en-GB/user.json
index 6c80331cc..3d94544a1 100644
--- a/snappymail/v/0.0.0/app/localization/en-GB/user.json
+++ b/snappymail/v/0.0.0/app/localization/en-GB/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Add Identity?",
 		"TITLE_UPDATE_IDENTITY": "Update Identity?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Add",
 		"BUTTON_UPDATE_IDENTITY": "Update",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Never"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "General",
 		"LANGUAGE": "Language",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identity",
diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json
index e286a7514..fa32b3d11 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Add Identity?",
 		"TITLE_UPDATE_IDENTITY": "Update Identity?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Add",
 		"BUTTON_UPDATE_IDENTITY": "Update",
-		"LABEL_SIGNATURE_ADD": "Add/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Never"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "General",
 		"LANGUAGE": "Language",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identity",
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es-ES/user.json
index c143b2d83..e1721ef8f 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/user.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "¿Añadir Identidad?",
 		"TITLE_UPDATE_IDENTITY": "¿Actualizar identidad?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Añadir",
 		"BUTTON_UPDATE_IDENTITY": "Actualizar",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insertar esta firma antes de el texto entre comillas en las respuestas"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Nunca"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "General",
 		"LANGUAGE": "Idioma",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identidad",
diff --git a/snappymail/v/0.0.0/app/localization/et-EE/user.json b/snappymail/v/0.0.0/app/localization/et-EE/user.json
index 0a3e34287..975803e4a 100644
--- a/snappymail/v/0.0.0/app/localization/et-EE/user.json
+++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Lisan identiteedi?",
 		"TITLE_UPDATE_IDENTITY": "Muudan identiteeti?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Lisa",
 		"BUTTON_UPDATE_IDENTITY": "Muuda",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Sisesta see signatuur kirjades enne tsiteeritud teksti"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Mitte kunagi"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Üldine",
 		"LANGUAGE": "Keel",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identiteet",
diff --git a/snappymail/v/0.0.0/app/localization/eu/user.json b/snappymail/v/0.0.0/app/localization/eu/user.json
index 58564ed38..813f93ea7 100644
--- a/snappymail/v/0.0.0/app/localization/eu/user.json
+++ b/snappymail/v/0.0.0/app/localization/eu/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Nortasuna gehitu?",
 		"TITLE_UPDATE_IDENTITY": "Nortasuna eguneratu?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Gehitu",
 		"BUTTON_UPDATE_IDENTITY": "Eguneratu",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Txertatu sinadura hau erantzuteko testuaren aurretik"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Inoiz"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Orokorra",
 		"LANGUAGE": "Hizkuntza",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Nortasuna",
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/user.json b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
index 6fcd55438..ae43dc37e 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "اضافه کردن هویت؟",
 		"TITLE_UPDATE_IDENTITY": "بروزرسانی هویت؟",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "اضافه‌کردن",
 		"BUTTON_UPDATE_IDENTITY": "بروزرسانی",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "قراردادن امضاء‌ قبل از متن مشخص شده در جواب"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "هرگز"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "عمومی",
 		"LANGUAGE": "زبان",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "شناسه",
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/user.json b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
index 1b651fec3..96147ac9e 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Lisää identiteetti?",
 		"TITLE_UPDATE_IDENTITY": "Päivitä identiteetti?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Lisää",
 		"BUTTON_UPDATE_IDENTITY": "Päivitä",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Lisää tämä allekirjoitus ennen lainattua tekstiä vastauksissa"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Ei koskaan"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Yleiset",
 		"LANGUAGE": "Kieli",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identiteetti",
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
index 689cba284..dd9c442c4 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Ajouter une identité ?",
 		"TITLE_UPDATE_IDENTITY": "Mettre à jour l'identité ?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Ajouter",
 		"BUTTON_UPDATE_IDENTITY": "Mettre à jour",
-		"LABEL_SIGNATURE_ADD": "Ajouter\/Editer une signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insérer la signature avant le texte cité dans les réponses"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Jamais"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Général",
 		"LANGUAGE": "Langue",
 		"HOUR_FORMAT": "Format horaire",
 		"IDENTITY": "Identité",
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
index 935f84a12..fda3345cd 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Identitás hozzáadás?",
 		"TITLE_UPDATE_IDENTITY": "Frissítsük az identitást?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Hozzáadás",
 		"BUTTON_UPDATE_IDENTITY": "Frissítés",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Szúrja be ezt az aláírást az idézett szöveg elé a válaszokban"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Soha"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Általános",
 		"LANGUAGE": "Nyelv",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identitás",
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/user.json b/snappymail/v/0.0.0/app/localization/id-ID/user.json
index 1496c3c6a..099dd1d74 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/user.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Tambah Identitas?",
 		"TITLE_UPDATE_IDENTITY": "Perbarui Identitas?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Tambah",
 		"BUTTON_UPDATE_IDENTITY": "Perbarui",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Sisipkan tanda tangan ini sebelum teks kutipan pada balasan"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Tidak pernah"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Umum",
 		"LANGUAGE": "Bahasa",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identitas",
diff --git a/snappymail/v/0.0.0/app/localization/is-IS/user.json b/snappymail/v/0.0.0/app/localization/is-IS/user.json
index 9992a66f5..23451e11e 100644
--- a/snappymail/v/0.0.0/app/localization/is-IS/user.json
+++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Bæta við auðkenni?",
 		"TITLE_UPDATE_IDENTITY": "Uppfæra auðkenni?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Bæta við",
 		"BUTTON_UPDATE_IDENTITY": "Uppfæra",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Setja þessa undirskrift inn á undan tilvitnuðum texta þegar verið er að svara"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Aldrei"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Almennt",
 		"LANGUAGE": "Tungumál",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Auðkenni",
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/user.json b/snappymail/v/0.0.0/app/localization/it-IT/user.json
index 3bebf2089..2ea703d18 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/user.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Aggiungo un'identità?",
 		"TITLE_UPDATE_IDENTITY": "Aggiorno identità?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Aggiungi",
 		"BUTTON_UPDATE_IDENTITY": "Aggiorna",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Inserisci questa firma prima del messaggio citato nelle risposte"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Mai"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Generali",
 		"LANGUAGE": "Lingua",
 		"HOUR_FORMAT": "Formato orario",
 		"IDENTITY": "Identità",
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/user.json b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
index 7262ff8f1..e0055be00 100644
--- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "メールの表示名を追加しますか？",
 		"TITLE_UPDATE_IDENTITY": "メールの表示名を更新しますか？",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "追加",
 		"BUTTON_UPDATE_IDENTITY": "更新",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "返信の引用テキストの前に署名を挿入する"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "しない"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "全般",
 		"LANGUAGE": "言語",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "表示名",
diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/user.json b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
index 0916d9186..0b39afa17 100644
--- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "신원을 새로 추가할까요?",
 		"TITLE_UPDATE_IDENTITY": "신원을 업데이트할까요?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "추가",
 		"BUTTON_UPDATE_IDENTITY": "업데이트",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "회신 시 이 서명을 인용문 이전에 삽입"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "설정하지 않음"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "일반",
 		"LANGUAGE": "언어",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "신원",
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/user.json b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
index 647f2c96d..c5940f1f1 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Pridėti tapatybę?",
 		"TITLE_UPDATE_IDENTITY": "Atnaujinti tapatybę?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Pridėti",
 		"BUTTON_UPDATE_IDENTITY": "Atnaujinti",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Įterpti šį parašą prieš citatą rašant atsakymą"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Niekada"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Pagrindiniai",
 		"LANGUAGE": "Kalba",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Tapatybė",
diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/user.json b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
index 5d60e8c71..deb07fa95 100644
--- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Add Identity?",
 		"TITLE_UPDATE_IDENTITY": "Update Identity?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Add",
 		"BUTTON_UPDATE_IDENTITY": "Update",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Never"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Vispārējie",
 		"LANGUAGE": "Valoda",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identity",
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/user.json b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
index 4536df720..2d1dd4e5c 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Vil du legge til en identitet?",
 		"TITLE_UPDATE_IDENTITY": "Oppdater identitet",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Legg til",
 		"BUTTON_UPDATE_IDENTITY": "Oppdater",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Legg til denne signaturen før sitert tekst"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Aldri"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Generelt",
 		"LANGUAGE": "Språk",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identitet",
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
index 8e51851e2..4fd428278 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Identiteit toevoegen?",
 		"TITLE_UPDATE_IDENTITY": "Identiteit bijwerken?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Toevoegen",
 		"BUTTON_UPDATE_IDENTITY": "Bijwerken",
-		"LABEL_SIGNATURE_ADD": "Handtekening toevoegen\/wijzigen",
+		"SIGNATURE": "Handtekening",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Plaats deze handtekening vóór geciteerde tekst in antwoorden"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Nooit"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Algemeen",
 		"LANGUAGE": "Taal",
 		"HOUR_FORMAT": "Uur formaat",
 		"IDENTITY": "Identiteit",
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/user.json b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
index dd5b1f499..2a0ddc34b 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Czy dodać tożsamość?",
 		"TITLE_UPDATE_IDENTITY": "Czy zaktualizować tożsamość?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Dodaj",
 		"BUTTON_UPDATE_IDENTITY": "Aktualizuj",
-		"LABEL_SIGNATURE_ADD": "Dodaj\/Edytuj podpis",
+		"SIGNATURE": "Podpis",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Umieszczaj ten podpis przed cytowanym tekstem w odpowiedziach"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Nigdy"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Ogólne",
 		"LANGUAGE": "Język",
 		"HOUR_FORMAT": "Format godziny",
 		"IDENTITY": "Tożsamość",
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/user.json b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
index d9915463d..1c2b28783 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Adicionar identidade",
 		"TITLE_UPDATE_IDENTITY": "Atualizar identidade?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Adicionar",
 		"BUTTON_UPDATE_IDENTITY": "Atualizar",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Inserir esta assinatura antes do texto citado nas respostas"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Nunca"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Geral",
 		"LANGUAGE": "Idioma",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identidade",
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/user.json b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
index 44de2c03a..12c2c720e 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Adicionar identidade?",
 		"TITLE_UPDATE_IDENTITY": "Atualizar identidade?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Adicionar",
 		"BUTTON_UPDATE_IDENTITY": "Atualizar",
-		"LABEL_SIGNATURE_ADD": "Adicionar\/Editar assinatura",
+		"SIGNATURE": "Assinatura",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Nas respostas, inserir esta assinatura acima da mensagem citada"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Nunca"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Geral",
 		"LANGUAGE": "Idioma",
 		"HOUR_FORMAT": "Formato da hora",
 		"IDENTITY": "Identidade",
diff --git a/snappymail/v/0.0.0/app/localization/pt/user.json b/snappymail/v/0.0.0/app/localization/pt/user.json
index 44de2c03a..12c2c720e 100644
--- a/snappymail/v/0.0.0/app/localization/pt/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Adicionar identidade?",
 		"TITLE_UPDATE_IDENTITY": "Atualizar identidade?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Adicionar",
 		"BUTTON_UPDATE_IDENTITY": "Atualizar",
-		"LABEL_SIGNATURE_ADD": "Adicionar\/Editar assinatura",
+		"SIGNATURE": "Assinatura",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Nas respostas, inserir esta assinatura acima da mensagem citada"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Nunca"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Geral",
 		"LANGUAGE": "Idioma",
 		"HOUR_FORMAT": "Formato da hora",
 		"IDENTITY": "Identidade",
diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/user.json b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
index 26230fc52..43353c184 100644
--- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Adăugați un profil",
 		"TITLE_UPDATE_IDENTITY": "Actualizați profilul",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Adăugați",
 		"BUTTON_UPDATE_IDENTITY": "Actualizați",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Never"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Setări de bază",
 		"LANGUAGE": "Limbă",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identity",
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/user.json b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
index eee48c72c..ef770462c 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Добавить Профиль?",
 		"TITLE_UPDATE_IDENTITY": "Обновить Профиль?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Добавить",
 		"BUTTON_UPDATE_IDENTITY": "Обновить",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Вставлять подпись перед цитированием текста в ответах"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Никогда"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Основные Настройки",
 		"LANGUAGE": "Язык",
 		"HOUR_FORMAT": "Формат времени",
 		"IDENTITY": "Профиль",
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/user.json b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
index 1cf67ed21..e211bd692 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Pridať identitu?",
 		"TITLE_UPDATE_IDENTITY": "Upraviť identitu?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Pridať",
 		"BUTTON_UPDATE_IDENTITY": "Upraviť",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "V odpovediach vložiť tento podpis nad citovaný text"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Never"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Všeobecné",
 		"LANGUAGE": "Jazyk",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identity",
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/user.json b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
index b2f56e923..cb4b88dc2 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Dodam identiteto?",
 		"TITLE_UPDATE_IDENTITY": "Posodobim identiteto?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Dodaj",
 		"BUTTON_UPDATE_IDENTITY": "Posodobi",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Vstavi ta podpis pred citirano besedilo v odgovorih"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Nikoli"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Splošno",
 		"LANGUAGE": "Jezik",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identiteta",
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
index a4a1d9ab3..7cb8fd28c 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Lägg till identitet",
 		"TITLE_UPDATE_IDENTITY": "Uppdatera identitet",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Lägg till",
 		"BUTTON_UPDATE_IDENTITY": "Uppdatera",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Sätt denna signatur före citerad text i svar"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Aldrig"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Allmänt",
 		"LANGUAGE": "Språk",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identitet",
diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/user.json b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
index 550613b24..d18df2ade 100644
--- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Kimlik Ekle?",
 		"TITLE_UPDATE_IDENTITY": "Kimlik Güncelle?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Ekle",
 		"BUTTON_UPDATE_IDENTITY": "Güncelle",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Never"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Genel",
 		"LANGUAGE": "Dil",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identity",
diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/user.json b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
index cc50a3948..8c939cd2e 100644
--- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Додати Профіль?",
 		"TITLE_UPDATE_IDENTITY": "Оновити Профіль?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Додати",
 		"BUTTON_UPDATE_IDENTITY": "Оновити",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Ніколи"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Основні налаштування",
 		"LANGUAGE": "Мова",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Identity",
diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/user.json b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
index badcc8db9..af8ddec7f 100644
--- a/snappymail/v/0.0.0/app/localization/vi-VN/user.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Thêm tên gọi mới?",
 		"TITLE_UPDATE_IDENTITY": "Cập nhật tên gọi?",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Thêm vào",
 		"BUTTON_UPDATE_IDENTITY": "Cập nhật",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Thêm chữ ký cuối thư này vào trước phần văn bản trích dẫn trong thư phản hồi"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "Không tự động đăng xuất"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Tổng quan",
 		"LANGUAGE": "Ngôn ngữ",
 		"HOUR_FORMAT": "Hour format",
 		"IDENTITY": "Tên gọi",
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
index 34027dee9..7855fb3e3 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "添加身份？",
 		"TITLE_UPDATE_IDENTITY": "更新身份？",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "添加",
 		"BUTTON_UPDATE_IDENTITY": "更新",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "在回信中插入签名再引用来信"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "从不"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "常规",
 		"LANGUAGE": "语言",
 		"HOUR_FORMAT": "小时格式",
 		"IDENTITY": "身份",
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/user.json b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
index 909cb8773..b4f8025f0 100644
--- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
@@ -255,9 +255,10 @@
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "是否要新增識別檔？",
 		"TITLE_UPDATE_IDENTITY": "是否要更新識別檔？",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "新增",
 		"BUTTON_UPDATE_IDENTITY": "更新",
-		"LABEL_SIGNATURE_ADD": "Add\/Edit signature",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "在回覆引用的訊息前插入此簽名"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -416,7 +417,6 @@
 		"AUTOLOGIN_NEVER_OPTION_NAME": "永不"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "一般設定",
 		"LANGUAGE": "語言",
 		"HOUR_FORMAT": "小時格式",
 		"IDENTITY": "識別檔",
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
index e5fffa2b2..f92f680b7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
@@ -4,65 +4,71 @@
 	<h3 data-bind="visible: edit" data-i18n="POPUPS_IDENTITY/TITLE_UPDATE_IDENTITY"></h3>
 </header>
 <form id="identityform" class="modal-body" autocomplete="off" spellcheck="false" data-bind="submit: submitForm">
-	<div class="form-horizontal g-ui-user-select-none">
-		<div class="alert" data-bind="visible: '' !== submitError()">
-			<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
-			<span data-bind="text: submitError"></span>
-		</div>
-		<div class="control-group">
-			<label data-i18n="GLOBAL/EMAIL"></label>
-			<div>
-				<div class="textEmail" data-bind="text: email, visible: !id()"></div>
-				<input name="Email" type="email" class="input-xlarge" autofocus=""
+	<div class="alert" data-bind="visible: '' !== submitError()">
+		<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
+		<span data-bind="text: submitError"></span>
+	</div>
+
+	<div class="tabs">
+		<input type="radio" name="identitytabs" id="tab-identity" checked>
+		<label data-i18n="SETTINGS_LABELS/GENERAL" for="tab-identity" role="tab" aria-selected="true" aria-controls="panel1" tabindex="0"></label>
+		<div class="form-horizontal tab-content" role="tabpanel" aria-hidden="false">
+			<div class="control-group">
+				<label data-i18n="POPUPS_IDENTITY/LABEL"></label>
+				<div>
+					<input name="Label" type="text" class="input-xlarge" autofocus="" required=""
+						autocomplete="off" autocorrect="off" autocapitalize="off"
+						data-bind="value: label, hasfocus: labelFocused">
+				</div>
+			</div>
+			<div class="control-group">
+				<label data-i18n="GLOBAL/EMAIL"></label>
+				<div>
+					<div class="textEmail" data-bind="text: email, visible: !id()"></div>
+					<input name="Email" type="email" class="input-xlarge" autofocus=""
+						autocomplete="off" autocorrect="off" autocapitalize="off"
+						data-bind="visible: id, value: email, attr: {required: id}">
+				</div>
+			</div>
+			<div class="control-group">
+				<label data-i18n="GLOBAL/NAME"></label>
+				<input name="Name" type="text" class="input-xlarge"
 					autocomplete="off" autocorrect="off" autocapitalize="off"
-					data-bind="visible: id, value: email, hasfocus: emailFocused, attr: {required: id}">
+					data-bind="value: name, hasfocus: nameFocused">
 			</div>
 		</div>
-		<div class="control-group">
-			<label data-i18n="GLOBAL/NAME"></label>
-			<input name="Name" type="text" class="input-xlarge"
-				autocomplete="off" autocorrect="off" autocapitalize="off"
-				data-bind="value: name, hasfocus: nameFocused">
+
+		<input type="radio" name="identitytabs" id="tab-identity-signature">
+		<label data-i18n="POPUPS_IDENTITY/SIGNATURE" for="tab-identity-signature" role="tab" aria-selected="false" aria-controls="panel2" tabindex="0"></label>
+		<div class="form-horizontal tab-content" role="tabpanel" aria-hidden="false">
+			<div class="e-signature-place" data-bind="editor: signature"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'POPUPS_IDENTITY/LABEL_SIGNATURE_INSERT_BEFORE',
+					value: signatureInsertBefore,
+					name: 'SignatureInsertBefore'
+				}
+			}"></div>
 		</div>
-		<div class="control-group" data-bind="visible: showReplyTo">
-			<label data-i18n="GLOBAL/REPLY_TO"></label>
-			<input name="ReplyTo" type="email" class="inputReplyTo input-xlarge"
-				autocomplete="off" autocorrect="off" autocapitalize="off"
-				data-bind="value: replyTo">
-		</div>
-		<div class="control-group" data-bind="visible: showBcc">
-			<label data-i18n="GLOBAL/BCC"></label>
-			<input name="Bcc" type="email" class="inputBcc input-xlarge"
-				autocomplete="off" autocorrect="off" autocapitalize="off"
-				data-bind="value: bcc">
-		</div>
-		<div class="control-group" data-bind="visible: !showReplyTo() || !showBcc()">
-			<div>
-				<span data-bind="visible: !showReplyTo()">
-					<span class="g-ui-link" data-i18n="GLOBAL/REPLY_TO"
-						data-bind="click: function () { showReplyTo(true); }"></span>
-					&nbsp;&nbsp;
-				</span>
-				<span data-bind="visible: !showBcc()">
-					<span class="g-ui-link" data-i18n="GLOBAL/BCC"
-						data-bind="click: function () { showBcc(true); }"></span>
-				</span>
+
+		<input type="radio" name="identitytabs" id="tab-identity-advanced">
+		<label data-i18n="SETTINGS_FILTERS/ADVANCED" for="tab-identity-advanced" role="tab" aria-selected="false" aria-controls="panel3" tabindex="0"></label>
+		<div class="form-horizontal tab-content" role="tabpanel" aria-hidden="false">
+			<div class="control-group">
+				<label data-i18n="GLOBAL/REPLY_TO"></label>
+				<input name="ReplyTo" type="email" class="inputReplyTo input-xlarge"
+					autocomplete="off" autocorrect="off" autocapitalize="off"
+					data-bind="value: replyTo">
+			</div>
+			<div class="control-group">
+				<label data-i18n="GLOBAL/BCC"></label>
+				<input name="Bcc" type="email" class="inputBcc input-xlarge"
+					autocomplete="off" autocorrect="off" autocapitalize="off"
+					data-bind="value: bcc">
 			</div>
 		</div>
 	</div>
-	<hr>
-	<div class="control-group g-ui-user-select-none">
-		<h4 data-i18n="POPUPS_IDENTITY/LABEL_SIGNATURE_ADD"></h4>
-		<div data-bind="component: {
-			name: 'Checkbox',
-			params: {
-				label: 'POPUPS_IDENTITY/LABEL_SIGNATURE_INSERT_BEFORE',
-				value: signatureInsertBefore,
-				name: 'SignatureInsertBefore'
-			}
-		}"></div>
-	</div>
-	<div class="e-signature-place" data-bind="editor: signature"></div>
 </form>
 <footer>
 	<button form="identityform" class="btn buttonAddIdentity">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
index dc2bd1350..d66fdb13b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@@ -1,5 +1,5 @@
 <div class="form-horizontal">
-	<div class="legend" data-i18n="SETTINGS_GENERAL/LEGEND_GENERAL"></div>
+	<div class="legend" data-i18n="SETTINGS_LABELS/GENERAL"></div>
 	<div class="control-group">
 		<label data-i18n="SETTINGS_GENERAL/IDENTITY"></label>
 		<b class="editMainIdentity" data-bind="click: editMainIdentity, text: identityMainDesc"></b>