diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart
index 095b6b73..dab8eda1 100644
--- a/lib/src/message_list_view.dart
+++ b/lib/src/message_list_view.dart
@@ -811,6 +811,14 @@ class _MessageListViewState extends State<MessageListView> {
     final showThreadReplyIndicator = !_isThreadConversation && hasReplies;
     final isOnlyEmoji = message.text.isOnlyEmoji;
 
+    final borderSide = isMyMessage
+        ? !(showThreadReplyIndicator || showInChannelIndicator)
+            ? BorderSide.none
+            : null
+        : isOnlyEmoji
+            ? BorderSide.none
+            : null;
+
     Widget child = MessageWidget(
       key: ValueKey<String>('MESSAGE-${message.id}'),
       message: message,
@@ -846,7 +854,7 @@ class _MessageListViewState extends State<MessageListView> {
       showEditMessage: isMyMessage,
       showDeleteMessage: isMyMessage,
       showThreadReplyMessage: !isThreadMessage,
-      borderSide: isMyMessage && !isOnlyEmoji ? BorderSide.none : null,
+      borderSide: borderSide,
       onThreadTap: _onThreadTap,
       onReplyTap: widget.onReplyTap,
       attachmentBorderRadiusGeometry: BorderRadius.only(
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index a40556a2..ba458a7e 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -383,11 +383,8 @@ class _MessageWidgetState extends State<MessageWidget> {
                                                   ),
                                                   shape: widget.shape ??
                                                       RoundedRectangleBorder(
-                                                        side: isOnlyEmoji &&
-                                                                !(showThreadReplyIndicator ||
-                                                                    showInChannel)
-                                                            ? BorderSide.none
-                                                            : widget.borderSide ??
+                                                        side:
+                                                            widget.borderSide ??
                                                                 BorderSide(
                                                                   color: widget
                                                                       .messageTheme