diff --git a/dev/Knoin/AbstractScreen.js b/dev/Knoin/AbstractScreen.js
index e5d92413b..d1797364f 100644
--- a/dev/Knoin/AbstractScreen.js
+++ b/dev/Knoin/AbstractScreen.js
@@ -26,17 +26,14 @@ export class AbstractScreen {
 	 * @returns {void}
 	 */
 	onStart() {
-		if (!this.__started) {
-			this.__started = true;
-			const routes = this.routes();
-			if (arrayLength(routes)) {
-				let route = new Crossroads(),
-					fMatcher = (this.onRoute || (()=>0)).bind(this);
+		const routes = this.routes();
+		if (arrayLength(routes)) {
+			let route = new Crossroads(),
+				fMatcher = (this.onRoute || (()=>0)).bind(this);
 
-				routes.forEach(item => item && route && (route.addRoute(item[0], fMatcher).rules = item[1]));
+			routes.forEach(item => item && route && (route.addRoute(item[0], fMatcher).rules = item[1]));
 
-				this.__cross = route;
-			}
+			this.__cross = route;
 		}
 	}
 }
diff --git a/dev/Knoin/AbstractViews.js b/dev/Knoin/AbstractViews.js
index 0b7e952b4..ad4179372 100644
--- a/dev/Knoin/AbstractViews.js
+++ b/dev/Knoin/AbstractViews.js
@@ -10,6 +10,7 @@ class AbstractView {
 	constructor(templateID, type)
 	{
 //		Object.defineProperty(this, 'viewModelTemplateID', { value: templateID });
+//		this.viewModelTemplateID = this.constructor.name;
 		this.viewModelTemplateID = templateID;
 		this.viewType = type;
 		this.viewModelDom = null;
diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js
index e47b71f96..df9e4a234 100644
--- a/dev/Knoin/Knoin.js
+++ b/dev/Knoin/Knoin.js
@@ -278,7 +278,12 @@ export const
 			}
 		});
 
-		forEachObjectValue(SCREENS, vmScreen => vmScreen.onStart());
+		forEachObjectValue(SCREENS, vmScreen => {
+			if (!vmScreen.__started) {
+				vmScreen.onStart();
+				vmScreen.__started = true;
+			}
+		});
 
 		const cross = new Crossroads();
 		cross.addRoute(/^([a-zA-Z0-9-]*)\/?(.*)$/, screenOnRoute);
