diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html b/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html
index 6295e4fd0..5d8177992 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html
@@ -1,3 +1,3 @@
 <nav class="e-paginator g-ui-user-select-none" data-bind="foreach: $data">
-	<a data-bind="css: { 'current': current }, title: title, text: name"></a>
+	<a data-bind="css: { 'current': current }, attr: { title: title }, text: name"></a>
 </nav>
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 63e5b8f12..2f234e419 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
@@ -131,8 +131,8 @@
 				<a href="#" class="close" data-bind="click: closeMessage" style="margin-top: -8px;">×</a>
 			</div>
 			<div class="informationShort">
-				<span class="from" data-bind="html: viewFromShort, title: message().from"></span>
-				<i data-bind="visible: viewDkimIcon, css: dkimIconClass, title: dkimTitle"></i>
+				<span class="from" data-bind="html: viewFromShort, attr:{ title: message().from }"></span>
+				<i data-bind="visible: viewDkimIcon, css: dkimIconClass, attr:{ title: dkimTitle }"></i>
 			</div>
 		</div>
 		<div id="messageItem">
@@ -151,7 +151,7 @@
 					</div>
 					<div class="informationShort" data-bind="visible: message().spamResult()">
 						<span data-i18n="MESSAGE/SPAM_SCORE"></span>:
-						<meter min="0" max="100" optimum="0" low="33" high="66" data-bind="value: message().spamScore(), title: message().spamStatus()"></meter>
+						<meter min="0" max="100" optimum="0" low="33" high="66" data-bind="value: message().spamScore(), attr:{ title: message().spamStatus() }"></meter>
 					</div>
 				</div>
 				<div class="informationFull" data-bind="visible: showFullInfo, with: message">
@@ -159,7 +159,7 @@
 						<tr data-bind="visible: from.length">
 							<td data-i18n="GLOBAL/FROM"></td>
 							<td><span data-bind="text: from"></span>
-								<i data-bind="visible: $parent.viewDkimIcon, css: $parent.dkimIconClass, title: $parent.dkimTitle"></i>
+								<i data-bind="visible: $parent.viewDkimIcon, css: $parent.dkimIconClass, attr:{ title: $parent.dkimTitle }"></i>
 							</td>
 						</tr>
 						<tr data-bind="visible: to.length">
@@ -206,7 +206,7 @@
 						<menu class="dropdown-menu right-edge" role="menu" aria-labelledby="tags-dropdown-id">
 							<div data-bind="foreach: message().tagOptions()">
 								<li role="presentation">
-									<a href="#" tabindex="-1" data-icon="☐" data-bind="click: toggle, text: label, title: value, attr: { class: css, 'data-icon': checked ? '☑' : '☐' }"></a>
+									<a href="#" tabindex="-1" data-icon="☐" data-bind="click: toggle, text: label, attr:{ title: value, class: css, 'data-icon': checked ? '☑' : '☐' }"></a>
 								</li>
 							</div>
 							<li role="presentation" class="dividerbar">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
index 3dcd13f2a..8639eecb7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
@@ -6,7 +6,7 @@
 	</div>
 	<div class="btn-group dropdown" data-bind="registerBootstrapDropdown: true, initDom: accountMenu">
 		<a id="top-system-dropdown-id" href="#" tabindex="-1" class="btn single btn-block dropdown-toggle">
-			<span class="accountPlace hide-mobile" data-bind="text: accountName(), title: accountEmail"></span>
+			<span class="accountPlace hide-mobile" data-bind="text: accountName(), attr:{ title: accountEmail }"></span>
 			<i class="fontastic" data-bind="css: {'icon-spinner': accountsLoading()}">👤</i>
 <!--
 			<b data-bind="text: accountsUnreadCount, visible: 100 > accountsUnreadCount() && accountsUnreadCount()"></b>