diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index fcf1dd2c4..f6cb99003 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -86,10 +86,10 @@ class HtmlMessage extends StatelessWidget {
     'rt',
     'html',
     'body',
-    // Workaround for https://github.com/krille-chan/fluffychat/issues/507
-    'tg-forward',
   };
 
+  static const Set<String> ignoredHtmlTags = {'mx-reply'};
+
   /// We add line breaks before these tags:
   static const Set<String> blockHtmlTags = {
     'p',
@@ -170,6 +170,8 @@ class HtmlMessage extends StatelessWidget {
       );
     }
 
+    if (ignoredHtmlTags.contains(node.localName)) return const TextSpan();
+
     switch (node.localName) {
       case 'br':
         return const TextSpan(text: '\n');