diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index 3ca3c2122..492ba8c5e 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -57,11 +57,9 @@ const
 		do {
 			l = html.length;
 			html = html
-				.replace(/(<[^>]+);?background(-color)?\s*:[^;"']+/gi, '$1')
-				.replace(/(<[^>]+[^-]);?color\s*:[^;"']+/gi, '$1')
-				.replace(/(<[^>]+[^-])\sbgcolor="[^"]+"/gi, '$1')
-				.replace(/(<[^>]+[^-])\scolor="[^"]+"/gi, '$1');
-			//.replace(/<\/?font[^>]+>/gmi, '')
+				.replace(/(<[^>]+)[;"']\s*background(-[a-z]+)?\s*:[^;"']+/gi, '$1')
+				.replace(/(<[^>]+)[;"']\s*color\s*:[^;"']+/gi, '$1')
+				.replace(/(<[^>]+)\s(bg)?color=("[^"]+"|'[^']+')/gi, '$1');
 		} while (l != html.length)
 		return html;
 	};
diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less
index 8b9d4b40e..43466f6b3 100644
--- a/dev/Styles/MessageView.less
+++ b/dev/Styles/MessageView.less
@@ -403,6 +403,7 @@
 						img[data-x-src]:not([src]):hover::after {
 							content: attr(data-x-src);
 							font-family: var(--fontSans);
+							font-size: 11px;
 							height: auto;
 							transform: translate(-25%,0);
 							width: auto;
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
index f26937eeb..50623298e 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
@@ -8,7 +8,7 @@
 				data-bind="value: value, attr: {placeholder: placeholder}" />
 		<!-- /ko -->
 		<!-- ko if: 1 === Type -->
-			<input type="number" step="1" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+			<input type="number" step="1"
 				data-bind="value: value, attr: {placeholder: placeholder}" />
 		<!-- /ko -->
 		<!-- ko if: 3 === Type -->