Merge branch 'develop' into sort-imports

Signed-off-by: Aaron Raimist <aaron@raim.ist>

src/stores/room-list/previews/MessageEventPreview.ts

@@ -56,7 +56,9 @@ export class MessageEventPreview implements IPreview {
         }
 
         if (hasHtml) {
-            body = getHtmlText(body);
+            const sanitised = getHtmlText(body.replace(/<br\/?>/gi, "\n")); // replace line breaks before removing them
+            // run it through DOMParser to fixup encoded html entities
+            body = new DOMParser().parseFromString(sanitised, "text/html").documentElement.textContent;
         }
 
         body = sanitizeForTranslation(body);