From e16d0b52ae083475732b69c6a91a479a50df8044 Mon Sep 17 00:00:00 2001
From: Andrew Tjia <hungyao@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:37:33 +0900
Subject: [PATCH] Update Html.js to remove x-html tags before rendering

Fix for https://github.com/the-djmaze/snappymail/issues/1860 to remove <x-html></x-html> tags that might be emitted by certain email clients.

Tested by modifying locally using JS debugger and Snappymail JS debug mode.
---
 dev/Common/Html.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index dce7c9e53..57b1f3d26 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -308,6 +308,8 @@ export const
 			// Not supported by <template> element
 //			.replace(/<!doctype[^>]*>/gi, '')
 //			.replace(/<\?xml[^>]*\?>/gi, '')
+			// 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(/<\/?(html|head)[^>]*>/gi, '')