diff --git a/dev/External/ko.js b/dev/External/ko.js
index 1ba63099a..06a8ef5d0 100644
--- a/dev/External/ko.js
+++ b/dev/External/ko.js
@@ -89,10 +89,6 @@ Object.assign(ko.bindingHandlers, {
 		}
 	},
 
-	title: {
-		update: (element, fValueAccessor) => element.title = ko.unwrap(fValueAccessor())
-	},
-
 	command: {
 		init: (element, fValueAccessor, fAllBindings, viewModel, bindingContext) => {
 			const command = fValueAccessor();
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index 9f4bf40f7..d353a3189 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -132,12 +132,12 @@
 		<div class="messageListPlace" data-bind="dragmessages: 1, i18nUpdate: groupedList, foreach: groupedList" draggable="true">
 			<div class="groupLabel" data-bind="text: label, click: $root.groupSearch" data-i18n="[title]GLOBAL/SEARCH"></div>
 			<!-- ko foreach: messages -->
-			<div class="messageListItem" data-bind="css: lineAsCss(), attr: {'title':preview}">
+			<div class="messageListItem" data-bind="css: lineAsCss(), attr: {title: preview}">
 				<div class="messageCheckbox">
 					<div class="checkboxMessage fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
 				</div><div>
 					<div class="flagParent fontastic"></div>
-					<div class="senderParent" data-bind="attr: {'title': senderClearEmailsString}, text: senderEmailsString"></div>
+					<div class="senderParent" data-bind="attr: {title: senderClearEmailsString}, text: senderEmailsString"></div>
 					<div class="subjectParent" data-bind="text: subject"></div>
 					<div class="threads-len" data-bind="visible: 1 < threadsLen(), text: threadsLenText(), attr: {'data-unseen': threadUnseenLen() || null}"></div>
 					<div class="attachmentParent">
@@ -152,12 +152,12 @@
 		<!-- /ko -->
 		<!-- ko ifnot: listGrouped -->
 		<div class="messageListPlace" data-bind="dragmessages: 1, foreach: messageList" draggable="true">
-			<div class="messageListItem" data-bind="css: lineAsCss(), 'title':preview">
+			<div class="messageListItem" data-bind="css: lineAsCss(), attr:{title:preview}">
 				<div class="messageCheckbox">
 					<div class="checkboxMessage fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
 				</div><div data-bind="attr:{style:indent()}, css:{reply:indent()}">
 					<div class="flagParent fontastic"></div>
-					<div class="senderParent" data-bind="attr: {'title': senderClearEmailsString}, text: senderEmailsString"></div>
+					<div class="senderParent" data-bind="attr: {title: senderClearEmailsString}, text: senderEmailsString"></div>
 					<div class="subjectParent" data-bind="text: subject"></div>
 					<div class="threads-len" data-bind="visible: 1 < threadsLen(), text: threadsLenText(), attr: {'data-unseen': threadUnseenLen() || null}"></div>
 					<div class="attachmentParent">
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 6d4afc593..06ca05947 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
@@ -126,7 +126,7 @@
 		<div class="messageItemHeader" data-bind="if: message, i18nUpdate: message">
 			<div class="subjectParent">
 				<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="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"></span>
 				<a href="#" class="close" data-bind="click: closeMessage" style="margin-top: -8px;">×</a>
 			</div>
@@ -228,16 +228,16 @@
 					<div class="bodySubHeader" data-bind="if: message, i18nUpdate: message">
 						<div class="readReceipt" data-bind="visible: askReadReceipt, click: readReceipt"
 							data-icon="✉" data-i18n="MESSAGE/BUTTON_NOTIFY_READ_RECEIPT"></div>
-							<details class="attachmentsPlace" data-bind="visible: hasAttachments, css: {'selection-mode' : showAttachmentControls}, attr: { 'open': hasAttachments }">
+							<details class="attachmentsPlace" data-bind="visible: hasAttachments, css: {'selection-mode' : showAttachmentControls}, attr: { open: hasAttachments }">
 							<summary data-i18n="MESSAGE/PRINT_LABEL_ATTACHMENTS"></summary>
 							<!-- ko ifnot: simpleAttachmentsList -->
 							<ul class="attachmentList" data-bind="foreach: listAttachments">
 								<li class="attachmentItem" draggable="true"
-										data-bind="event: { 'dragstart': eventDragStart }, attr: { 'title': fileName }, css: {'checked': checked}">
-									<div class="attachmentIcon" data-bind="css: { 'hasPreview': hasPreview(), 'hasPreplay': hasPreplay(), 'isImage': isImage() }, attr: { 'style': thumbnailStyle() }">
+										data-bind="event: { dragstart: eventDragStart }, attr: { title: fileName }, css: {checked: checked}">
+									<div class="attachmentIcon" data-bind="css: { hasPreview: hasPreview(), hasPreplay: hasPreplay(), isImage: isImage() }, attr: { style: thumbnailStyle() }">
 										<i class="hidePreview iconMain" data-bind="css: iconClass()"></i>
 										<div class="showPreview">
-											<a data-bind="css: {'attachmentImagePreview': isImage()}, attr: { 'title': fileName, 'href': linkPreviewMain() }" target="_blank">
+											<a data-bind="css: {attachmentImagePreview: isImage()}, attr: { title: fileName, href: linkPreviewMain() }" target="_blank">
 												<i class="iconMain" data-bind="visible: !hasThumbnail(), css: iconClass()"></i>
 												<div class="iconPreview fontastic">👁</div>
 											</a>
@@ -254,7 +254,7 @@
 							<!-- /ko -->
 							<!-- ko if: simpleAttachmentsList -->
 							<ul class="attachmentListSimple" data-bind="foreach: listAttachments">
-								<li class="attachmentItem" data-bind="attr: { 'title': fileName }, css: {'checked': checked}">
+								<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: toggleChecked"></i>
@@ -288,13 +288,13 @@
 						</div>
 
 						<div data-bind="visible: message().pgpEncrypted()">
-							<div class="openpgp-control encrypted" data-bind="css: {'success': message().pgpDecrypted()}">
+							<div class="openpgp-control encrypted" data-bind="css: {success: message().pgpDecrypted()}">
 								<span data-icon="🔒" data-i18n="OPENPGP/ENCRYPTED_MESSAGE"></span>
 								<button class="btn" data-bind="visible: pgpSupported, click: pgpDecrypt" data-i18n="OPENPGP/BUTTON_DECRYPT"></button>
 							</div>
 						</div>
 						<div data-bind="visible: message().pgpSigned()">
-							<div class="openpgp-control signed" data-bind="css: {'success': message().pgpVerified() && message().pgpVerified().success, 'error': message().pgpVerified() && !message().pgpVerified().success}">
+							<div class="openpgp-control signed" data-bind="css: {success: message().pgpVerified() && message().pgpVerified().success, error: message().pgpVerified() && !message().pgpVerified().success}">
 								<span data-icon="✍" data-i18n="OPENPGP/SIGNED_MESSAGE"></span>
 								<button class="btn" data-bind="visible: pgpSupported, click: pgpVerify" data-i18n="OPENPGP/BUTTON_VERIFY"></button>
 							</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
index 293c36ec7..d6be55f0f 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
@@ -1,4 +1,4 @@
-<header class="g-ui-user-select-none" data-bind="css: {'loading': saving() || sending()}">
+<header class="g-ui-user-select-none" data-bind="css: {loading: saving() || sending()}">
 	<a class="btn" data-bind="command: sendCommand, tooltipErrorTip: sendErrorDesc, css: {'btn-success': sendButtonSuccess, 'btn-danger': sendError, 'btn-warning': sendSuccessButSaveError }">
 		<i data-bind="css: {'icon-paper-plane': !sending(), 'icon-spinner': sending()}"></i>
 		<span class="hide-mobile" data-i18n="COMPOSE/BUTTON_SEND"></span>
@@ -181,13 +181,13 @@
 			<span data-i18n="GLOBAL/ATTACHMENTS"></span>
 		</label>
 		<div class="tab-content attachmentAreaParent" role="tabpanel" aria-hidden="true" style="grid-column-end:4">
-			<div class="b-attachment-place" data-bind="visible: addAttachmentEnabled() && dragAndDropVisible(), css: {'dragAndDropOver': dragAndDropOver}"
+			<div class="b-attachment-place" data-bind="visible: addAttachmentEnabled() && dragAndDropVisible(), css: {dragAndDropOver: dragAndDropOver}"
 				data-i18n="COMPOSE/ATTACH_DROP_FILES_DESC"></div>
 			<ul class="attachmentList" data-bind="foreach: attachments">
-				<li class="attachmentItem" data-bind="attr: { 'title': title }, css: { 'waiting': waiting, 'error': '' !== error() }">
+				<li class="attachmentItem" data-bind="attr: { title: title }, css: { waiting: waiting, error: '' !== error() }">
 					<div class="attachmentIcon">
 						<i class="iconMain" data-bind="css: iconClass, visible: !uploading() || 0 === progress()"></i>
-						<div class="iconProgress" data-bind="attr: { 'style': progressStyle }, visible: uploading"></div>
+						<div class="iconProgress" data-bind="attr: { style: progressStyle }, visible: uploading"></div>
 						<div class="iconBG" data-bind="text: progressText, visible: uploading"></div>
 					</div>
 					<div class="attachmentNameParent">