diff --git a/dev/Model/Attachment.js b/dev/Model/Attachment.js
index ad5e875a1..fc1a30e00 100644
--- a/dev/Model/Attachment.js
+++ b/dev/Model/Attachment.js
@@ -51,6 +51,11 @@ export class AttachmentModel extends AbstractModel {
 		return attachment;
 	}
 
+	toggleChecked(self, event) {
+		event.stopPropagation();
+		self.checked(!self.checked());
+	}
+
 	friendlySize() {
 		return FileInfo.friendlySize(this.estimatedSize) + (this.isLinked() ? ' 🔗' : '');
 	}
diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index 4ff262f27..ab16e5775 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -151,6 +151,10 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 		}
 	}
 
+	hideError() {
+		this.folderListError('');
+	}
+
 	toggleFolderKolabType(folder, event) {
 		let type = event.target.value;
 		// TODO: append '.default' ?
diff --git a/dev/Settings/User/Themes.js b/dev/Settings/User/Themes.js
index 8ed6b53ed..0c6cfe1d1 100644
--- a/dev/Settings/User/Themes.js
+++ b/dev/Settings/User/Themes.js
@@ -60,6 +60,10 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 		});
 	}
 
+	setTheme(theme) {
+		ThemeStore.theme(theme.name);
+	}
+
 	onBuild() {
 		const currentTheme = ThemeStore.theme();
 
diff --git a/dev/View/Admin/Login.js b/dev/View/Admin/Login.js
index 5f8cf592f..d50ee858e 100644
--- a/dev/View/Admin/Login.js
+++ b/dev/View/Admin/Login.js
@@ -33,6 +33,10 @@ export class AdminLoginView extends AbstractViewLogin {
 		});
 	}
 
+	hideError() {
+		this.submitError('');
+	}
+
 	submitCommand(self, event) {
 		let form = event.target.form,
 			data = new FormData(form),
diff --git a/dev/View/Popup/Account.js b/dev/View/Popup/Account.js
index 779a43737..fd58bb680 100644
--- a/dev/View/Popup/Account.js
+++ b/dev/View/Popup/Account.js
@@ -22,6 +22,10 @@ export class AccountPopupView extends AbstractViewPopup {
 		});
 	}
 
+	hideError() {
+		this.submitError('');
+	}
+
 	submitForm(form) {
 		if (!this.submitRequest() && form.reportValidity()) {
 			const data = new FormData(form);
diff --git a/dev/View/Popup/OpenPgpGenerate.js b/dev/View/Popup/OpenPgpGenerate.js
index a76a62dc6..cf75ecb39 100644
--- a/dev/View/Popup/OpenPgpGenerate.js
+++ b/dev/View/Popup/OpenPgpGenerate.js
@@ -93,6 +93,10 @@ export class OpenPgpGeneratePopupView extends AbstractViewPopup {
 		});
 	}
 
+	hideError() {
+		this.submitError('');
+	}
+
 	showError(e) {
 		console.log(e);
 		if (e?.message) {
diff --git a/dev/View/Popup/Plugin.js b/dev/View/Popup/Plugin.js
index 3296a245d..0e482c6e0 100644
--- a/dev/View/Popup/Plugin.js
+++ b/dev/View/Popup/Plugin.js
@@ -35,6 +35,10 @@ export class PluginPopupView extends AbstractViewPopup {
 		});
 	}
 
+	hideError() {
+		this.saveError('');
+	}
+
 	saveCommand() {
 		const oConfig = {
 			Id: this.id(),
diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js
index 9004b3a49..7bf1564c4 100644
--- a/dev/View/User/Login.js
+++ b/dev/View/User/Login.js
@@ -88,6 +88,14 @@ export class LoginUserView extends AbstractViewLogin {
 		});
 	}
 
+	hideError() {
+		this.submitError('');
+	}
+
+	toggleSignMe() {
+		this.signMe(!this.signMe());
+	}
+
 	submitCommand(self, event) {
 		const email = this.email().trim();
 		this.email(email);
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index a589de2bc..ecbb33456 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -225,6 +225,10 @@ export class MailMessageView extends AbstractViewRight {
 		});
 	}
 
+	toggleFullInfo() {
+		this.showFullInfo(!this.showFullInfo());
+	}
+
 	closeMessage() {
 		currentMessage(null);
 	}
