Added "Default identity" setting (Closes #157)

dev/Common/Selector.js

@@ -700,6 +700,8 @@ Selector.prototype.actionClick = function (oItem, oEvent)
 		{
 			this.focusedItem(oItem);
 			this.selectedItem(oItem);
+
+			this.scrollToFocused();
 		}
 	}
 };

dev/Settings/Identities.js

@@ -8,7 +8,9 @@ function SettingsIdentities()
 	var oData = RL.data();
 
 	this.editor = null;
+	this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
 
+	this.accountEmail = oData.accountEmail;
 	this.displayName = oData.displayName;
 	this.signature = oData.signature;
 	this.signatureToAll = oData.signatureToAll;
@@ -16,11 +18,47 @@ function SettingsIdentities()
 
 	this.signatureDom = ko.observable(null);
 
+	this.defaultIdentityIDTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 	this.displayNameTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 	this.replyTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 	this.signatureTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 
 	this.identities = oData.identities;
+	this.defaultIdentityID = oData.defaultIdentityID;
+
+	this.identitiesOptions = ko.computed(function () {
+
+		var
+			aList = this.identities(),
+			aResult = []
+		;
+
+		if (0 < aList.length)
+		{
+			aResult.push({
+				'id': this.accountEmail.peek(),
+				'name': this.formattedAccountIdentity(),
+				'seporator': false
+			});
+
+			aResult.push({
+				'id': '---',
+				'name': '---',
+				'seporator': true,
+				'disabled': true
+			});
+
+			_.each(aList, function (oItem) {
+				aResult.push({
+					'id': oItem.id,
+					'name': oItem.formattedNameForEmail(),
+					'seporator': false
+				});
+			});
+		}
+
+		return aResult;
+	}, this);
 
 	this.processText = ko.computed(function () {
 		return oData.identitiesLoading() ? Utils.i18n('SETTINGS_IDENTITIES/LOADING_PROCESS') : '';
@@ -47,6 +85,20 @@ function SettingsIdentities()
 
 Utils.addSettingsViewModel(SettingsIdentities, 'SettingsIdentities', 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'identities');
 
+/**
+ *
+ * @return {string}
+ */
+SettingsIdentities.prototype.formattedAccountIdentity = function ()
+{
+	var
+		sDisplayName = this.displayName.peek(),
+		sEmail = this.accountEmail.peek()
+	;
+
+	return '' === sDisplayName ? sEmail : '"' + Utils.quoteName(sDisplayName) + '" <' + sEmail + '>';
+};
+
 SettingsIdentities.prototype.addNewIdentity = function ()
 {
 	kn.showScreenPopup(PopupsIdentityViewModel);
@@ -129,9 +181,16 @@ SettingsIdentities.prototype.onBuild = function (oDom)
 			oData = RL.data(),
 			f1 = Utils.settingsSaveHelperSimpleFunction(self.displayNameTrigger, self),
 			f2 = Utils.settingsSaveHelperSimpleFunction(self.replyTrigger, self),
-			f3 = Utils.settingsSaveHelperSimpleFunction(self.signatureTrigger, self)
+			f3 = Utils.settingsSaveHelperSimpleFunction(self.signatureTrigger, self),
+			f4 = Utils.settingsSaveHelperSimpleFunction(self.defaultIdentityIDTrigger, self)
 		;
 
+		oData.defaultIdentityID.subscribe(function (sValue) {
+			RL.remote().saveSettings(f4, {
+				'DefaultIdentityID': sValue
+			});
+		});
+
 		oData.displayName.subscribe(function (sValue) {
 			RL.remote().saveSettings(f1, {
 				'DisplayName': sValue

dev/Storages/WebMailData.js

@@ -78,6 +78,7 @@ function WebMailDataStorage()
 	this.accountsLoading = ko.observable(false).extend({'throttle': 100});
 
 	// identities
+	this.defaultIdentityID = ko.observable('');
 	this.identities = ko.observableArray([]);
 	this.identitiesLoading = ko.observable(false).extend({'throttle': 100});
 
@@ -476,6 +477,8 @@ WebMailDataStorage.prototype.populateDataOnStart = function()
 	this.accountOutLogin(RL.settingsGet('OutLogin'));
 	this.projectHash(RL.settingsGet('ProjectHash'));
 
+	this.defaultIdentityID(RL.settingsGet('DefaultIdentityID'));
+
 	this.displayName(RL.settingsGet('DisplayName'));
 	this.replyTo(RL.settingsGet('ReplyTo'));
 	this.signature(RL.settingsGet('Signature'));

dev/ViewModels/PopupsComposeViewModel.js

@@ -91,7 +91,7 @@ function PopupsComposeViewModel()
 	this.composeEditorArea = ko.observable(null);
 
 	this.identities = RL.data().identities;
-
+	this.defaultIdentityID = RL.data().defaultIdentityID;
 	this.currentIdentityID = ko.observable('');
 
 	this.currentIdentityString = ko.observable('');
@@ -433,7 +433,6 @@ PopupsComposeViewModel.prototype.findIdentityIdByMessage = function (sComposeTyp
 		switch (sComposeType)
 		{
 			case Enums.ComposeType.Empty:
-				sResult = RL.data().accountEmail();
 				break;
 			case Enums.ComposeType.Reply:
 			case Enums.ComposeType.ReplyAll:
@@ -446,7 +445,13 @@ PopupsComposeViewModel.prototype.findIdentityIdByMessage = function (sComposeTyp
 				break;
 		}
 	}
-	else
+
+	if ('' === sResult)
+	{
+		sResult = this.defaultIdentityID();
+	}
+
+	if ('' === sResult)
 	{
 		sResult = RL.data().accountEmail();
 	}
@@ -694,9 +699,9 @@ PopupsComposeViewModel.prototype.onShow = function (sType, oMessageOrArray, aToE
 	if (null !== mEmail)
 	{
 		oExcludeEmail[mEmail] = true;
-		this.currentIdentityID(this.findIdentityIdByMessage(sComposeType, oMessage));
 	}
 
+	this.currentIdentityID(this.findIdentityIdByMessage(sComposeType, oMessage));
 	this.reset();
 
 	if (Utils.isNonEmptyArray(aToEmails))

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
-	"version": "1.6.7",
-	"release": "141",
+	"version": "1.6.8",
+	"release": "151",
 	"description": "Simple, modern & fast web-based email client",
 	"homepage": "http://rainloop.net",
 	"main": "gulpfile.js",

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

@@ -1240,6 +1240,7 @@ class Actions
 		$aResult['ReplySameFolder'] = false;
 		$aResult['Layout'] = \RainLoop\Enumerations\Layout::SIDE_PREVIEW;
 		$aResult['UseCheckboxesInList'] = true;
+		$aResult['DefaultIdentityID'] = '';
 		$aResult['DisplayName'] = '';
 		$aResult['ReplyTo'] = '';
 		$aResult['Signature'] = '';
@@ -1277,6 +1278,7 @@ class Actions
 			$aResult['UseCheckboxesInList'] = (bool) $oSettings->GetConf('UseCheckboxesInList', $aResult['UseCheckboxesInList']);
 			$aResult['InterfaceAnimation'] = (string) $oSettings->GetConf('InterfaceAnimation', $aResult['InterfaceAnimation']);
 
+			$aResult['DefaultIdentityID'] = $oSettings->GetConf('DefaultIdentityID', $oAccount ? $oAccount->Email() : $aResult['DefaultIdentityID']);
 			$aResult['DisplayName'] = $oSettings->GetConf('DisplayName', $aResult['DisplayName']);
 			$aResult['ReplyTo'] = $oSettings->GetConf('ReplyTo', $aResult['ReplyTo']);
 			$aResult['Signature'] = $oSettings->GetConf('Signature', $aResult['Signature']);
@@ -1339,6 +1341,7 @@ class Actions
 		$aResult['PluginsLink'] = $sPluginsLink;
 		$aResult['EditorDefaultType'] = 'Html' === $aResult['EditorDefaultType'] ? 'Html' : 'Plain';
 
+		// IDN
 		$aResult['Email'] = \MailSo\Base\Utils::IdnToUtf8($aResult['Email']);
 		$aResult['ParentEmail'] = \MailSo\Base\Utils::IdnToUtf8($aResult['ParentEmail']);
 		$aResult['MailToEmail'] = \MailSo\Base\Utils::IdnToUtf8($aResult['MailToEmail']);
@@ -3430,6 +3433,7 @@ class Actions
 		$this->setSettingsFromParams($oSettings, 'ReplySameFolder', 'bool');
 		$this->setSettingsFromParams($oSettings, 'UseCheckboxesInList', 'bool');
 
+		$this->setSettingsFromParams($oSettings, 'DefaultIdentityID', 'string');
 		$this->setSettingsFromParams($oSettings, 'DisplayName', 'string');
 		$this->setSettingsFromParams($oSettings, 'ReplyTo', 'string');
 		$this->setSettingsFromParams($oSettings, 'Signature', 'string');

rainloop/v/0.0.0/app/templates/Views/App/SettingsIdentities.html

@@ -3,6 +3,16 @@
 		<div class="legend g-ui-user-select-none">
 			<span class="i18n" data-i18n-text="SETTINGS_IDENTITIES/LEGEND_IDENTITY"></span>
 		</div>
+		<div class="control-group g-ui-user-select-none" data-bind="if: 0 < identities().length">
+			<label class="control-label" data-bind="i18nUpdate: identities">
+				<span class="i18n" data-i18n-text="SETTINGS_IDENTITIES/LABEL_DEFAULT"></span>
+			</label>
+			<div class="controls">
+				<select data-bind="options: identitiesOptions, value: defaultIdentityID,
+					optionsText: 'name', optionsValue: 'id', optionsAfterRender: $root.defautOptionsAfterRender, saveTrigger: defaultIdentityIDTrigger"></select>
+				<div data-bind="saveTrigger: defaultIdentityIDTrigger"></div>
+			</div>
+		</div>
 		<div class="control-group g-ui-user-select-none">
 			<label class="control-label">
 				<span class="i18n" data-i18n-text="SETTINGS_IDENTITIES/LABEL_DISPLAY_NAME"></span>

rainloop/v/0.0.0/langs/de.ini

@@ -461,6 +461,7 @@ DELETING_ASK = "Sind Sie sicher?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identität"
 LEGEND_IDENTITIES = "Zusätzliche Identitäten"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Name"
 LABEL_REPLY_TO = "Antwort an"
 LABEL_SIGNATURE = "Signatur"

rainloop/v/0.0.0/langs/en.ini

@@ -469,6 +469,7 @@ DELETING_ASK = "Are you sure?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identity"
 LEGEND_IDENTITIES = "Additional Identities"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Name"
 LABEL_REPLY_TO = "Reply-To"
 LABEL_SIGNATURE = "Signature"

rainloop/v/0.0.0/langs/es.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "¿Está usted seguro?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identidad"
 LEGEND_IDENTITIES = "Identidades adicionales"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Nombre"
 LABEL_REPLY_TO = "Responder a"
 LABEL_SIGNATURE = "Firma"

rainloop/v/0.0.0/langs/fr.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "Êtes-vous sûr ?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identité"
 LEGEND_IDENTITIES = "Identités supplémentaires"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Nom"
 LABEL_REPLY_TO = "Répondre à"
 LABEL_SIGNATURE = "Signature"

rainloop/v/0.0.0/langs/hu.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "Biztosak vagyunk benne?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identitás"
 LEGEND_IDENTITIES = "Additional Identities"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Név"
 LABEL_REPLY_TO = "Reply-To"
 LABEL_SIGNATURE = "Aláírás"

rainloop/v/0.0.0/langs/is.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "Ertu viss?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identity"
 LEGEND_IDENTITIES = "Additional Identities"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Nafn"
 LABEL_REPLY_TO = "Svara"
 LABEL_SIGNATURE = "Undirskrift"

rainloop/v/0.0.0/langs/it.ini

@@ -461,6 +461,7 @@ DELETING_ASK = "Ne sei sicuro?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identità"
 LEGEND_IDENTITIES = "Identità aggiuntive"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Nome"
 LABEL_REPLY_TO = "Rispondi a"
 LABEL_SIGNATURE = "Firma"

rainloop/v/0.0.0/langs/ja-jp.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "Are you sure?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identity"
 LEGEND_IDENTITIES = "Additional Identities"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Name"
 LABEL_REPLY_TO = "Reply-To"
 LABEL_SIGNATURE = "Signature"

rainloop/v/0.0.0/langs/ko-kr.ini

@@ -457,6 +457,7 @@ DELETING_ASK = "정말로 삭제하시겠습니까?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "신원"
 LEGEND_IDENTITIES = "새 신원 추가"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "이름"
 LABEL_REPLY_TO = "답장"
 LABEL_SIGNATURE = "서명"

rainloop/v/0.0.0/langs/lv.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "Tiešām?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identity"
 LEGEND_IDENTITIES = "Additional Identities"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Vārds"
 LABEL_REPLY_TO = "Atbildēt uz"
 LABEL_SIGNATURE = "Paraksts"

rainloop/v/0.0.0/langs/nl.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "Ben je zeker?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identity"
 LEGEND_IDENTITIES = "Additional Identities"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Naam"
 LABEL_REPLY_TO = "Antwoorden naar"
 LABEL_SIGNATURE = "Handtekening"

rainloop/v/0.0.0/langs/no.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "Er du sikker?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identitet"
 LEGEND_IDENTITIES = "Tilleggs Identities"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Navn"
 LABEL_REPLY_TO = "Svar til"
 LABEL_SIGNATURE = "Signatur"

rainloop/v/0.0.0/langs/pl.ini

@@ -459,6 +459,7 @@ DELETING_ASK = "Czy na pewno usunąć?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Tożsamość"
 LEGEND_IDENTITIES = "Dodatkowe Tożsamości"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Nazwa"
 LABEL_REPLY_TO = "Odp. do"
 LABEL_SIGNATURE = "Podpis"

rainloop/v/0.0.0/langs/pt-br.ini

@@ -463,6 +463,7 @@ DELETING_ASK = "Você tem certeza?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identidade"
 LEGEND_IDENTITIES = "Identidades adicionais"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Nome"
 LABEL_REPLY_TO = "Reenviar para"
 LABEL_SIGNATURE = "Assinatura"

rainloop/v/0.0.0/langs/pt-pt.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "Você tem certeza?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identidade"
 LEGEND_IDENTITIES = "Identidades adicionais"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Nome"
 LABEL_REPLY_TO = "Reenviar para"
 LABEL_SIGNATURE = "Assinatura"

rainloop/v/0.0.0/langs/ro.ini

@@ -459,6 +459,7 @@ DELETING_ASK = "Sunteți sigur?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Setările de profil de bază"
 LEGEND_IDENTITIES = "Profiluri suplimentare"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Nume"
 LABEL_REPLY_TO = "Răspunde la"
 LABEL_SIGNATURE = "Semnătură"

rainloop/v/0.0.0/langs/ru.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "Точно?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Настройки основного профиля"
 LEGEND_IDENTITIES = "Дополнительные профили"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Имя"
 LABEL_REPLY_TO = "Отвечать на"
 LABEL_SIGNATURE = "Подпись"

rainloop/v/0.0.0/langs/sk.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "Ste si istý?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Identita"
 LEGEND_IDENTITIES = "Ďalšie identity"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Meno"
 LABEL_REPLY_TO = "Adresa pre odpoveď"
 LABEL_SIGNATURE = "Podpis"

rainloop/v/0.0.0/langs/ua.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "Впевнені?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "Налаштування основного профілю"
 LEGEND_IDENTITIES = "Додаткові профілі"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "Ім'я"
 LABEL_REPLY_TO = "Відповідати на"
 LABEL_SIGNATURE = "Підпис"

rainloop/v/0.0.0/langs/zh-cn.ini

@@ -460,6 +460,7 @@ DELETING_ASK = "确定?"
 [SETTINGS_IDENTITIES]
 LEGEND_IDENTITY = "签名"
 LEGEND_IDENTITIES = "附加签名"
+LABEL_DEFAULT = "Default"
 LABEL_DISPLAY_NAME = "名称"
 LABEL_REPLY_TO = "回复"
 LABEL_SIGNATURE = "签名"

rainloop/v/0.0.0/static/js/app.js

@@ -4906,6 +4906,8 @@ Selector.prototype.actionClick = function (oItem, oEvent)
 		{
 			this.focusedItem(oItem);
 			this.selectedItem(oItem);
+
+			this.scrollToFocused();
 		}
 	}
 };
@@ -8799,7 +8801,7 @@ function PopupsComposeViewModel()
 	this.composeEditorArea = ko.observable(null);
 
 	this.identities = RL.data().identities;
-
+	this.defaultIdentityID = RL.data().defaultIdentityID;
 	this.currentIdentityID = ko.observable('');
 
 	this.currentIdentityString = ko.observable('');
@@ -9141,7 +9143,6 @@ PopupsComposeViewModel.prototype.findIdentityIdByMessage = function (sComposeTyp
 		switch (sComposeType)
 		{
 			case Enums.ComposeType.Empty:
-				sResult = RL.data().accountEmail();
 				break;
 			case Enums.ComposeType.Reply:
 			case Enums.ComposeType.ReplyAll:
@@ -9154,7 +9155,13 @@ PopupsComposeViewModel.prototype.findIdentityIdByMessage = function (sComposeTyp
 				break;
 		}
 	}
-	else
+
+	if ('' === sResult)
+	{
+		sResult = this.defaultIdentityID();
+	}
+
+	if ('' === sResult)
 	{
 		sResult = RL.data().accountEmail();
 	}
@@ -9402,9 +9409,9 @@ PopupsComposeViewModel.prototype.onShow = function (sType, oMessageOrArray, aToE
 	if (null !== mEmail)
 	{
 		oExcludeEmail[mEmail] = true;
-		this.currentIdentityID(this.findIdentityIdByMessage(sComposeType, oMessage));
 	}
 
+	this.currentIdentityID(this.findIdentityIdByMessage(sComposeType, oMessage));
 	this.reset();
 
 	if (Utils.isNonEmptyArray(aToEmails))
@@ -14815,7 +14822,9 @@ function SettingsIdentities()
 	var oData = RL.data();
 
 	this.editor = null;
+	this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
 
+	this.accountEmail = oData.accountEmail;
 	this.displayName = oData.displayName;
 	this.signature = oData.signature;
 	this.signatureToAll = oData.signatureToAll;
@@ -14823,11 +14832,47 @@ function SettingsIdentities()
 
 	this.signatureDom = ko.observable(null);
 
+	this.defaultIdentityIDTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 	this.displayNameTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 	this.replyTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 	this.signatureTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 
 	this.identities = oData.identities;
+	this.defaultIdentityID = oData.defaultIdentityID;
+
+	this.identitiesOptions = ko.computed(function () {
+
+		var
+			aList = this.identities(),
+			aResult = []
+		;
+
+		if (0 < aList.length)
+		{
+			aResult.push({
+				'id': this.accountEmail.peek(),
+				'name': this.formattedAccountIdentity(),
+				'seporator': false
+			});
+
+			aResult.push({
+				'id': '---',
+				'name': '---',
+				'seporator': true,
+				'disabled': true
+			});
+
+			_.each(aList, function (oItem) {
+				aResult.push({
+					'id': oItem.id,
+					'name': oItem.formattedNameForEmail(),
+					'seporator': false
+				});
+			});
+		}
+
+		return aResult;
+	}, this);
 
 	this.processText = ko.computed(function () {
 		return oData.identitiesLoading() ? Utils.i18n('SETTINGS_IDENTITIES/LOADING_PROCESS') : '';
@@ -14854,6 +14899,20 @@ function SettingsIdentities()
 
 Utils.addSettingsViewModel(SettingsIdentities, 'SettingsIdentities', 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'identities');
 
+/**
+ *
+ * @return {string}
+ */
+SettingsIdentities.prototype.formattedAccountIdentity = function ()
+{
+	var
+		sDisplayName = this.displayName.peek(),
+		sEmail = this.accountEmail.peek()
+	;
+
+	return '' === sDisplayName ? sEmail : '"' + Utils.quoteName(sDisplayName) + '" <' + sEmail + '>';
+};
+
 SettingsIdentities.prototype.addNewIdentity = function ()
 {
 	kn.showScreenPopup(PopupsIdentityViewModel);
@@ -14936,9 +14995,16 @@ SettingsIdentities.prototype.onBuild = function (oDom)
 			oData = RL.data(),
 			f1 = Utils.settingsSaveHelperSimpleFunction(self.displayNameTrigger, self),
 			f2 = Utils.settingsSaveHelperSimpleFunction(self.replyTrigger, self),
-			f3 = Utils.settingsSaveHelperSimpleFunction(self.signatureTrigger, self)
+			f3 = Utils.settingsSaveHelperSimpleFunction(self.signatureTrigger, self),
+			f4 = Utils.settingsSaveHelperSimpleFunction(self.defaultIdentityIDTrigger, self)
 		;
 
+		oData.defaultIdentityID.subscribe(function (sValue) {
+			RL.remote().saveSettings(f4, {
+				'DefaultIdentityID': sValue
+			});
+		});
+
 		oData.displayName.subscribe(function (sValue) {
 			RL.remote().saveSettings(f1, {
 				'DisplayName': sValue
@@ -15926,6 +15992,7 @@ function WebMailDataStorage()
 	this.accountsLoading = ko.observable(false).extend({'throttle': 100});
 
 	// identities
+	this.defaultIdentityID = ko.observable('');
 	this.identities = ko.observableArray([]);
 	this.identitiesLoading = ko.observable(false).extend({'throttle': 100});
 
@@ -16324,6 +16391,8 @@ WebMailDataStorage.prototype.populateDataOnStart = function()
 	this.accountOutLogin(RL.settingsGet('OutLogin'));
 	this.projectHash(RL.settingsGet('ProjectHash'));
 
+	this.defaultIdentityID(RL.settingsGet('DefaultIdentityID'));
+
 	this.displayName(RL.settingsGet('DisplayName'));
 	this.replyTo(RL.settingsGet('ReplyTo'));
 	this.signature(RL.settingsGet('Signature'));