diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index 83d76616e..063caaab7 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -346,7 +346,7 @@ export const
 				let i = oElement.attributes.length;
 				while (i--) {
 					let sAttrName = oElement.attributes[i].name.toLowerCase();
-					if (!allowedAttributes.includes(sAttrName)) {
+					if (!allowedAttributes.includes(sAttrName) && ('class' !== sAttrName || 'mail-body' !== className)) {
 						delAttribute(sAttrName);
 						aAttrsForRemove.push(sAttrName);
 					}
@@ -542,7 +542,7 @@ export const
 					oStyle.removeProperty('color');
 				}
 
-				oStyle.cssText = cleanCSS(oStyle.cssText);
+				oStyle.cssText && (oStyle.cssText = cleanCSS(oStyle.cssText));
 			}
 
 			if (debug && aAttrsForRemove.length) {
diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 4ee9a5d2d..8e9e97bc7 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -464,7 +464,7 @@ export class MessageModel extends AbstractModel {
 			clone.querySelectorAll('.sm-bq-switcher').forEach(
 				node => node.replaceWith(node.lastElementChild)
 			);
-			return clone.innerHTML;
+			return (clone.querySelector('.mail-body') || clone).innerHTML;
 		}
 		let result = msgHtml(this);
 		return result.html || plainToHtml(this.plain());