diff --git a/packages/lib/htmlUtils.test.ts b/packages/lib/htmlUtils.test.ts
index 2de678d9a..cb9efde29 100644
--- a/packages/lib/htmlUtils.test.ts
+++ b/packages/lib/htmlUtils.test.ts
@@ -40,6 +40,30 @@ describe('htmlUtils', () => {
 				'<img onerror="http://downloadmalware.com"/>',
 				'&lt;img onerror=&quot;http://downloadmalware.com&quot;/&gt;',
 			],
+			[
+				'Some text indented by a tab:\n\tIndented',
+				'<p>Some text indented by a tab:<br/>&nbsp;&nbsp;&nbsp;&nbsp;Indented</p>',
+			],
+			[
+				'Some text indented by two spaces:\n  Indented',
+				'<p>Some text indented by two spaces:<br/>&nbsp;&nbsp;Indented</p>',
+			],
+			[
+				'Some text with      white space between the content\nNewLine',
+				'<p>Some text with      white space between the content<br/>NewLine</p>',
+			],
+			[
+				'Some text with \t tab\nNewLine',
+				'<p>Some text with \t tab<br/>NewLine</p>',
+			],
+			[
+				'Tab at the end of the line is ignored\t\nNewLine',
+				'<p>Tab at the end of the line is ignored<br/>NewLine</p>',
+			],
+			[
+				'White space at the end of the line is ignored       \nNewLine',
+				'<p>White space at the end of the line is ignored<br/>NewLine</p>',
+			],
 		];
 
 		for (const t of testCases) {
diff --git a/packages/lib/htmlUtils.ts b/packages/lib/htmlUtils.ts
index e367b3256..63f96eb7d 100644
--- a/packages/lib/htmlUtils.ts
+++ b/packages/lib/htmlUtils.ts
@@ -188,7 +188,7 @@ export function plainTextToHtml(plainText: string): string {
 	let currentLine = '';
 
 	for (let line of lines) {
-		line = line.trim();
+		line = line.trimEnd();
 		if (!line) {
 			if (currentLine) {
 				step1.push(`<p>${currentLine}</p>`);
diff --git a/packages/lib/string-utils.ts b/packages/lib/string-utils.ts
index 00837bc46..419d6c30d 100644
--- a/packages/lib/string-utils.ts
+++ b/packages/lib/string-utils.ts
@@ -219,7 +219,9 @@ export function escapeHtml(s: string) {
 		.replace(/</g, '&lt;')
 		.replace(/>/g, '&gt;')
 		.replace(/"/g, '&quot;')
-		.replace(/'/g, '&#039;');
+		.replace(/'/g, '&#039;')
+		.replace(/^ +/g, match => '&nbsp;'.repeat(match.length))
+		.replace(/^\t+/g, match => '&nbsp;&nbsp;&nbsp;&nbsp;'.repeat(match.length));
 }
 
 // keywords can either be a list of strings, or a list of objects with the format: