diff --git a/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
index dfaeb85dd4..a7c7d91ce1 100644
--- a/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
@@ -213,7 +213,6 @@ Item {
             id: msgDelegate
 
             width: ListView.view.width
-            height: implicitHeight
 
             objectName: "chatMessageViewDelegate"
             rootStore: root.rootStore
diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml
index 16b989e9e2..dad5e5c826 100644
--- a/ui/imports/shared/views/chat/MessageView.qml
+++ b/ui/imports/shared/views/chat/MessageView.qml
@@ -55,6 +55,7 @@ Loader {
     property string messageOutgoingStatus: ""
     property string resendError: ""
     property int messageContentType: Constants.messageContentType.messageType
+
     property bool pinnedMessage: false
     property string messagePinnedBy: ""
     property var reactionsModel: []
@@ -443,7 +444,8 @@ Loader {
                 reactionsModel: root.reactionsModel
 
                 showHeader: root.shouldRepeatHeader || dateGroupLabel.visible || isAReply ||
-                            (root.prevMessageContentType !== Constants.messageContentType.systemMessagePrivateGroupType && root.senderId !== root.prevMessageSenderId)
+                            root.prevMessageContentType === Constants.messageContentType.systemMessagePrivateGroupType ||
+                            root.senderId !== root.prevMessageSenderId
                 isActiveMessage: d.isMessageActive
                 topPadding: showHeader ? Style.current.halfPadding : 0
                 bottomPadding: showHeader && d.nextMessageHasHeader() ? Style.current.halfPadding : 2