diff --git a/lib/src/channel_preview.dart b/lib/src/channel_preview.dart
index 6c8d61fe..d7c1a418 100644
--- a/lib/src/channel_preview.dart
+++ b/lib/src/channel_preview.dart
@@ -230,10 +230,8 @@ class ChannelPreview extends StatelessWidget {
           text = parts.join(' ');
         }
 
-        return RichText(
-          maxLines: 1,
-          overflow: TextOverflow.ellipsis,
-          text: _getDisplayText(
+        return Text.rich(
+          _getDisplayText(
             text,
             lastMessage.mentionedUsers,
             lastMessage.attachments,
@@ -255,6 +253,8 @@ class ChannelPreview extends StatelessWidget {
                     : FontStyle.normal,
                 fontWeight: FontWeight.bold),
           ),
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
         );
       },
     );
diff --git a/lib/src/message_search_item.dart b/lib/src/message_search_item.dart
index a90b82c4..060fcee5 100644
--- a/lib/src/message_search_item.dart
+++ b/lib/src/message_search_item.dart
@@ -123,36 +123,25 @@ class MessageSearchItem extends StatelessWidget {
       text = parts.join(' ');
     }
 
-    return RichText(
-      maxLines: 1,
-      overflow: TextOverflow.ellipsis,
-      text: _getDisplayText(
+    return Text.rich(
+      _getDisplayText(
         text,
         message.mentionedUsers,
         message.attachments,
         StreamChatTheme.of(context).channelPreviewTheme.subtitle.copyWith(
-              fontStyle: (message.isSystem || message.isDeleted)
-                  ? FontStyle.italic
-                  : FontStyle.normal,
-            ),
+          fontStyle: (message.isSystem || message.isDeleted)
+              ? FontStyle.italic
+              : FontStyle.normal,
+        ),
         StreamChatTheme.of(context).channelPreviewTheme.subtitle.copyWith(
-              fontStyle: (message.isSystem || message.isDeleted)
-                  ? FontStyle.italic
-                  : FontStyle.normal,
-              fontWeight: FontWeight.bold,
-            ),
+          fontStyle: (message.isSystem || message.isDeleted)
+              ? FontStyle.italic
+              : FontStyle.normal,
+          fontWeight: FontWeight.bold,
+        ),
       ),
-    );
-
-    return Text(
-      text,
       maxLines: 1,
       overflow: TextOverflow.ellipsis,
-      style: StreamChatTheme.of(context).channelPreviewTheme.subtitle.copyWith(
-            fontStyle: (message.isSystem || message.isDeleted)
-                ? FontStyle.italic
-                : FontStyle.normal,
-          ),
     );
   }