From 4238834cb5fdc9b7387813e62bb9296834ff2f09 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 20 Jul 2022 12:34:30 +0200
Subject: [PATCH] Solve empty lines in HTML -> Plain conversion for #462

---
 dev/Common/Html.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index 2cfb00297..dbd8ae2f9 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -409,9 +409,6 @@ export const
 			.replace(/<t[dh](\s[\s\S]*?)?>/gi, '\t')
 			.replace(/<\/tr(\s[\s\S]*?)?>/gi, '\n');
 
-		// Convert line-breaks
-		forEach('br', br => br.replaceWith('\n'));
-
 		// lines
 		forEach('hr', node => node.replaceWith(`\n\n${hr}\n\n`));
 
@@ -458,10 +455,17 @@ export const
 		// Italic
 		forEach('i,em', i => i.replaceWith(`*${i.textContent}*`));
 
+		// Convert line-breaks
+		tpl.innerHTML = tpl.innerHTML
+			.replace(/\n{3,}/gm, '\n\n')
+			.replace(/\n<br[^>]*>/g, '\n')
+			.replace(/<br[^>]*>\n/g, '\n');
+		forEach('br', br => br.replaceWith('\n'));
+
 		// Blockquotes must be last
 		blockquotes(tpl.content);
 
-		return (tpl.content.textContent || '').replace(/\n{3,}/gm, '\n\n').trim();
+		return (tpl.content.textContent || '').trim();
 	},
 
 	/**