diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index e3f97ad69..88dcde274 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -623,6 +623,8 @@ export const
 		html = html
 			.replace(/<pre[^>]*>([\s\S]*?)<\/pre>/gim, (...args) =>
 				1 < args.length ? args[1].toString().replace(/\n/g, '<br>') : '')
+			// Remove line duplication
+			.replace(/<br><\/div>/gi, '</div>')
 			.replace(/\r?\n/g, '')
 			.replace(/\s+/gm, ' ');
 
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index e937a772b..9c4e63954 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -1506,8 +1506,6 @@ export class ComposePopupView extends AbstractViewPopup {
 			do {
 				l = Text.length;
 				Text = Text
-					// Remove line duplication
-					.replace(/<br><\/div>/gi, '</div>')
 					// Remove Microsoft Office styling
 					.replace(/(<[^>]+[;"'])\s*mso-[a-z-]+\s*:[^;"']+/gi, '$1')
 					// Remove hubspot data-hs- attributes