diff --git a/dev/Knoin/AbstractViews.js b/dev/Knoin/AbstractViews.js
index ba3afa71b..c724fd5e9 100644
--- a/dev/Knoin/AbstractViews.js
+++ b/dev/Knoin/AbstractViews.js
@@ -62,7 +62,7 @@ export class AbstractViewPopup extends AbstractView
 		this.modalVisible = ko.observable(false).extend({ rateLimit: 0 });
 		shortcuts.add('escape,close', '', name, () => {
 			if (this.modalVisible() && false !== this.onClose()) {
-				this.closeCommand();
+				this.close();
 				return false;
 			}
 			return true;
@@ -80,7 +80,7 @@ export class AbstractViewPopup extends AbstractView
 	onHide() {}       // Happens before animation transitionend
 	afterHide() {}    // Happens after  animation transitionend
 
-	closeCommand() {}
+	close() {}
 */
 }
 
diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js
index 2d47888c0..e47b71f96 100644
--- a/dev/Knoin/Knoin.js
+++ b/dev/Knoin/Knoin.js
@@ -30,7 +30,9 @@ const
 	buildViewModel = (ViewModelClass, vmScreen) => {
 		if (ViewModelClass && !ViewModelClass.__builded) {
 			let vmDom = null;
-			const vm = new ViewModelClass(vmScreen),
+			const
+				vm = new ViewModelClass(vmScreen),
+				id = vm.viewModelTemplateID,
 				position = vm.viewType || '',
 				dialog = ViewType.Popup === position,
 				vmPlace = position ? doc.getElementById('rl-' + position.toLowerCase()) : null;
@@ -39,16 +41,16 @@ const
 			ViewModelClass.__vm = vm;
 
 			if (vmPlace) {
-				vmDom = dialog
-					? Element.fromHTML('<dialog id="V-'+ vm.viewModelTemplateID + '"></dialog>')
-					: Element.fromHTML('<div id="V-'+ vm.viewModelTemplateID + '" hidden=""></div>');
+				vmDom = Element.fromHTML(dialog
+					? '<dialog id="V-'+ id + '"></dialog>'
+					: '<div id="V-'+ id + '" hidden=""></div>');
 				vmPlace.append(vmDom);
 
 				vm.viewModelDom = vmDom;
 				ViewModelClass.__dom = vmDom;
 
 				if (ViewType.Popup === position) {
-					vm.closeCommand = () => hideScreenPopup(ViewModelClass);
+					vm.close = () => hideScreenPopup(ViewModelClass);
 
 					// Firefox / Safari HTMLDialogElement not defined
 					if (!vmDom.showModal) {
@@ -110,7 +112,7 @@ const
 					vmDom,
 					{
 						i18nInit: true,
-						template: () => ({ name: vm.viewModelTemplateID })
+						template: () => ({ name: id })
 					},
 					vm
 				);
@@ -172,7 +174,7 @@ const
 
 		// Close all popups
 		for (let vm of visiblePopups) {
-			false === vm.onClose() || vm.closeCommand();
+			false === vm.onClose() || vm.close();
 		}
 
 		if (screenName) {
diff --git a/dev/View/Popup/Account.js b/dev/View/Popup/Account.js
index 2b25c2aeb..71e8ab12e 100644
--- a/dev/View/Popup/Account.js
+++ b/dev/View/Popup/Account.js
@@ -41,7 +41,7 @@ export class AccountPopupView extends AbstractViewPopup {
 							this.submitErrorAdditional((data && data.ErrorMessageAdditional) || '');
 						} else {
 							rl.app.accountsAndIdentities();
-							this.closeCommand();
+							this.close();
 						}
 					}, {
 						Email: email,
diff --git a/dev/View/Popup/AdvancedSearch.js b/dev/View/Popup/AdvancedSearch.js
index 2b5d46e2f..b06ba0544 100644
--- a/dev/View/Popup/AdvancedSearch.js
+++ b/dev/View/Popup/AdvancedSearch.js
@@ -57,7 +57,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
 			MessagelistUserStore.mainSearch(search);
 		}
 
-		this.closeCommand();
+		this.close();
 	}
 
 	parseSearchStringValue(search) {
diff --git a/dev/View/Popup/Ask.js b/dev/View/Popup/Ask.js
index 80a79417c..ae1f8388e 100644
--- a/dev/View/Popup/Ask.js
+++ b/dev/View/Popup/Ask.js
@@ -22,13 +22,13 @@ export class AskPopupView extends AbstractViewPopup {
 	}
 
 	yesClick() {
-		this.closeCommand();
+		this.close();
 
 		isFunction(this.fYesAction) && this.fYesAction();
 	}
 
 	noClick() {
-		this.closeCommand();
+		this.close();
 
 		isFunction(this.fNoAction) && this.fNoAction();
 	}
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 30f530dd4..40deeb578 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -544,7 +544,7 @@ export class ComposePopupView extends AbstractViewPopup {
 										|| getNotification(Notification.CantSendMessage));
 								}
 							} else {
-								this.closeCommand();
+								this.close();
 							}
 							setFolderHash(this.draftsFolder(), '');
 							setFolderHash(sSentFolder, '');
@@ -633,7 +633,7 @@ export class ComposePopupView extends AbstractViewPopup {
 					aUidForRemove = [this.draftUid()];
 				messagesDeleteHelper(sFromFolderFullName, aUidForRemove);
 				MessagelistUserStore.removeMessagesFromList(sFromFolderFullName, aUidForRemove);
-				this.closeCommand();
+				this.close();
 			}
 		]);
 	}