@@ -393,9 +397,7 @@ export class MailMessageView extends AbstractViewRight {
 
 		// message information
 		registerShortcut('i', 'meta', [Scope.MessageList, Scope.MessageView], () => {
-			if (currentMessage()) {
-				this.showFullInfo(!this.showFullInfo());
-			}
+			currentMessage() && this.toggleFullInfo();
 			return false;
 		});
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
index fb4e29d47..418b2e6fe 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -1,6 +1,6 @@
 <div class="descWrapper" data-i18n="TOP_PANEL/LABEL_ADMIN_PANEL"></div>
 <div class="alert" data-bind="hidden: !submitError()">
-	<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
+	<a href="#" class="close" data-bind="click: hideError">×</a>
 	<span data-bind="text: submitError"></span>
 </div>
 <form action="#/" spellcheck="false" data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
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 62c5371e1..aedfcc8b0 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
@@ -10,7 +10,7 @@
 	<form class="form-horizontal plugin-form" action="#/" spellcheck="false" onsubmit="return false;">
 		<div class="alert alert-info" data-bind="visible: !hasConfiguration()" data-i18n="POPUPS_PLUGIN/DESC_NOTHING_TO_CONFIGURE"></div>
 		<div class="alert" data-bind="visible: '' !== saveError()">
-			<a href="#" class="close" data-bind="click: function () { saveError('') }">×</a>
+			<a href="#" class="close" data-bind="click: hideError">×</a>
 			<span data-bind="text: saveError"></span>
 		</div>
 		<div data-bind="foreach: config, visible: hasConfiguration">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
index 051d9bb6c..aed43eaa0 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
@@ -1,6 +1,6 @@
 <div class="descWrapper" data-bind="visible: '' !== loadingDesc, text: loadingDesc"></div>
 <div class="alert" data-bind="hidden: !submitError()" hidden="">
-	<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
+	<a href="#" class="close" data-bind="click: hideError">×</a>
 	<span data-bind="text: submitError"></span>
 	<p data-bind="visible: '' !== submitErrorAdditional()">
 		<span data-i18n="GLOBAL/SERVER_MESSAGE"></span>:
@@ -25,7 +25,7 @@
 	</div>
 	<div id="plugin-Login-BottomControlGroup"></div>
 	<div class="controls" style="display: flex">
-		<div class="e-checkbox" tabindex="0" data-bind="click: function(){signMe(!signMe())}, onSpace: function(){signMe(!signMe())}">
+		<div class="e-checkbox" tabindex="0" data-bind="click: toggleSignMe, onSpace: toggleSignMe">
 			<i role="checkbox" class="fontastic" data-bind="text: signMe() ? '☑' : '☐'"></i>
 			<span data-i18n="LOGIN/LABEL_SIGN_ME"></span>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 3ce790aeb..39445ef97 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -123,7 +123,7 @@
 
 			<div class="messageItemHeader">
 				<div class="subjectParent">
-					<span class="infoParent g-ui-user-select-none fontastic" data-bind="click: function() { showFullInfo(!showFullInfo()); }">ℹ</span>
+					<span class="infoParent g-ui-user-select-none fontastic" data-bind="click: toggleFullInfo">ℹ</span>
 					<span class="flagParent g-ui-user-select-none flagOff fontastic" data-bind="text: message().isFlagged() ? '★' : '☆', css: {'flagOn': message().isFlagged(), 'flagOff': !message().isFlagged()}"></span>
 					<span class="subject" data-bind="text: message().subject, title: message().subject"></span>
 					<a href="#" class="close" data-bind="click: closeMessage" style="margin-top: -8px;">×</a>
@@ -251,8 +251,7 @@
 											<div class="attachmentSize" data-bind="text: friendlySize()"></div>
 										</div>
 										<div class="checkboxAttachment fontastic"
-												data-bind="visible: download, text: checked() ? '☑' : '☐',
-												click: function () { checked(!checked()); return false }"></div>
+											data-bind="visible: download, text: checked() ? '☑' : '☐', click: toggleChecked"></div>
 									</li>
 								</ul>
 								<!-- /ko -->
@@ -261,8 +260,7 @@
 									<li class="attachmentItem" data-bind="attr: { 'title': fileName }, css: {'checked': checked}">
 										<span class="attachmentName" data-bind="text: fileName"></span>
 										<i class="checkboxAttachment fontastic"
-											data-bind="visible: download, text: checked() ? '☑' : '☐',
-											click: function () { checked(!checked()); return false }"></i>
+											data-bind="visible: download, text: checked() ? '☑' : '☐', click: toggleChecked"></i>
 									</li>
 								</ul>
 								<!-- /ko -->
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 987a499ff..caeb2294a 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
@@ -5,7 +5,7 @@
 </header>
 <form id="accountform" class="modal-body form-horizontal" autocomplete="off" spellcheck="false" data-bind="submit: submitForm">
 	<div class="alert" data-bind="visible: '' !== submitError()">
-		<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
+		<a href="#" class="close" data-bind="click: hideError">×</a>
 		<span data-bind="text: submitError"></span>
 		<div data-bind="visible: submitErrorAdditional, text: submitErrorAdditional"></div>
 	</div>
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 540b8fccf..53a4a90ae 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
@@ -4,7 +4,7 @@
 </header>
 <form id="openpgp-generate" class="modal-body form-horizontal" autocomplete="off" spellcheck="false" data-bind="submit: submitForm">
 	<div class="alert" data-bind="visible: '' !== submitError()">
-		<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
+		<a href="#" class="close" data-bind="click: hideError">×</a>
 		<span data-bind="text: submitError"></span>
 	</div>
 	<!-- Disable stupid browser password autofill -->
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
index 4d3ce9d5c..1548fdea4 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
@@ -34,7 +34,7 @@
 	<span data-i18n="SETTINGS_FOLDERS/TO_MANY_FOLDERS_DESC_2"></span>
 </div>
 <div class="alert folders-list-error" data-bind="visible: '' !== folderListError()">
-	<a href="#" class="close" data-bind="click: function () { folderListError(''); }">×</a>
+	<a href="#" class="close" data-bind="click: hideError">×</a>
 	<span data-bind="text: folderListError"></span>
 </div>
 <table class="table table-hover list-table" data-bind="i18nUpdate: folderList">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
index e3804b089..6b6d78fd5 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
@@ -3,7 +3,7 @@
 	<span data-bind="saveTrigger: themeTrigger"></span>
 </div>
 <div data-bind="foreach: themesObjects">
-	<figure data-bind="click: function () { $root.theme(name); }, css: { 'selected': selected }">
+	<figure data-bind="click: $root.setTheme, css: { 'selected': selected }">
 		<figcaption data-bind="text: nameDisplay"></figcaption>
 		<img data-bind="attr: { 'src': themePreviewSrc }">
 	</figure>