diff --git a/dev/Screen/AbstractSettings.js b/dev/Screen/AbstractSettings.js
index 4e8d91afd..455617294 100644
--- a/dev/Screen/AbstractSettings.js
+++ b/dev/Screen/AbstractSettings.js
@@ -28,7 +28,7 @@ export class AbstractSettingsScreen extends AbstractScreen {
 			);
 
 		if (RoutedSettingsViewModel) {
-			if (RoutedSettingsViewModel.__builded && RoutedSettingsViewModel.__vm) {
+			if (RoutedSettingsViewModel.__vm) {
 				settingsScreen = RoutedSettingsViewModel.__vm;
 			} else {
 				const vmPlace = elementById('rl-settings-subscreen');
@@ -43,7 +43,6 @@ export class AbstractSettingsScreen extends AbstractScreen {
 					settingsScreen.viewModelDom = viewModelDom;
 
 					RoutedSettingsViewModel.__dom = viewModelDom;
-					RoutedSettingsViewModel.__builded = true;
 					RoutedSettingsViewModel.__vm = settingsScreen;
 
 					ko.applyBindingAccessorsToNode(
@@ -132,11 +131,12 @@ export class AbstractSettingsScreen extends AbstractScreen {
  * @returns {void}
  */
 export function settingsAddViewModel(SettingsViewModelClass, template, labelName, route, isDefault = false) {
+	let name = SettingsViewModelClass.name.replace(/(User|Admin)Settings/, '');
 	SettingsViewModelClass.__rlSettingsData = {
-		label: labelName,
-		route: route,
+		label: labelName || 'SETTINGS_LABELS/LABEL_' + name.toUpperCase() + '_NAME',
+		route: route || name.toLowerCase(),
 		selected: ko.observable(false),
-		template: template,
+		template: template || SettingsViewModelClass.name,
 		isDefault: !!isDefault
 	};
 
diff --git a/dev/Screen/Admin/Settings.js b/dev/Screen/Admin/Settings.js
index e65d0f134..a57cc8219 100644
--- a/dev/Screen/Admin/Settings.js
+++ b/dev/Screen/Admin/Settings.js
@@ -2,15 +2,15 @@ import { runSettingsViewModelHooks } from 'Common/Plugins';
 
 import { AbstractSettingsScreen, settingsAddViewModel } from 'Screen/AbstractSettings';
 
-import { GeneralAdminSettings } from 'Settings/Admin/General';
-import { DomainsAdminSettings } from 'Settings/Admin/Domains';
-import { LoginAdminSettings } from 'Settings/Admin/Login';
-import { ContactsAdminSettings } from 'Settings/Admin/Contacts';
-import { SecurityAdminSettings } from 'Settings/Admin/Security';
-import { PackagesAdminSettings } from 'Settings/Admin/Packages';
-import { AboutAdminSettings } from 'Settings/Admin/About';
-import { BrandingAdminSettings } from 'Settings/Admin/Branding';
-import { ConfigAdminSettings } from 'Settings/Admin/Config';
+import { AdminSettingsGeneral } from 'Settings/Admin/General';
+import { AdminSettingsDomains } from 'Settings/Admin/Domains';
+import { AdminSettingsLogin } from 'Settings/Admin/Login';
+import { AdminSettingsContacts } from 'Settings/Admin/Contacts';
+import { AdminSettingsSecurity } from 'Settings/Admin/Security';
+import { AdminSettingsPackages } from 'Settings/Admin/Packages';
+import { AdminSettingsAbout } from 'Settings/Admin/About';
+import { AdminSettingsBranding } from 'Settings/Admin/Branding';
+import { AdminSettingsConfig } from 'Settings/Admin/Config';
 
 import { MenuSettingsAdminView } from 'View/Admin/Settings/Menu';
 import { PaneSettingsAdminView } from 'View/Admin/Settings/Pane';
@@ -19,30 +19,18 @@ export class SettingsAdminScreen extends AbstractSettingsScreen {
 	constructor() {
 		super([MenuSettingsAdminView, PaneSettingsAdminView]);
 
-		settingsAddViewModel(
-			GeneralAdminSettings,
-			'AdminSettingsGeneral',
-			'TABS_LABELS/LABEL_GENERAL_NAME',
-			'general',
-			true
-		);
-
 		[
-			[DomainsAdminSettings, 'Domains'],
-			[LoginAdminSettings, 'Login'],
-			[BrandingAdminSettings, 'Branding'],
-			[ContactsAdminSettings, 'Contacts'],
-			[SecurityAdminSettings, 'Security'],
-			[PackagesAdminSettings, 'Packages'],
-			[ConfigAdminSettings, 'Config'],
-			[AboutAdminSettings, 'About'],
-		].forEach(item =>
-			settingsAddViewModel(
-				item[0],
-				'AdminSettings'+item[1],
-				'TABS_LABELS/LABEL_'+item[1].toUpperCase()+'_NAME',
-				item[1].toLowerCase()
-			)
+			AdminSettingsGeneral,
+			AdminSettingsDomains,
+			AdminSettingsLogin,
+			AdminSettingsBranding,
+			AdminSettingsContacts,
+			AdminSettingsSecurity,
+			AdminSettingsPackages,
+			AdminSettingsConfig,
+			AdminSettingsAbout
+		].forEach((item, index) =>
+			settingsAddViewModel(item, 0, 0, 0, 0 === index)
 		);
 
 		runSettingsViewModelHooks(true);
diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js
index 181174d69..8397ecce8 100644
--- a/dev/Screen/User/MailBox.js
+++ b/dev/Screen/User/MailBox.js
@@ -82,20 +82,18 @@ export class MailBoxUserScreen extends AbstractScreen {
 	 * @returns {void}
 	 */
 	onStart() {
-		if (!this.__started) {
-			super.onStart();
+		super.onStart();
 
-			addEventListener('mailbox.inbox-unread-count', e => {
-				FolderUserStore.foldersInboxUnreadCount(e.detail);
-/*				// Disabled in SystemDropDown.html
-				const email = AccountUserStore.email();
-				AccountUserStore.accounts.forEach(item =>
-					item && email === item.email && item.count(e.detail)
-				);
+		addEventListener('mailbox.inbox-unread-count', e => {
+			FolderUserStore.foldersInboxUnreadCount(e.detail);
+/*			// Disabled in SystemDropDown.html
+			const email = AccountUserStore.email();
+			AccountUserStore.accounts.forEach(item =>
+				item && email === item.email && item.count(e.detail)
+			);
 */
-				this.updateWindowTitle();
-			});
-		}
+			this.updateWindowTitle();
+		});
 	}
 
 	/**
diff --git a/dev/Screen/User/Settings.js b/dev/Screen/User/Settings.js
index a0c292317..4d5286c1f 100644
--- a/dev/Screen/User/Settings.js
+++ b/dev/Screen/User/Settings.js
@@ -9,14 +9,13 @@ import { ThemeStore } from 'Stores/Theme';
 
 import { AbstractSettingsScreen, settingsAddViewModel } from 'Screen/AbstractSettings';
 
-import { GeneralUserSettings } from 'Settings/User/General';
-import { ContactsUserSettings } from 'Settings/User/Contacts';
-import { AccountsUserSettings } from 'Settings/User/Accounts';
-import { FiltersUserSettings } from 'Settings/User/Filters';
-import { SecurityUserSettings } from 'Settings/User/Security';
-import { FoldersUserSettings } from 'Settings/User/Folders';
-import { ThemesUserSettings } from 'Settings/User/Themes';
-import { OpenPgpUserSettings } from 'Settings/User/OpenPgp';
+import { UserSettingsGeneral } from 'Settings/User/General';
+import { UserSettingsContacts } from 'Settings/User/Contacts';
+import { UserSettingsAccounts } from 'Settings/User/Accounts';
+import { UserSettingsFilters } from 'Settings/User/Filters';
+import { UserSettingsSecurity } from 'Settings/User/Security';
+import { UserSettingsFolders } from 'Settings/User/Folders';
+import { UserSettingsThemes } from 'Settings/User/Themes';
 
 import { SystemDropDownUserView } from 'View/User/SystemDropDown';
 import { MenuSettingsUserView } from 'View/User/Settings/Menu';
@@ -26,40 +25,35 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
 	constructor() {
 		super([SystemDropDownUserView, MenuSettingsUserView, PaneSettingsUserView]);
 
-		settingsAddViewModel(GeneralUserSettings, 'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
+		const views = [
+			UserSettingsGeneral
+		];
 
 		if (AppUserStore.allowContacts()) {
-			settingsAddViewModel(ContactsUserSettings, 'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
+			views.push(UserSettingsContacts);
 		}
 
 		if (SettingsCapa('AdditionalAccounts') || SettingsCapa('Identities')) {
-			settingsAddViewModel(
-				AccountsUserSettings,
-				'SettingsAccounts',
-				SettingsCapa('AdditionalAccounts')
-					? 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME'
-					: 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME',
-				'accounts'
-			);
+			views.push(UserSettingsAccounts);
 		}
 
 		if (SettingsCapa('Sieve')) {
-			settingsAddViewModel(FiltersUserSettings, 'SettingsFilters', 'SETTINGS_LABELS/LABEL_FILTERS_NAME', 'filters');
+			views.push(UserSettingsFilters);
 		}
 
-		if (SettingsCapa('AutoLogout')) {
-			settingsAddViewModel(SecurityUserSettings, 'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
+		if (SettingsCapa('AutoLogout') || SettingsCapa('OpenPGP') || SettingsCapa('GnuPG')) {
+			views.push(UserSettingsSecurity);
 		}
 
-		settingsAddViewModel(FoldersUserSettings, 'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
+		views.push(UserSettingsFolders);
 
 		if (SettingsCapa('Themes')) {
-			settingsAddViewModel(ThemesUserSettings, 'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
+			views.push(UserSettingsThemes);
 		}
 
-		if (SettingsCapa('OpenPGP') || SettingsCapa('GnuPG')) {
-			settingsAddViewModel(OpenPgpUserSettings, 'SettingsOpenPGP', 'OpenPGP', 'openpgp');
-		}
+		views.forEach((item, index) =>
+			settingsAddViewModel(item, item.name.replace('User', ''), 0, 0, 0 === index)
+		);
 
 		runSettingsViewModelHooks(false);
 
diff --git a/dev/Settings/Admin/About.js b/dev/Settings/Admin/About.js
index 94570f794..c6754eb74 100644
--- a/dev/Settings/Admin/About.js
+++ b/dev/Settings/Admin/About.js
@@ -2,7 +2,7 @@ import ko from 'ko';
 import { Settings } from 'Common/Globals';
 import Remote from 'Remote/Admin/Fetch';
 
-export class AboutAdminSettings /*extends AbstractViewSettings*/ {
+export class AdminSettingsAbout /*extends AbstractViewSettings*/ {
 	constructor() {
 		this.version = Settings.app('version');
 		this.phpextensions = ko.observableArray();
diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js
index 35bd3383f..c8ad7aea1 100644
--- a/dev/Settings/Admin/Branding.js
+++ b/dev/Settings/Admin/Branding.js
@@ -1,6 +1,6 @@
 import { AbstractViewSettings } from 'Knoin/AbstractViews';
 
-export class BrandingAdminSettings extends AbstractViewSettings {
+export class AdminSettingsBranding extends AbstractViewSettings {
 	constructor() {
 		super();
 		this.addSetting('Title');
diff --git a/dev/Settings/Admin/Config.js b/dev/Settings/Admin/Config.js
index d9de703fc..909efbc9e 100644
--- a/dev/Settings/Admin/Config.js
+++ b/dev/Settings/Admin/Config.js
@@ -3,7 +3,7 @@ import ko from 'ko';
 import Remote from 'Remote/Admin/Fetch';
 import { forEachObjectEntry } from 'Common/Utils';
 
-export class ConfigAdminSettings /*extends AbstractViewSettings*/ {
+export class AdminSettingsConfig /*extends AbstractViewSettings*/ {
 
 	constructor() {
 		this.config = ko.observableArray();
diff --git a/dev/Settings/Admin/Contacts.js b/dev/Settings/Admin/Contacts.js
index 71dddcfd1..1cb0d0d1d 100644
--- a/dev/Settings/Admin/Contacts.js
+++ b/dev/Settings/Admin/Contacts.js
@@ -8,7 +8,7 @@ import Remote from 'Remote/Admin/Fetch';
 import { decorateKoCommands } from 'Knoin/Knoin';
 import { AbstractViewSettings } from 'Knoin/AbstractViews';
 
-export class ContactsAdminSettings extends AbstractViewSettings {
+export class AdminSettingsContacts extends AbstractViewSettings {
 	constructor() {
 		super();
 		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
diff --git a/dev/Settings/Admin/Domains.js b/dev/Settings/Admin/Domains.js
index c08d183cc..d14f5dad8 100644
--- a/dev/Settings/Admin/Domains.js
+++ b/dev/Settings/Admin/Domains.js
@@ -8,7 +8,7 @@ import Remote from 'Remote/Admin/Fetch';
 import { DomainPopupView } from 'View/Popup/Domain';
 import { DomainAliasPopupView } from 'View/Popup/DomainAlias';
 
-export class DomainsAdminSettings /*extends AbstractViewSettings*/ {
+export class AdminSettingsDomains /*extends AbstractViewSettings*/ {
 	constructor() {
 		this.domains = DomainAdminStore;
 
diff --git a/dev/Settings/Admin/General.js b/dev/Settings/Admin/General.js
index 38e3d1150..66127ca21 100644
--- a/dev/Settings/Admin/General.js
+++ b/dev/Settings/Admin/General.js
@@ -21,7 +21,7 @@ import { ThemeStore } from 'Stores/Theme';
 import { LanguageStore } from 'Stores/Language';
 import { LanguagesPopupView } from 'View/Popup/Languages';
 
-export class GeneralAdminSettings extends AbstractViewSettings {
+export class AdminSettingsGeneral extends AbstractViewSettings {
 	constructor() {
 		super();
 
diff --git a/dev/Settings/Admin/Login.js b/dev/Settings/Admin/Login.js
index c48335583..cfc1feba0 100644
--- a/dev/Settings/Admin/Login.js
+++ b/dev/Settings/Admin/Login.js
@@ -1,6 +1,6 @@
 import { AbstractViewSettings } from 'Knoin/AbstractViews';
 
-export class LoginAdminSettings extends AbstractViewSettings {
+export class AdminSettingsLogin extends AbstractViewSettings {
 	constructor() {
 		super();
 		this.addSetting('LoginDefaultDomain');
diff --git a/dev/Settings/Admin/Packages.js b/dev/Settings/Admin/Packages.js
index e6d139fce..7a161e5b1 100644
--- a/dev/Settings/Admin/Packages.js
+++ b/dev/Settings/Admin/Packages.js
@@ -11,7 +11,7 @@ import { PluginPopupView } from 'View/Popup/Plugin';
 import { addObservablesTo, addComputablesTo } from 'External/ko';
 import { AbstractViewSettings } from 'Knoin/AbstractViews';
 
-export class PackagesAdminSettings extends AbstractViewSettings {
+export class AdminSettingsPackages extends AbstractViewSettings {
 	constructor() {
 		super();
 
diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js
index e1876e7bf..a1ba65b6f 100644
--- a/dev/Settings/Admin/Security.js
+++ b/dev/Settings/Admin/Security.js
@@ -6,7 +6,7 @@ import Remote from 'Remote/Admin/Fetch';
 import { decorateKoCommands } from 'Knoin/Knoin';
 import { AbstractViewSettings } from 'Knoin/AbstractViews';
 
-export class SecurityAdminSettings extends AbstractViewSettings {
+export class AdminSettingsSecurity extends AbstractViewSettings {
 	constructor() {
 		super();
 
diff --git a/dev/Settings/User/Accounts.js b/dev/Settings/User/Accounts.js
index dd460b109..b7baa37da 100644
--- a/dev/Settings/User/Accounts.js
+++ b/dev/Settings/User/Accounts.js
@@ -11,7 +11,7 @@ import { showScreenPopup } from 'Knoin/Knoin';
 import { AccountPopupView } from 'View/Popup/Account';
 import { IdentityPopupView } from 'View/Popup/Identity';
 
-export class AccountsUserSettings /*extends AbstractViewSettings*/ {
+export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
 	constructor() {
 		this.allowAdditionalAccount = SettingsCapa('AdditionalAccounts');
 		this.allowIdentities = SettingsCapa('Identities');
diff --git a/dev/Settings/User/Contacts.js b/dev/Settings/User/Contacts.js
index 74cdc1f93..22be1cdbe 100644
--- a/dev/Settings/User/Contacts.js
+++ b/dev/Settings/User/Contacts.js
@@ -5,7 +5,7 @@ import { SettingsGet } from 'Common/Globals';
 import { ContactUserStore } from 'Stores/User/Contact';
 import Remote from 'Remote/User/Fetch';
 
-export class ContactsUserSettings /*extends AbstractViewSettings*/ {
+export class UserSettingsContacts /*extends AbstractViewSettings*/ {
 	constructor() {
 		this.contactsAutosave = ko.observable(!!SettingsGet('ContactsAutosave'));
 
diff --git a/dev/Settings/User/Filters.js b/dev/Settings/User/Filters.js
index 52f97543a..cc807fd4b 100644
--- a/dev/Settings/User/Filters.js
+++ b/dev/Settings/User/Filters.js
@@ -11,7 +11,7 @@ import { showScreenPopup } from 'Knoin/Knoin';
 
 import { SieveScriptPopupView } from 'View/Popup/SieveScript';
 
-export class FiltersUserSettings /*extends AbstractViewSettings*/ {
+export class UserSettingsFilters /*extends AbstractViewSettings*/ {
 	constructor() {
 		this.scripts = SieveUserStore.scripts;
 		this.loading = ko.observable(false).extend({ debounce: 200 });
diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index b7e1c429e..d5e2b9aa2 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -24,7 +24,7 @@ import { loadFolders } from 'Model/FolderCollection';
 
 const folderForDeletion = ko.observable(null).askDeleteHelper();
 
-export class FoldersUserSettings /*extends AbstractViewSettings*/ {
+export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 	constructor() {
 		this.showKolab = koComputable(() => FolderUserStore.hasCapability('METADATA') && SettingsCapa('Kolab'));
 		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js
index 26207fe62..28cb69176 100644
--- a/dev/Settings/User/General.js
+++ b/dev/Settings/User/General.js
@@ -23,7 +23,7 @@ import Remote from 'Remote/User/Fetch';
 import { IdentityPopupView } from 'View/Popup/Identity';
 import { LanguagesPopupView } from 'View/Popup/Languages';
 
-export class GeneralUserSettings extends AbstractViewSettings {
+export class UserSettingsGeneral extends AbstractViewSettings {
 	constructor() {
 		super();
 
diff --git a/dev/Settings/User/OpenPgp.js b/dev/Settings/User/OpenPgp.js
deleted file mode 100644
index 4fd402876..000000000
--- a/dev/Settings/User/OpenPgp.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import { GnuPGUserStore } from 'Stores/User/GnuPG';
-import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
-import { SettingsUserStore } from 'Stores/User/Settings';
-
-import Remote from 'Remote/User/Fetch';
-
-import { showScreenPopup } from 'Knoin/Knoin';
-
-import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport';
-import { OpenPgpGeneratePopupView } from 'View/Popup/OpenPgpGenerate';
-
-import { SettingsCapa } from 'Common/Globals';
-
-export class OpenPgpUserSettings /*extends AbstractViewSettings*/ {
-	constructor() {
-		this.gnupgPublicKeys = GnuPGUserStore.publicKeys;
-		this.gnupgPrivateKeys = GnuPGUserStore.privateKeys;
-
-		this.openpgpkeysPublic = OpenPGPUserStore.publicKeys;
-		this.openpgpkeysPrivate = OpenPGPUserStore.privateKeys;
-
-		this.canOpenPGP = SettingsCapa('OpenPGP');
-		this.canGnuPG = GnuPGUserStore.isSupported();
-		this.canMailvelope = !!window.mailvelope;
-
-		this.allowDraftAutosave = SettingsUserStore.allowDraftAutosave;
-
-		this.allowDraftAutosave.subscribe(value => Remote.saveSetting('AllowDraftAutosave', value))
-	}
-
-	addOpenPgpKey() {
-		showScreenPopup(OpenPgpImportPopupView);
-	}
-
-	generateOpenPgpKey() {
-		showScreenPopup(OpenPgpGeneratePopupView);
-	}
-
-	onBuild() {
-		/**
-		 * Create an iframe to display the Mailvelope keyring settings.
-		 * The iframe will be injected into the container identified by selector.
-		 */
-		window.mailvelope && mailvelope.createSettingsContainer('#mailvelope-settings'/*[, keyring], options*/);
-	}
-}
diff --git a/dev/Settings/User/Security.js b/dev/Settings/User/Security.js
index 58327db2d..798be119b 100644
--- a/dev/Settings/User/Security.js
+++ b/dev/Settings/User/Security.js
@@ -7,7 +7,17 @@ import { AbstractViewSettings } from 'Knoin/AbstractViews';
 
 import { SettingsUserStore } from 'Stores/User/Settings';
 
-export class SecurityUserSettings extends AbstractViewSettings {
+import { GnuPGUserStore } from 'Stores/User/GnuPG';
+import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
+
+import Remote from 'Remote/User/Fetch';
+
+import { showScreenPopup } from 'Knoin/Knoin';
+
+import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport';
+import { OpenPgpGeneratePopupView } from 'View/Popup/OpenPgpGenerate';
+
+export class UserSettingsSecurity extends AbstractViewSettings {
 	constructor() {
 		super();
 
@@ -33,5 +43,35 @@ export class SecurityUserSettings extends AbstractViewSettings {
 		if (this.capaAutoLogout) {
 			this.addSetting('AutoLogout');
 		}
+
+		this.gnupgPublicKeys = GnuPGUserStore.publicKeys;
+		this.gnupgPrivateKeys = GnuPGUserStore.privateKeys;
+
+		this.openpgpkeysPublic = OpenPGPUserStore.publicKeys;
+		this.openpgpkeysPrivate = OpenPGPUserStore.privateKeys;
+
+		this.canOpenPGP = SettingsCapa('OpenPGP');
+		this.canGnuPG = GnuPGUserStore.isSupported();
+		this.canMailvelope = !!window.mailvelope;
+
+		this.allowDraftAutosave = SettingsUserStore.allowDraftAutosave;
+
+		this.allowDraftAutosave.subscribe(value => Remote.saveSetting('AllowDraftAutosave', value))
+	}
+
+	addOpenPgpKey() {
+		showScreenPopup(OpenPgpImportPopupView);
+	}
+
+	generateOpenPgpKey() {
+		showScreenPopup(OpenPgpGeneratePopupView);
+	}
+
+	onBuild() {
+		/**
+		 * Create an iframe to display the Mailvelope keyring settings.
+		 * The iframe will be injected into the container identified by selector.
+		 */
+		window.mailvelope && mailvelope.createSettingsContainer('#mailvelope-settings'/*[, keyring], options*/);
 	}
 }
diff --git a/dev/Settings/User/Themes.js b/dev/Settings/User/Themes.js
index b0b6fada8..5e61f8b97 100644
--- a/dev/Settings/User/Themes.js
+++ b/dev/Settings/User/Themes.js
@@ -20,7 +20,7 @@ addObservablesTo(themeBackground, {
 	error: ''
 });
 
-export class ThemesUserSettings /*extends AbstractViewSettings*/ {
+export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 	constructor() {
 		this.theme = ThemeStore.theme;
 		this.themes = ThemeStore.themes;
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 fd8ecffc9..ff59a618c 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "جهات الإتصال",
 		"LABEL_FOLDERS_NAME": "المجلدات",
 		"LABEL_ACCOUNTS_NAME": "الحسابات",
-		"LABEL_IDENTITIES_NAME": "الهويات",
 		"LABEL_FILTERS_NAME": "عوامل التصفية",
 		"LABEL_SECURITY_NAME": "الأمان",
 		"LABEL_THEMES_NAME": "المظاهر العامة"
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 bbd635f11..07dbf890f 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Контакти",
 		"LABEL_FOLDERS_NAME": "Папки",
 		"LABEL_ACCOUNTS_NAME": "Акаунти",
-		"LABEL_IDENTITIES_NAME": "Идентичности",
 		"LABEL_FILTERS_NAME": "Филтри",
 		"LABEL_SECURITY_NAME": "Сигурност",
 		"LABEL_THEMES_NAME": "Теми"
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
index fb1d90a52..761c6a0db 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Administrační panel"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Základní",
 		"LABEL_LOGIN_NAME": "Login",
 		"LABEL_BRANDING_NAME": "Branding",
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 ba3dae642..e5a4efe0f 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Kontakty",
 		"LABEL_FOLDERS_NAME": "Složky",
 		"LABEL_ACCOUNTS_NAME": "Účty",
-		"LABEL_IDENTITIES_NAME": "Aliasy",
 		"LABEL_FILTERS_NAME": "Filtry",
 		"LABEL_SECURITY_NAME": "Zabezpečení",
 		"LABEL_THEMES_NAME": "Motivy"
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/admin.json b/snappymail/v/0.0.0/app/localization/da-DK/admin.json
index ca8aca1b0..a9ebb2037 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Admin Panel"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Generelt",
 		"LABEL_LOGIN_NAME": "Log ind",
 		"LABEL_BRANDING_NAME": "Branding",
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 f2b339bb3..b4db94f1d 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Kontakter",
 		"LABEL_FOLDERS_NAME": "Mapper",
 		"LABEL_ACCOUNTS_NAME": "Kontoer",
-		"LABEL_IDENTITIES_NAME": "Identiteter",
 		"LABEL_FILTERS_NAME": "Filtre",
 		"LABEL_SECURITY_NAME": "Sikkerhed",
 		"LABEL_THEMES_NAME": "Temaer"
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/admin.json b/snappymail/v/0.0.0/app/localization/de-DE/admin.json
index dde4ebe0f..12d19f652 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Adminpanel"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Allgemein",
 		"LABEL_LOGIN_NAME": "Anmeldung",
 		"LABEL_BRANDING_NAME": "Branding",
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 a2008fc55..92116c2e6 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Kontakte",
 		"LABEL_FOLDERS_NAME": "Ordner",
 		"LABEL_ACCOUNTS_NAME": "Konten",
-		"LABEL_IDENTITIES_NAME": "Identitäten",
 		"LABEL_FILTERS_NAME": "Filter",
 		"LABEL_SECURITY_NAME": "Sicherheit",
 		"LABEL_THEMES_NAME": "Themen"
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 d14bc6800..5f32b403e 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Επαφές",
 		"LABEL_FOLDERS_NAME": "Φάκελοι",
 		"LABEL_ACCOUNTS_NAME": "Λογαρισμοί",
-		"LABEL_IDENTITIES_NAME": "Ταυτότητες",
 		"LABEL_FILTERS_NAME": "Φίλτρα",
 		"LABEL_SECURITY_NAME": "Ασφάλεια",
 		"LABEL_THEMES_NAME": "Θέματα"
diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json
index 0b106cba9..a38377608 100644
--- a/snappymail/v/0.0.0/app/localization/en/admin.json
+++ b/snappymail/v/0.0.0/app/localization/en/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Admin Panel"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "General",
 		"LABEL_LOGIN_NAME": "Login",
 		"LABEL_BRANDING_NAME": "Branding",
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 c7499bfa7..cbb78553c 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Contacts",
 		"LABEL_FOLDERS_NAME": "Folders",
 		"LABEL_ACCOUNTS_NAME": "Accounts",
-		"LABEL_IDENTITIES_NAME": "Identities",
 		"LABEL_FILTERS_NAME": "Filters",
 		"LABEL_SECURITY_NAME": "Security",
 		"LABEL_THEMES_NAME": "Themes"
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/admin.json b/snappymail/v/0.0.0/app/localization/es-ES/admin.json
index 2d2b53f0f..7de9632ae 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/admin.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Panel de Control"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "General",
 		"LABEL_LOGIN_NAME": "Ingresar",
 		"LABEL_BRANDING_NAME": "Personalización",
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 e4e5f963f..6d4762bd1 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Contactos",
 		"LABEL_FOLDERS_NAME": "Carpetas",
 		"LABEL_ACCOUNTS_NAME": "Cuentas",
-		"LABEL_IDENTITIES_NAME": "Identidades",
 		"LABEL_FILTERS_NAME": "Filtros",
 		"LABEL_SECURITY_NAME": "Seguridad",
 		"LABEL_THEMES_NAME": "Temas"
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 3a78776a8..94b9cd75c 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Kontaktid",
 		"LABEL_FOLDERS_NAME": "Kaustad",
 		"LABEL_ACCOUNTS_NAME": "Kontod",
-		"LABEL_IDENTITIES_NAME": "Identiteedid",
 		"LABEL_FILTERS_NAME": "Filtrid",
 		"LABEL_SECURITY_NAME": "Turvalisus",
 		"LABEL_THEMES_NAME": "Teemad"
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
index 86a9d6493..f7c7fc3da 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "صفحه مدیریت"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "عمومی",
 		"LABEL_LOGIN_NAME": "ورود",
 		"LABEL_BRANDING_NAME": "برندسازی",
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 dc4eabefd..a93843339 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "تماس‌ها",
 		"LABEL_FOLDERS_NAME": "پوشه‌ها",
 		"LABEL_ACCOUNTS_NAME": "حساب‌های کاربری",
-		"LABEL_IDENTITIES_NAME": "شناسه‌ها",
 		"LABEL_FILTERS_NAME": "فیلترها",
 		"LABEL_SECURITY_NAME": "امنیت",
 		"LABEL_THEMES_NAME": "پوسته‌ها"
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
index a651d443b..542056170 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Halintapaneli"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Yleiset",
 		"LABEL_LOGIN_NAME": "Kirjautuminen",
 		"LABEL_BRANDING_NAME": "Brändäys",
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 d64d65696..cdefdfcfa 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Yhteystiedot",
 		"LABEL_FOLDERS_NAME": "kansiot",
 		"LABEL_ACCOUNTS_NAME": "Tilit",
-		"LABEL_IDENTITIES_NAME": "Identiteetit",
 		"LABEL_FILTERS_NAME": "Suodattimet",
 		"LABEL_SECURITY_NAME": "Turvallisuus",
 		"LABEL_THEMES_NAME": "Teemat"
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
index ef27ec820..4531f80ad 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Panneau d'Administration"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Général",
 		"LABEL_LOGIN_NAME": "Identifiant",
 		"LABEL_BRANDING_NAME": "Logo & Marque",
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 1e2bb98d5..859988bca 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Contacts",
 		"LABEL_FOLDERS_NAME": "Dossiers",
 		"LABEL_ACCOUNTS_NAME": "Comptes",
-		"LABEL_IDENTITIES_NAME": "Identités",
 		"LABEL_FILTERS_NAME": "Filtres",
 		"LABEL_SECURITY_NAME": "Sécurité",
 		"LABEL_THEMES_NAME": "Thèmes"
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
index cb02c0ae9..4ddd575e1 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Adminisztrációs felület"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Általános",
 		"LABEL_LOGIN_NAME": "Belépés",
 		"LABEL_BRANDING_NAME": "Arculat",
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 afb4cbcd7..ce055910f 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Névjegyek",
 		"LABEL_FOLDERS_NAME": "Mappák",
 		"LABEL_ACCOUNTS_NAME": "Fiókok",
-		"LABEL_IDENTITIES_NAME": "Identitások",
 		"LABEL_FILTERS_NAME": "Szűrők",
 		"LABEL_SECURITY_NAME": "Biztonság",
 		"LABEL_THEMES_NAME": "Témák"
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/admin.json b/snappymail/v/0.0.0/app/localization/id-ID/admin.json
index ff1f513c1..604dfb9e7 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/admin.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Panel Admin"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Umum",
 		"LABEL_LOGIN_NAME": "Login",
 		"LABEL_BRANDING_NAME": "Branding",
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 16d82d13d..d189a87ad 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Kontak",
 		"LABEL_FOLDERS_NAME": "Folder",
 		"LABEL_ACCOUNTS_NAME": "Akun",
-		"LABEL_IDENTITIES_NAME": "Identitas",
 		"LABEL_FILTERS_NAME": "Filter",
 		"LABEL_SECURITY_NAME": "Keamanan",
 		"LABEL_THEMES_NAME": "Tema"
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 64b98e41f..167927a12 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Tengiliðir",
 		"LABEL_FOLDERS_NAME": "Möppur",
 		"LABEL_ACCOUNTS_NAME": "Aðgangar",
-		"LABEL_IDENTITIES_NAME": "Auðkenni",
 		"LABEL_FILTERS_NAME": "Síur",
 		"LABEL_SECURITY_NAME": "Öryggi",
 		"LABEL_THEMES_NAME": "Þemu"
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/admin.json b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
index c3dbaf4b8..6bc5e1708 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Amministrazione"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Generali",
 		"LABEL_LOGIN_NAME": "Accesso",
 		"LABEL_BRANDING_NAME": "Personalizzazione",
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 a8cd1e7ba..52a36c838 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Contatti",
 		"LABEL_FOLDERS_NAME": "Cartelle",
 		"LABEL_ACCOUNTS_NAME": "Account",
-		"LABEL_IDENTITIES_NAME": "Identità",
 		"LABEL_FILTERS_NAME": "Filtri",
 		"LABEL_SECURITY_NAME": "Sicurezza",
 		"LABEL_THEMES_NAME": "Temi"
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
index 5eb6247c4..dad8d1af8 100644
--- a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "管理画面"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "全般",
 		"LABEL_LOGIN_NAME": "ログイン",
 		"LABEL_BRANDING_NAME": "ブランド化",
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 f296a9a4b..72e527d52 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "連絡先",
 		"LABEL_FOLDERS_NAME": "フォルダー",
 		"LABEL_ACCOUNTS_NAME": "アカウント",
-		"LABEL_IDENTITIES_NAME": "表示名",
 		"LABEL_FILTERS_NAME": "フィルター",
 		"LABEL_SECURITY_NAME": "セキュリティ",
 		"LABEL_THEMES_NAME": "テーマ"
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 dc177a072..d2beb8d03 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "연락처",
 		"LABEL_FOLDERS_NAME": "폴더",
 		"LABEL_ACCOUNTS_NAME": "계정",
-		"LABEL_IDENTITIES_NAME": "신원",
 		"LABEL_FILTERS_NAME": "필터",
 		"LABEL_SECURITY_NAME": "보안",
 		"LABEL_THEMES_NAME": "테마"
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
index 13342d07c..058247497 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Administratoriaus valdymo skydas"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Pagrindiniai",
 		"LABEL_LOGIN_NAME": "Prisijungimo vardas",
 		"LABEL_BRANDING_NAME": "Įdaguoti",
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 59ed329ba..674ddd19b 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Kontaktai",
 		"LABEL_FOLDERS_NAME": "Katalogai",
 		"LABEL_ACCOUNTS_NAME": "Paskyros",
-		"LABEL_IDENTITIES_NAME": "Tapatybės",
 		"LABEL_FILTERS_NAME": "Filtrai",
 		"LABEL_SECURITY_NAME": "Sauga",
 		"LABEL_THEMES_NAME": "Temos"
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 0bc9ab835..531b54100 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Contacts",
 		"LABEL_FOLDERS_NAME": "Mapes",
 		"LABEL_ACCOUNTS_NAME": "Konti",
-		"LABEL_IDENTITIES_NAME": "Identities",
 		"LABEL_FILTERS_NAME": "Filters",
 		"LABEL_SECURITY_NAME": "Security",
 		"LABEL_THEMES_NAME": "Tēmas"
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
index 86be94770..3a5c789ee 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Admin-panel"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Generelt",
 		"LABEL_LOGIN_NAME": "Brukernavn",
 		"LABEL_BRANDING_NAME": "Utforming",
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 cd4600922..085b9891b 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Kontakter",
 		"LABEL_FOLDERS_NAME": "Mapper",
 		"LABEL_ACCOUNTS_NAME": "Kontoer",
-		"LABEL_IDENTITIES_NAME": "Identiteter",
 		"LABEL_FILTERS_NAME": "Filters",
 		"LABEL_SECURITY_NAME": "Sikkerhet",
 		"LABEL_THEMES_NAME": "Tema"
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
index c6afbe9aa..4a4a9a5bb 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Beheer paneel"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Algemeen",
 		"LABEL_LOGIN_NAME": "Inlogscherm",
 		"LABEL_BRANDING_NAME": "Huisstijl",
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 7db1d8952..65965962a 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Contactpersonen",
 		"LABEL_FOLDERS_NAME": "Mappen",
 		"LABEL_ACCOUNTS_NAME": "Accounts",
-		"LABEL_IDENTITIES_NAME": "Identiteiten",
 		"LABEL_FILTERS_NAME": "Filters",
 		"LABEL_SECURITY_NAME": "Beveiliging",
 		"LABEL_THEMES_NAME": "Thema's"
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
index c356fbb99..b8e8d34e2 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Panel administracyjny"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Ogólne",
 		"LABEL_LOGIN_NAME": "Login",
 		"LABEL_BRANDING_NAME": "Personalizacja",
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 95ce06bac..b0c60d5f4 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Kontakty",
 		"LABEL_FOLDERS_NAME": "Foldery",
 		"LABEL_ACCOUNTS_NAME": "Konta",
-		"LABEL_IDENTITIES_NAME": "Tożsamości",
 		"LABEL_FILTERS_NAME": "Filtry",
 		"LABEL_SECURITY_NAME": "Bezpieczeństwo",
 		"LABEL_THEMES_NAME": "Motywy"
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
index 271ac3d31..7b9a7793f 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Painel Administrativo"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Geral",
 		"LABEL_LOGIN_NAME": "Login",
 		"LABEL_BRANDING_NAME": "Personalizar",
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 0c8b7bee1..9ee86eac1 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Contatos",
 		"LABEL_FOLDERS_NAME": "Pastas",
 		"LABEL_ACCOUNTS_NAME": "Contas",
-		"LABEL_IDENTITIES_NAME": "Identidades",
 		"LABEL_FILTERS_NAME": "Filtros",
 		"LABEL_SECURITY_NAME": "Segurança",
 		"LABEL_THEMES_NAME": "Temas"
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 69a8543dd..e9d916dd3 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Contactos",
 		"LABEL_FOLDERS_NAME": "Pastas",
 		"LABEL_ACCOUNTS_NAME": "Contas",
-		"LABEL_IDENTITIES_NAME": "Identidades",
 		"LABEL_FILTERS_NAME": "Filtros",
 		"LABEL_SECURITY_NAME": "Segurança",
 		"LABEL_THEMES_NAME": "Temas"
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 7fc0d3482..17306313e 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Contacte",
 		"LABEL_FOLDERS_NAME": "Dosare",
 		"LABEL_ACCOUNTS_NAME": "Conturi",
-		"LABEL_IDENTITIES_NAME": "Profiluri",
 		"LABEL_FILTERS_NAME": "Filters",
 		"LABEL_SECURITY_NAME": "Security",
 		"LABEL_THEMES_NAME": "Subiecte"
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
index 627710430..54e421ae6 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Админка"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Основные",
 		"LABEL_LOGIN_NAME": "Логин",
 		"LABEL_BRANDING_NAME": "Брендинг",
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 78f7a25b9..4d9f7c8e3 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Контакты",
 		"LABEL_FOLDERS_NAME": "Папки",
 		"LABEL_ACCOUNTS_NAME": "Аккаунты",
-		"LABEL_IDENTITIES_NAME": "Профили",
 		"LABEL_FILTERS_NAME": "Фильтры",
 		"LABEL_SECURITY_NAME": "Безопасность",
 		"LABEL_THEMES_NAME": "Темы"
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
index 10062a98e..e3916be5d 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Admin Panel"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Všeobecné",
 		"LABEL_LOGIN_NAME": "Používateľské meno",
 		"LABEL_BRANDING_NAME": "Branding",
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 78f520de2..4534e5ffa 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Kontakty",
 		"LABEL_FOLDERS_NAME": "Priečinky",
 		"LABEL_ACCOUNTS_NAME": "Účty",
-		"LABEL_IDENTITIES_NAME": "Identity",
 		"LABEL_FILTERS_NAME": "Filters",
 		"LABEL_SECURITY_NAME": "Zabezpečenie",
 		"LABEL_THEMES_NAME": "Motívy"
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
index f9fcb7248..1039d9671 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Administracijska plošča"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Splošno",
 		"LABEL_LOGIN_NAME": "Prijava",
 		"LABEL_BRANDING_NAME": "Prilagoditev",
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 060078978..06baa82c3 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Stiki",
 		"LABEL_FOLDERS_NAME": "Mape",
 		"LABEL_ACCOUNTS_NAME": "Računi",
-		"LABEL_IDENTITIES_NAME": "Identitete",
 		"LABEL_FILTERS_NAME": "Filtri",
 		"LABEL_SECURITY_NAME": "Varnost",
 		"LABEL_THEMES_NAME": "Teme"
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
index 51f4144f7..cd9eaf870 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Adminpanel"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "Allmän",
 		"LABEL_LOGIN_NAME": "Logga in",
 		"LABEL_BRANDING_NAME": "Branding",
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 ef2af2b2f..3aeb470ea 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Kontakter",
 		"LABEL_FOLDERS_NAME": "Mappar",
 		"LABEL_ACCOUNTS_NAME": "Konton",
-		"LABEL_IDENTITIES_NAME": "Identiteter",
 		"LABEL_FILTERS_NAME": "Filter",
 		"LABEL_SECURITY_NAME": "Säkerhet",
 		"LABEL_THEMES_NAME": "Teman"
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 76acb5982..62ce83894 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Kişi Listesi",
 		"LABEL_FOLDERS_NAME": "Klasörler",
 		"LABEL_ACCOUNTS_NAME": "Hesaplar",
-		"LABEL_IDENTITIES_NAME": "Kimlikler",
 		"LABEL_FILTERS_NAME": "Filtreler",
 		"LABEL_SECURITY_NAME": "Güvenlik",
 		"LABEL_THEMES_NAME": "Temalar"
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 d62d37607..ab3f76c59 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "Контакти",
 		"LABEL_FOLDERS_NAME": "Теки",
 		"LABEL_ACCOUNTS_NAME": "Акаунти",
-		"LABEL_IDENTITIES_NAME": "Профілі",
 		"LABEL_FILTERS_NAME": "Фильтры",
 		"LABEL_SECURITY_NAME": "Безпека",
 		"LABEL_THEMES_NAME": "Теми"
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
index 84851a45e..56caa14c9 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
@@ -11,7 +11,7 @@
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "控制面板"
 	},
-	"TABS_LABELS": {
+	"SETTINGS_LABELS": {
 		"LABEL_GENERAL_NAME": "常规",
 		"LABEL_LOGIN_NAME": "登录",
 		"LABEL_BRANDING_NAME": "Logo",
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 316f6c97e..41f6fef35 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "联系人",
 		"LABEL_FOLDERS_NAME": "文件夹",
 		"LABEL_ACCOUNTS_NAME": "账户",
-		"LABEL_IDENTITIES_NAME": "身份",
 		"LABEL_FILTERS_NAME": "筛选条件",
 		"LABEL_SECURITY_NAME": "安全",
 		"LABEL_THEMES_NAME": "主题"
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 9d7da4630..39a7d00d3 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
@@ -347,7 +347,6 @@
 		"LABEL_CONTACTS_NAME": "連絡人",
 		"LABEL_FOLDERS_NAME": "資料夾",
 		"LABEL_ACCOUNTS_NAME": "帳戶",
-		"LABEL_IDENTITIES_NAME": "簽名",
 		"LABEL_FILTERS_NAME": "Filters",
 		"LABEL_SECURITY_NAME": "安全",
 		"LABEL_THEMES_NAME": "主題"
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
index 842123746..b56b24597 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
@@ -1,5 +1,5 @@
 <div class="legend">
-	<span data-i18n="TABS_LABELS/LABEL_PACKAGES_NAME"></span>
+	<span data-i18n="SETTINGS_LABELS/LABEL_PACKAGES_NAME"></span>
 	<i class="icon-spinner" style="margin: 5px" data-bind="visible: packages.loading"></i>
 </div>
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
deleted file mode 100644
index c20f948c8..000000000
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<div class="legend">OpenPGP</div>
-<button class="btn" data-bind="click: addOpenPgpKey" data-icon="✚" data-i18n="SETTINGS_OPENPGP/BUTTON_IMPORT_KEY"></button>
-<!-- ko if: canOpenPGP || canGnuPG -->
-&nbsp;&nbsp;
-<button class="btn" data-bind="click: generateOpenPgpKey" data-icon="🔑" data-i18n="SETTINGS_OPENPGP/BUTTON_GENERATE_KEY_PAIR"></button>
-<!-- /ko -->
-
-<br>
-<br>
-<div class="control-group">
-	<div data-bind="component: {
-		name: 'Checkbox',
-		params: {
-			label: 'SETTINGS_OPENPGP/LABEL_ALLOW_DRAFT_AUTOSAVE',
-			value: allowDraftAutosave
-		}
-	}"></div>
-</div>
-<br>
-
-<!-- ko if: canGnuPG -->
-<details>
-<summary class="legend">GnuPG</summary>
-<table class="table table-hover list-table">
-	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PRIVATE">Private keys</th></tr></tbody>
-	<tbody data-bind="foreach: gnupgPrivateKeys, i18nUpdate: gnupgPrivateKeys">
-		<tr>
-			<td data-bind="click: view">
-				<span data-bind="visible: can_sign" class="fontastic">✍</span>
-				<span data-bind="visible: can_decrypt" class="fontastic">🔓</span>
-				<span class="key-id" data-bind="text: id"></span>
-				<!-- ko foreach: emails -->
-				<span class="key-user" data-bind="text: $data"></span>
-				<!-- /ko -->
-			</td>
-			<td>
-				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
-					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
-			</td>
-			<td>
-				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
-			</td>
-		</tr>
-	</tbody>
-	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PUBLIC">Public keys</th></tr></tbody>
-	<tbody data-bind="foreach: gnupgPublicKeys, i18nUpdate: gnupgPublicKeys">
-		<tr>
-			<td data-bind="click: view">
-				<span data-bind="visible: can_verify" class="fontastic">✔</span>
-				<span data-bind="visible: can_encrypt" class="fontastic">🔒</span>
-				<span class="key-id" data-bind="text: id"></span>
-				<!-- ko foreach: emails -->
-				<span class="key-user" data-bind="text: $data"></span>
-				<!-- /ko -->
-			</td>
-			<td>
-				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
-					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
-			</td>
-			<td>
-				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
-			</td>
-		</tr>
-	</tbody>
-</table>
-</details>
-<!-- /ko -->
-
-<!-- ko if: canOpenPGP -->
-<details>
-<summary class="legend">OpenPGP.js</summary>
-<table class="table table-hover list-table">
-	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PRIVATE">Private keys</th></tr></tbody>
-	<tbody data-bind="foreach: openpgpkeysPrivate, i18nUpdate: openpgpkeysPrivate">
-		<tr>
-			<td data-bind="click: view">
-				<span class="fontastic" data-i18n="[title]SETTINGS_OPENPGP/TITLE_PRIVATE">🔒</span>
-				<span class="key-id" data-bind="text: id"></span>
-				<!-- ko foreach: emails -->
-				<span class="key-user" data-bind="text: $data"></span>
-				<!-- /ko -->
-			</td>
-			<td>
-				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
-					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
-			</td>
-			<td>
-				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
-			</td>
-		</tr>
-	</tbody>
-	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PUBLIC">Public keys</th></tr></tbody>
-	<tbody data-bind="foreach: openpgpkeysPublic, i18nUpdate: openpgpkeysPublic">
-		<tr>
-			<td data-bind="click: view">
-				<span class="fontastic" data-i18n="[title]SETTINGS_OPENPGP/TITLE_PUBLIC">🔑</span>
-				<span class="key-id" data-bind="text: id"></span>
-				<!-- ko foreach: emails -->
-				<span class="key-user" data-bind="text: $data"></span>
-				<!-- /ko -->
-			</td>
-			<td>
-				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
-					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
-			</td>
-			<td>
-				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
-			</td>
-		</tr>
-	</tbody>
-</table>
-</details>
-<!-- /ko -->
-
-<details>
-<summary class="legend">Mailvelope</summary>
-<a data-bind="visible: !canMailvelope" href="https://mailvelope.com/en/help" target="_blank" data-i18n="SETTINGS_OPENPGP/GET_MAILVELOPE"></a>
-<div id="mailvelope-settings" style="height:40em" data-bind="visible: canMailvelope"></div>
-</details>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
index a546b0c50..e91cc663c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
@@ -15,3 +15,123 @@
 		}"></div>
 	</div>
 </div>
+
+<div class="legend">OpenPGP</div>
+<button class="btn" data-bind="click: addOpenPgpKey" data-icon="✚" data-i18n="SETTINGS_OPENPGP/BUTTON_IMPORT_KEY"></button>
+<!-- ko if: canOpenPGP || canGnuPG -->
+&nbsp;&nbsp;
+<button class="btn" data-bind="click: generateOpenPgpKey" data-icon="🔑" data-i18n="SETTINGS_OPENPGP/BUTTON_GENERATE_KEY_PAIR"></button>
+<!-- /ko -->
+
+<br>
+<br>
+<div class="control-group">
+	<div data-bind="component: {
+		name: 'Checkbox',
+		params: {
+			label: 'SETTINGS_OPENPGP/LABEL_ALLOW_DRAFT_AUTOSAVE',
+			value: allowDraftAutosave
+		}
+	}"></div>
+</div>
+<br>
+
+<!-- ko if: canGnuPG -->
+<details>
+<summary class="legend">GnuPG</summary>
+<table class="table table-hover list-table">
+	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PRIVATE">Private keys</th></tr></tbody>
+	<tbody data-bind="foreach: gnupgPrivateKeys, i18nUpdate: gnupgPrivateKeys">
+		<tr>
+			<td data-bind="click: view">
+				<span data-bind="visible: can_sign" class="fontastic">✍</span>
+				<span data-bind="visible: can_decrypt" class="fontastic">🔓</span>
+				<span class="key-id" data-bind="text: id"></span>
+				<!-- ko foreach: emails -->
+				<span class="key-user" data-bind="text: $data"></span>
+				<!-- /ko -->
+			</td>
+			<td>
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
+					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
+			</td>
+			<td>
+				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
+			</td>
+		</tr>
+	</tbody>
+	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PUBLIC">Public keys</th></tr></tbody>
+	<tbody data-bind="foreach: gnupgPublicKeys, i18nUpdate: gnupgPublicKeys">
+		<tr>
+			<td data-bind="click: view">
+				<span data-bind="visible: can_verify" class="fontastic">✔</span>
+				<span data-bind="visible: can_encrypt" class="fontastic">🔒</span>
+				<span class="key-id" data-bind="text: id"></span>
+				<!-- ko foreach: emails -->
+				<span class="key-user" data-bind="text: $data"></span>
+				<!-- /ko -->
+			</td>
+			<td>
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
+					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
+			</td>
+			<td>
+				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
+			</td>
+		</tr>
+	</tbody>
+</table>
+</details>
+<!-- /ko -->
+
+<!-- ko if: canOpenPGP -->
+<details>
+<summary class="legend">OpenPGP.js</summary>
+<table class="table table-hover list-table">
+	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PRIVATE">Private keys</th></tr></tbody>
+	<tbody data-bind="foreach: openpgpkeysPrivate, i18nUpdate: openpgpkeysPrivate">
+		<tr>
+			<td data-bind="click: view">
+				<span class="fontastic" data-i18n="[title]SETTINGS_OPENPGP/TITLE_PRIVATE">🔒</span>
+				<span class="key-id" data-bind="text: id"></span>
+				<!-- ko foreach: emails -->
+				<span class="key-user" data-bind="text: $data"></span>
+				<!-- /ko -->
+			</td>
+			<td>
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
+					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
+			</td>
+			<td>
+				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
+			</td>
+		</tr>
+	</tbody>
+	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PUBLIC">Public keys</th></tr></tbody>
+	<tbody data-bind="foreach: openpgpkeysPublic, i18nUpdate: openpgpkeysPublic">
+		<tr>
+			<td data-bind="click: view">
+				<span class="fontastic" data-i18n="[title]SETTINGS_OPENPGP/TITLE_PUBLIC">🔑</span>
+				<span class="key-id" data-bind="text: id"></span>
+				<!-- ko foreach: emails -->
+				<span class="key-user" data-bind="text: $data"></span>
+				<!-- /ko -->
+			</td>
+			<td>
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
+					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
+			</td>
+			<td>
+				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
+			</td>
+		</tr>
+	</tbody>
+</table>
+</details>
+<!-- /ko -->
+
+<details>
+<summary class="legend">Mailvelope</summary>
+<a data-bind="visible: !canMailvelope" href="https://mailvelope.com/en/help" target="_blank" data-i18n="SETTINGS_OPENPGP/GET_MAILVELOPE"></a>
+<div id="mailvelope-settings" style="height:40em" data-bind="visible: canMailvelope"></div>
+</details>