@@ -1183,11 +1183,11 @@ export class ComposePopupView extends AbstractViewPopup {
 	tryToClosePopup() {
 		if (AskPopupView.hidden()) {
 			if (this.bSkipNextHide || (this.isEmptyForm() && !this.draftUid())) {
-				this.closeCommand();
+				this.close();
 			} else {
 				showScreenPopup(AskPopupView, [
 					i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'),
-					() => this.closeCommand()
+					() => this.close()
 				]);
 			}
 		}
diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js
index c6b2f8f01..75855b6d5 100644
--- a/dev/View/Popup/Contacts.js
+++ b/dev/View/Popup/Contacts.js
@@ -136,7 +136,7 @@ export class ContactsPopupView extends AbstractViewPopup {
 		});
 
 		decorateKoCommands(this, {
-//			closeCommand: self => !self.watchDirty(),
+//			close: self => !self.watchDirty(),
 			deleteCommand: self => 0 < self.contactsCheckedOrSelected().length,
 			newMessageCommand: self => 0 < self.contactsCheckedOrSelected().length,
 			saveCommand: self => !self.viewSaving() && !self.viewReadOnly()
@@ -182,7 +182,7 @@ export class ContactsPopupView extends AbstractViewPopup {
 		if (arrayLength(aE)) {
 			this.bBackToCompose = false;
 
-			this.closeCommand();
+			this.close();
 
 			switch (this.sLastComposeFocusedField) {
 				case 'cc':
@@ -500,7 +500,7 @@ export class ContactsPopupView extends AbstractViewPopup {
 		if (this.watchDirty() && AskPopupView.hidden()) {
 			showScreenPopup(AskPopupView, [
 				i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'),
-				() => this.closeCommand()
+				() => this.close()
 			]);
 			return false;
 		}
diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js
index f203a4072..dbe07bc03 100644
--- a/dev/View/Popup/Domain.js
+++ b/dev/View/Popup/Domain.js
@@ -220,7 +220,7 @@ export class DomainPopupView extends AbstractViewPopup {
 			this.savingError(getNotification(iError));
 		} else {
 			DomainAdminStore.fetch();
-			this.closeCommand();
+			this.close();
 		}
 	}
 
diff --git a/dev/View/Popup/DomainAlias.js b/dev/View/Popup/DomainAlias.js
index 7c13fc719..f6952d3a3 100644
--- a/dev/View/Popup/DomainAlias.js
+++ b/dev/View/Popup/DomainAlias.js
@@ -42,7 +42,7 @@ export class DomainAliasPopupView extends AbstractViewPopup {
 					this.savingError(getNotification(iError));
 				} else {
 					DomainAdminStore.fetch();
-					this.closeCommand();
+					this.close();
 				}
 			}, {
 				Name: this.name(),
diff --git a/dev/View/Popup/Filter.js b/dev/View/Popup/Filter.js
index 5b73bca9a..e77639987 100644
--- a/dev/View/Popup/Filter.js
+++ b/dev/View/Popup/Filter.js
@@ -51,7 +51,7 @@ export class FilterPopupView extends AbstractViewPopup {
 
 		if (this.filter().verify()) {
 			this.fTrueCallback();
-			this.closeCommand();
+			this.close();
 		}
 	}
 
diff --git a/dev/View/Popup/FolderClear.js b/dev/View/Popup/FolderClear.js
index cdd6af4cf..388b0a0d6 100644
--- a/dev/View/Popup/FolderClear.js
+++ b/dev/View/Popup/FolderClear.js
@@ -54,7 +54,7 @@ export class FolderClearPopupView extends AbstractViewPopup {
 					this.clearingError(getNotification(iError));
 				} else {
 					MessagelistUserStore.reload(true);
-					this.closeCommand();
+					this.close();
 				}
 			}, {
 				Folder: folderToClear.fullName
diff --git a/dev/View/Popup/FolderCreate.js b/dev/View/Popup/FolderCreate.js
index 324e59166..a7da49fbd 100644
--- a/dev/View/Popup/FolderCreate.js
+++ b/dev/View/Popup/FolderCreate.js
@@ -75,7 +75,7 @@ export class FolderCreatePopupView extends AbstractViewPopup {
 					}
 				);
 
-			this.closeCommand();
+			this.close();
 		}
 	}
 
diff --git a/dev/View/Popup/Identity.js b/dev/View/Popup/Identity.js
index d10e3bb4b..dcdbde8bc 100644
--- a/dev/View/Popup/Identity.js
+++ b/dev/View/Popup/Identity.js
@@ -97,7 +97,7 @@ export class IdentityPopupView extends AbstractViewPopup {
 						this.submitError(getNotification(iError));
 					} else {
 						rl.app.accountsAndIdentities();
-						this.closeCommand();
+						this.close();
 					}
 				}, {
 					Id: this.id,
diff --git a/dev/View/Popup/Languages.js b/dev/View/Popup/Languages.js
index 0d9ff3f7c..483203d5c 100644
--- a/dev/View/Popup/Languages.js
+++ b/dev/View/Popup/Languages.js
@@ -52,6 +52,6 @@ export class LanguagesPopupView extends AbstractViewPopup {
 
 	changeLanguage(lang) {
 		this.fLang && this.fLang(lang);
-		this.closeCommand();
+		this.close();
 	}
 }
diff --git a/dev/View/Popup/OpenPgpGenerate.js b/dev/View/Popup/OpenPgpGenerate.js
index 3845b8b33..227730202 100644
--- a/dev/View/Popup/OpenPgpGenerate.js
+++ b/dev/View/Popup/OpenPgpGenerate.js
@@ -70,7 +70,7 @@ export class OpenPgpGeneratePopupView extends AbstractViewPopup {
 			if (keyPair) {
 				const fn = () => {
 					this.submitRequest(false);
-					this.closeCommand();
+					this.close();
 				};
 
 				OpenPGPUserStore.storeKeyPair(keyPair);
diff --git a/dev/View/Popup/OpenPgpImport.js b/dev/View/Popup/OpenPgpImport.js
index 8d92f8081..e9fb4d195 100644
--- a/dev/View/Popup/OpenPgpImport.js
+++ b/dev/View/Popup/OpenPgpImport.js
@@ -63,7 +63,7 @@ export class OpenPgpImportPopupView extends AbstractViewPopup {
 			return;
 		}
 
-		this.closeCommand();
+		this.close();
 	}
 
 	onShow() {
diff --git a/dev/View/Popup/Plugin.js b/dev/View/Popup/Plugin.js
index 43ae30d02..ef4550ff1 100644
--- a/dev/View/Popup/Plugin.js
+++ b/dev/View/Popup/Plugin.js
@@ -61,7 +61,7 @@ export class PluginPopupView extends AbstractViewPopup {
 		Remote.request('AdminPluginSettingsUpdate',
 			iError => iError
 				? this.saveError(getNotification(iError))
-				: this.closeCommand(),
+				: this.close(),
 			oConfig);
 	}
 
@@ -99,7 +99,7 @@ export class PluginPopupView extends AbstractViewPopup {
 		if (AskPopupView.hidden()) {
 			showScreenPopup(AskPopupView, [
 				i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'),
-				() => this.closeCommand()
+				() => this.close()
 			]);
 		}
 		return false;
diff --git a/plugins/README.md b/plugins/README.md
index 77dc6f107..a8e78ba73 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -28,7 +28,7 @@ class PluginPopupView extends rl.pluginPopupView
 	afterShow() {}
 
 	// Happens when user hits Escape or Close key
-	// return false to prevent closing, use closeCommand() manually
+	// return false to prevent closing, use close() manually
 	onClose() {}
 	// Happens before animation transitionend
 	onHide() {}
diff --git a/plugins/two-factor-auth/index.php b/plugins/two-factor-auth/index.php
index 810d3fe02..15590ceb3 100644
--- a/plugins/two-factor-auth/index.php
+++ b/plugins/two-factor-auth/index.php
@@ -7,9 +7,9 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'Two Factor Authentication',
-		VERSION  = '2.13',
+		VERSION  = '2.13.2',
 		RELEASE  = '2022-02-28',
-		REQUIRED = '2.13.0',
+		REQUIRED = '2.13.2',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'Provides support for TOTP 2FA';
 
diff --git a/plugins/two-factor-auth/templates/PopupsTwoFactorAuthTest.html b/plugins/two-factor-auth/templates/PopupsTwoFactorAuthTest.html
index 01b3389d0..556a324ef 100644
--- a/plugins/two-factor-auth/templates/PopupsTwoFactorAuthTest.html
+++ b/plugins/two-factor-auth/templates/PopupsTwoFactorAuthTest.html
@@ -1,5 +1,5 @@
 <header>
-	<a class="close" href="#" data-bind="command: closeCommand">×</a>
+	<a class="close" href="#" data-bind="click: close">×</a>
 	<h3 data-i18n="POPUPS_TWO_FACTOR_TEST/TITLE_TEST_CODE"></h3>
 </header>
 <div class="modal-body form-horizontal">
diff --git a/plugins/two-factor-auth/templates/TwoFactorAuthSettings.html b/plugins/two-factor-auth/templates/TwoFactorAuthSettings.html
index 87a3875ce..5e8a3e943 100644
--- a/plugins/two-factor-auth/templates/TwoFactorAuthSettings.html
+++ b/plugins/two-factor-auth/templates/TwoFactorAuthSettings.html
@@ -73,7 +73,7 @@
 		<span data-i18n="POPUPS_TWO_FACTOR_CFG/BUTTON_ACTIVATE"></span>
 	</a>
 <!--
-	<a class="btn" data-bind="command: closeCommand, visible: viewEnable()">
+	<a class="btn" data-bind="click: close, visible: viewEnable()">
 		<i class="icon-ok" ></i>
 		<span data-i18n="GLOBAL/DONE"></span>
 	</a>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index a57621d50..ec24f31bd 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-bind="text: headerText"></h3>
 </header>
 <div class="modal-body">
@@ -189,7 +189,7 @@
 		<i class="fontastic" data-bind="css: {'icon-spinner': testing()}">ℹ</i>
 		<span data-i18n="POPUPS_DOMAIN/BUTTON_TEST"></span>
 	</a>
-	<a class="btn buttonClose" data-bind="command: closeCommand" data-icon="✖" data-i18n="POPUPS_DOMAIN/BUTTON_CLOSE"></a>
+	<a class="btn buttonClose" data-bind="click: close" data-icon="✖" data-i18n="POPUPS_DOMAIN/BUTTON_CLOSE"></a>
 	<a class="btn" data-bind="command: createOrAddCommand, visible: edit()">
 		<i class="fontastic" data-bind="css: {'icon-spinner': saving()}">✔</i>
 		<span data-i18n="POPUPS_DOMAIN/BUTTON_UPDATE"></span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html
index ef69a5457..384e114dd 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="POPUPS_DOMAIN_ALIAS/TITLE_ADD_DOMAIN_ALIAS"></h3>
 </header>
 <div class="modal-body">
@@ -31,7 +31,7 @@
 	</div>
 </div>
 <footer>
-	<a class="btn buttonClose" data-bind="command: closeCommand" data-icon="✖" data-i18n="POPUPS_DOMAIN_ALIAS/BUTTON_CLOSE"></a>
+	<a class="btn buttonClose" data-bind="click: close" data-icon="✖" data-i18n="POPUPS_DOMAIN_ALIAS/BUTTON_CLOSE"></a>
 	<a class="btn" data-bind="command: createCommand">
 		<i class="fontastic" data-bind="visible: !saving()">✚</i>
 		<i class="icon-spinner" data-bind="visible: saving"></i>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
index 6601ef2bf..c993dd3b9 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h4>
 		<span data-i18n="POPUPS_PLUGIN/TITLE_PLUGIN"></span>
 		&nbsp;
@@ -30,6 +30,6 @@
 	</form>
 </div>
 <footer>
-	<a class="btn buttonClose" data-bind="command: closeCommand" data-icon="✖" data-i18n="POPUPS_PLUGIN/BUTTON_CLOSE"></a>
+	<a class="btn buttonClose" data-bind="click: close" data-icon="✖" data-i18n="POPUPS_PLUGIN/BUTTON_CLOSE"></a>
 	<a class="btn" data-bind="command: saveCommand, visible: hasConfiguration" data-icon="✔" data-i18n="GLOBAL/SAVE"></a>
 </footer>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
index 4a5151ed4..0df6a301b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="POPUPS_LANGUAGES/TITLE_LANGUAGES"></h3>
 </header>
 <div class="modal-body" style="min-height: 150px;" data-bind="foreach: languages">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
index 69d1250f8..00edf9e5c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3>
 		<span data-bind="visible: isNew" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_ADD_ACCOUNT"></span>
 		<span data-bind="visible: !isNew()" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_UPDATE_ACCOUNT"></span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
index fd552863a..4a8dd039e 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="SEARCH/TITLE_ADV"></h3>
 </header>
 <form id="advancedsearchform" class="modal-body form-horizontal" action="#/" autocomplete="off" data-bind="submit: submitForm">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
index 136807768..e69bd2678 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
@@ -1,6 +1,6 @@
 <header class="b-header-toolbar g-ui-user-select-none">
 
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 
 	<div class="btn-toolbar">
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
index 6b8454b8d..0427046ac 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3>
 		<span data-i18n="POPUPS_FILTER/TITLE_CREATE_FILTER" data-bind="visible: isNew"></span>
 		<span data-i18n="POPUPS_FILTER/TITLE_EDIT_FILTER" data-bind="visible: !isNew()"></span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
index a5f92430b..d5f23ee4a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3>
 		<span data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEAR_FOLDER" data-bind="visible: !clearingProcess()"></span>
 		<span data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEARING_PROCESS" data-bind="visible: clearingProcess"></span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
index ce21f34ac..351b4e0bd 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER"></h3>
 </header>
 <form id="createfolderform" class="modal-body form-horizontal" autocomplete="off" data-bind="submit: submitForm">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
index 0559ad791..34a09d9b6 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="POPUPS_SYSTEM_FOLDERS/TITLE_SYSTEM_FOLDERS"></h3>
 </header>
 <div class="modal-body">
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 2f975a804..19e717340 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
@@ -1,5 +1,5 @@
 <header class="g-ui-user-select-none">
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3>
 		<span data-bind="visible: !edit()" data-i18n="POPUPS_IDENTITY/TITLE_ADD_IDENTITY"></span>
 		<span data-bind="visible: edit" data-i18n="POPUPS_IDENTITY/TITLE_UPDATE_IDENTITY"></span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsKeyboardShortcutsHelp.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsKeyboardShortcutsHelp.html
index 1cf96f7ae..83536a2ab 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsKeyboardShortcutsHelp.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsKeyboardShortcutsHelp.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="SHORTCUTS_HELP/LEGEND_SHORTCUTS_HELP"></h3>
 </header>
 <div class="modal-body">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html
index 19a7ca7e4..79a97d962 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="OPENPGP/POPUP_GENERATE_TITLE"></h3>
 </header>
 <form id="openpgp-generate" class="modal-body form-horizontal" autocomplete="off" data-bind="submit: submitForm">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html
index fc899bdae..bb06dc592 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html
@@ -1,5 +1,5 @@
 <header>
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="OPENPGP/POPUP_IMPORT_TITLE"></h3>
 </header>
 <form id="openpgp-import" class="modal-body form-horizontal" autocomplete="off" data-bind="submit: submitForm">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpKey.html
index 73ee2d437..1445aad25 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpKey.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpKey.html
@@ -1,5 +1,5 @@
 <header class="g-ui-user-select-none">
-	<a href="#" class="close" data-bind="command: closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="OPENPGP/POPUP_VIEW_TITLE"></h3>
 </header>
 <div class="modal-body">
@@ -10,6 +10,6 @@
 	</div>
 </div>
 <footer>
-	<a class="btn buttonClose" data-bind="command: closeCommand" data-icon="✖" data-i18n="GLOBAL/CLOSE"></a>
+	<a class="btn buttonClose" data-bind="click: close" data-icon="✖" data-i18n="GLOBAL/CLOSE"></a>
 	<a class="btn buttonClose" data-bind="click: selectKey" data-icon="🔑" data-i18n="OPENPGP/POPUP_VIEW_BUTTON"></a>
 </footer>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
index f4d16dc3b..7ae13cbdf 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
@@ -1,6 +1,6 @@
 <!-- ko with: script -->
 <header>
-	<a href="#" class="close" data-bind="command: $root.closeCommand">×</a>
+	<a href="#" class="close" data-bind="click: $root.close">×</a>
 	<h3>
 		<span data-i18n="POPUPS_SIEVE_SCRIPT/TITLE_CREATE" data-bind="visible: !exists()"></span>
 		<span data-i18n="POPUPS_SIEVE_SCRIPT/TITLE_EDIT" data-bind="visible: exists"></span>