diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index 286aa2c2c..f2c43209e 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -286,14 +286,15 @@ class HtmlMessage extends StatelessWidget {
         }
 
         return WidgetSpan(
+          alignment: PlaceholderAlignment.middle,
           child: MouseRegion(
             cursor: SystemMouseCursors.click,
             child: GestureDetector(
               onTap: onClick != null && token != null
                   ? () => onClick?.call(token)
                   : null,
-              child: RichText(
-                text: TextSpan(
+              child: Text.rich(
+                TextSpan(
                   children: [
                     LinkifySpan(
                       text: node.innerHtml,
diff --git a/lib/pangea/chat_list/utils/get_chat_list_item_subtitle.dart b/lib/pangea/chat_list/utils/get_chat_list_item_subtitle.dart
index cfd8f2a41..2d237189a 100644
--- a/lib/pangea/chat_list/utils/get_chat_list_item_subtitle.dart
+++ b/lib/pangea/chat_list/utils/get_chat_list_item_subtitle.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
 
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
 import 'package:fluffychat/pangea/practice_activities/practice_selection_repo.dart';
@@ -24,7 +25,8 @@ class ChatListItemSubtitle extends StatelessWidget {
     return MatrixState.pangeaController.languageController.languagesSet &&
         !event.redacted &&
         event.type == EventTypes.Message &&
-        event.messageType == MessageTypes.Text;
+        event.messageType == MessageTypes.Text &&
+        !(AppConfig.renderHtml && !event.redacted && event.isRichMessage);
   }
 
   Future<MessageEventAndTokens> _getPangeaMessageEvent(