diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index 70236d1bd..d495a8c31 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -312,7 +312,8 @@ export const
 			// https://github.com/the-djmaze/snappymail/issues/1860
 			.replace(/<(\/?)x-html(\s[^>]*)?>/gi, '')
 			.replace(/<(\/?)head(\s[^>]*)?>/gi, '')
-			.replace(/<(\/?)body(\s[^>]*)?>/gi, '<$1div class="mail-body"$2>')
+			.replace(/<body(\s[^>]*)?>/i, '<div class="mail-body"$1>')
+			.replace(/<(\/?)body(\s[^>]*)?>/gi, '<$1div$2>')
 //			.replace(/<\/?(html|head)[^>]*>/gi, '')
 			// Fix Reddit https://github.com/the-djmaze/snappymail/issues/540
 			.replace(/<span class="preview-text"[\s\S]+?<\/span>/, '')