diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index 1014373df..ad2f5f286 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -1,5 +1,6 @@
 import { createElement } from 'Common/Globals';
 import { forEachObjectEntry, pInt } from 'Common/Utils';
+import { SettingsUserStore } from 'Stores/User/Settings';
 
 const
 	tpl = createElement('template'),
@@ -36,7 +37,7 @@ export const
 	 * @param {string} text
 	 * @returns {string}
 	 */
-	cleanHtml = (html, oAttachments, removeColors) => {
+	cleanHtml = (html, oAttachments) => {
 		const
 			debug = false, // Config()->Get('debug', 'enable', false);
 			detectHiddenImages = true, // !!SettingsGet('try_to_detect_hidden_images'),
@@ -354,7 +355,7 @@ export const
 				// Removes background and color
 				// Many e-mails incorrectly only define one, not both
 				// And in dark theme mode this kills the readability
-				if (removeColors) {
+				if (SettingsUserStore.removeColors()) {
 					oStyle.removeProperty('background-color');
 					oStyle.removeProperty('background-image');
 					oStyle.removeProperty('color');
diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index d3d3ef765..a7c8287e4 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -454,7 +454,7 @@ export class MessageModel extends AbstractModel {
 	viewHtml() {
 		const body = this.body;
 		if (body && this.html()) {
-			let result = cleanHtml(this.html(), this.attachments(), SettingsUserStore.removeColors());
+			let result = cleanHtml(this.html(), this.attachments());
 			this.hasExternals(result.hasExternals);
 			this.hasImages(body.rlHasImages = !!result.hasExternals);
 
@@ -629,8 +629,7 @@ export class MessageModel extends AbstractModel {
 	 * @returns {string}
 	 */
 	bodyAsHTML() {
-//		if (this.body && !this.body.querySelector('iframe[src*=decrypt]')) {
-		if (this.body && !this.body.querySelector('iframe')) {
+		if (this.body) {
 			let clone = this.body.cloneNode(true);
 			clone.querySelectorAll('blockquote.rl-bq-switcher').forEach(
 				node => node.classList.remove('rl-bq-switcher','hidden-bq')
@@ -640,7 +639,7 @@ export class MessageModel extends AbstractModel {
 			);
 			return clone.innerHTML;
 		}
-		let result = cleanHtml(this.html(), this.attachments(), SettingsUserStore.removeColors())
+		let result = cleanHtml(this.html(), this.attachments())
 		return result.html || plainToHtml(this.plain());
 	}