diff --git a/dev/Settings/User/Templates.js b/dev/Settings/User/Templates.js
index 341043034..d0dc5a418 100644
--- a/dev/Settings/User/Templates.js
+++ b/dev/Settings/User/Templates.js
@@ -53,7 +53,7 @@ export class TemplatesUserSettings {
 
 	onBuild(oDom) {
 		oDom.addEventListener('click', event => {
-			const el = event.target.closestWithin('.templates-list .template-item .e-action', oDom);
+			const el = event.target.closestWithin('td.e-action', oDom);
 			el && ko.dataFor(el) && this.editTemplate(ko.dataFor(el));
 		});
 
diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js
index a7bdfd0af..509ac69d6 100644
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@@ -20,13 +20,9 @@ export const SettingsUserStore = new class {
 			]
 		});
 
-		this.messagesPerPage = ko.observable(pInt(SettingsGet('MPP'))).extend(
-			{ rateLimit: { timeout: 999, method: "notifyWhenChangesStop" } }
-		);
+		this.messagesPerPage = ko.observable(pInt(SettingsGet('MPP'))).extend({ debounce: 999 });
 
-		this.messageReadDelay = ko.observable(pInt(SettingsGet('MessageReadDelay'))).extend(
-			{ rateLimit: { timeout: 999, method: "notifyWhenChangesStop" } }
-		);
+		this.messageReadDelay = ko.observable(pInt(SettingsGet('MessageReadDelay'))).extend({ debounce: 999 });
 
 		addObservablesTo(this, {
 			showImages: !!SettingsGet('ShowImages'),
diff --git a/dev/Styles/User/Attachmnets.less b/dev/Styles/User/Attachmnets.less
index fa3b94f52..916202827 100644
--- a/dev/Styles/User/Attachmnets.less
+++ b/dev/Styles/User/Attachmnets.less
@@ -47,35 +47,34 @@
 	}
 
 	.attachmentIconParent {
-
 		position: absolute;
 		height: 56px;
 		width: 60px;
 		text-align: center;
+	}
 
-		.iconPreview, .iconBG, .iconMain, .iconProgress {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-		}
+	.iconPreview, .iconBG, .iconMain, .iconProgress {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+	}
 
-		.iconProgress {
-			background: #eee;
-			width: 0%;
-		}
+	.iconProgress {
+		background: #eee;
+		width: 0%;
+	}
 
-		.iconBG {
-			font-size: 18px;
-			font-weight: bold;
-			line-height: 55px;
-			text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
-		}
+	.iconBG {
+		font-size: 18px;
+		font-weight: bold;
+		line-height: 55px;
+		text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
+	}
 
-		.iconPreview {
-			display: none;
-		}
+	.iconPreview {
+		display: none;
 	}
 
 	.attachmentNameParent {
@@ -111,20 +110,20 @@
 */
 
 	.showPreview, .showPreplay,
-	.attachmentIconParent.hasPreview:hover .iconMain,
-	.attachmentIconParent.hasPreplay:hover .iconMain,
-	.attachmentIconParent.hasPreview .hidePreview,
-	.attachmentIconParent.hasPreplay .hidePreview {
+	.hasPreview:hover .iconMain,
+	.hasPreplay:hover .iconMain,
+	.hasPreview .hidePreview,
+	.hasPreplay .hidePreview {
 		display: none;
 	}
 
-	.attachmentIconParent.hasPreview:hover .iconPreview,
-	.attachmentIconParent.hasPreplay:hover .iconPreview {
+	.hasPreview:hover .iconPreview,
+	.hasPreplay:hover .iconPreview {
 		display: inline-block;
 	}
 
-	.attachmentIconParent.hasPreview .showPreview,
-	.attachmentIconParent.hasPreplay .showPreplay {
+	.hasPreview .showPreview,
+	.hasPreplay .showPreplay {
 		display: inline;
 		cursor: pointer;
 	}
diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index a4d839ec7..07ea7d353 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -122,8 +122,6 @@ html.rl-no-preview-pane {
 		z-index: 101;
 		scroll-behavior: smooth;
 
-		box-sizing: border-box;
-
 		background-color: #fff;
 
 		.listClear {
diff --git a/dev/Styles/User/SettingsFilters.less b/dev/Styles/User/SettingsFilters.less
index afca4b2c3..10473ecae 100644
--- a/dev/Styles/User/SettingsFilters.less
+++ b/dev/Styles/User/SettingsFilters.less
@@ -4,15 +4,15 @@
 	max-width: 720px;
 }
 
-.filter-item td.drag-wrapper {
-	padding: 4px 0;
-}
-
 .b-filter-script .filter-item,
 .b-settings-filters .script-item {
 	white-space: nowrap;
 }
 
+.filter-item td.drag-wrapper {
+	padding: 4px 0;
+}
+
 .filter-item .delete-filter {
 	cursor: pointer;
 	opacity: 0.5;
@@ -22,7 +22,6 @@
 .filter-item .filter-sub-name {
 	display: inline-block;
 	word-break: break-all;
-	box-sizing: border-box;
 	line-height: 22px;
 	cursor: pointer;
 }
diff --git a/dev/Styles/User/SettingsFolders.less b/dev/Styles/User/SettingsFolders.less
index 19520dbbb..c9bed95ae 100644
--- a/dev/Styles/User/SettingsFolders.less
+++ b/dev/Styles/User/SettingsFolders.less
@@ -20,7 +20,6 @@
 	.folder-name {
 		word-break: break-all;
 		white-space: pre-wrap;
-		box-sizing: border-box;
 	}
 
 	.folder-system-name {
diff --git a/dev/Styles/User/SettingsOpenPGP.less b/dev/Styles/User/SettingsOpenPGP.less
index b483b56af..f40fd60be 100644
--- a/dev/Styles/User/SettingsOpenPGP.less
+++ b/dev/Styles/User/SettingsOpenPGP.less
@@ -1,7 +1,11 @@
 
 .b-settings-open-pgp {
 
-	.list-table {
+	td + td {
+		width: 1%;
+	}
+
+	table {
 
 		.open-pgp-key-img {
 			margin-right: 10px;
diff --git a/dev/Styles/User/SettingsTemplates.less b/dev/Styles/User/SettingsTemplates.less
index 617856a17..9c313a2e6 100644
--- a/dev/Styles/User/SettingsTemplates.less
+++ b/dev/Styles/User/SettingsTemplates.less
@@ -1,13 +1,14 @@
 
 .b-settings-templates {
 
-	.template-img {
-		font-size: 12px;
-		margin-right: 5px;
+	td + td {
+		width: 150px;
+	}
+	td + td + td {
+		width: 1%;
 	}
 
 	.template-name {
-		box-sizing: border-box;
 		display: inline-block;
 		line-height: 22px;
 		word-break: break-all;
diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js
index c7a3f8647..6132e5a99 100644
--- a/dev/View/Popup/Contacts.js
+++ b/dev/View/Popup/Contacts.js
@@ -192,7 +192,6 @@ class ContactsPopupView extends AbstractViewPopup {
 				case 'bcc':
 					bccEmails = aE;
 					break;
-				case 'to':
 				default:
 					toEmails = aE;
 					break;
@@ -496,8 +495,8 @@ class ContactsPopupView extends AbstractViewPopup {
 	}
 
 	onShow(bBackToCompose, sLastComposeFocusedField) {
-		this.bBackToCompose = undefined === bBackToCompose ? false : !!bBackToCompose;
-		this.sLastComposeFocusedField = undefined === sLastComposeFocusedField ? '' : sLastComposeFocusedField;
+		this.bBackToCompose = !!bBackToCompose;
+		this.sLastComposeFocusedField = sLastComposeFocusedField;
 
 		rl.route.off();
 		this.reloadContactList(true);
diff --git a/dev/View/Popup/SieveScript.js b/dev/View/Popup/SieveScript.js
index ab15918e5..2fee6b533 100644
--- a/dev/View/Popup/SieveScript.js
+++ b/dev/View/Popup/SieveScript.js
@@ -124,7 +124,7 @@ class SieveScriptPopupView extends AbstractViewPopup {
 
 	onBuild(oDom) {
 		oDom.addEventListener('click', event => {
-			const el = event.target.closestWithin('.filter-item .e-action', oDom),
+			const el = event.target.closestWithin('td.e-action', oDom),
 				filter = el && ko.dataFor(el);
 			filter && this.editFilter(filter);
 		});
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 6bc5e900f..901a7ac02 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
@@ -4,18 +4,18 @@
 		<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>
+			<span data-bind="visible: exists">: <!-- ko text: name--><!-- /ko --></span>
 		</h3>
 	</div>
 	<div class="modal-body">
 
-		<div class="control-group" data-bind="css: {'error': nameError}">
+		<div class="control-group" data-bind="css: {'error': nameError}, hidden: exists">
 			<div class="controls">
 				<input type="text" class="span5"
-					data-bind="value: name, hasfocus: !exists(), visible: !exists()"
+					data-bind="value: name, hasfocus: !exists()"
 					autocorrect="off" autocapitalize="off" spellcheck="false"
 					data-i18n="[placeholder]GLOBAL/NAME"
 				/>
-				<span data-bind="text: name, visible: exists"></span>
 			</div>
 		</div>
 
@@ -57,12 +57,8 @@
 				</colgroup>
 				<tbody data-bind="foreach: filters">
 					<tr class="filter-item" draggable="true" data-bind="sortableItem: { list: $parent.filters }">
-						<td>
-							<span class="disabled-filter fontastic" data-bind="click: function () { $parent.hasChanges(true); enabled(!enabled()); }, text: enabled() ? '☑' : '☐'"></span>
-						</td>
-						<td class="drag-wrapper">
-							<span class="fontastic drag-handle">⬍</span>
-						</td>
+						<td class="fontastic" data-bind="click: function () { $parent.hasChanges(true); enabled(!enabled()); }, text: enabled() ? '☑' : '☐'"></td>
+						<td class="drag-wrapper fontastic drag-handle">⬍</td>
 						<td class="e-action">
 							<span class="filter-name" data-bind="text: name()"></span>
 							&nbsp;&nbsp;
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
index 169b97a38..6e450aa82 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
@@ -24,11 +24,6 @@
 	</div>
 	<br />
 	<table class="table table-hover list-table" data-bind="i18nUpdate: openpgpkeys">
-		<colgroup>
-			<col />
-			<col style="width: 1%" />
-			<col style="width: 1%" />
-		</colgroup>
 		<tbody data-bind="foreach: openpgpkeysPrivate">
 			<tr class="open-pgp-key-item">
 				<td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
index 9cbc91ddd..6ac8b5d49 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
@@ -9,15 +9,9 @@
 		<span data-i18n="SETTINGS_TEMPLATES/BUTTON_ADD_TEMPLATE"></span>
 	</a>
 	<table class="table table-hover list-table templates-list" data-bind="i18nUpdate: templates">
-		<colgroup>
-			<col />
-			<col style="width: 150px" />
-			<col style="width: 1%" />
-		</colgroup>
 		<tbody data-bind="foreach: templates">
-			<tr class="template-item" draggable="true" data-bind="sortableItem: { list: $root.templates }">
+			<tr draggable="true" data-bind="sortableItem: { list: $root.templates }">
 				<td class="e-action">
-					<span class="template-img fontastic">👤</span>
 					<i class="fontastic drag-handle">⬍</i>
 					<span class="template-name" data-bind="text: name"></span>
 				</td>