diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml
index e5f1d366f8..331efb4d77 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml
@@ -75,7 +75,7 @@ Loader {
                 anchors.topMargin: repliedMessageType == Constants.imageType ? 15 : 8
                 anchors.left: lblReplyMessage.left
                 anchors.right: lblReplyMessage.right
-                anchors.rightMargin: chatTextItem.chatHorizontalPadding
+                anchors.rightMargin: root.chatHorizontalPadding
                 color: root.elementsColor
             }
         }
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
index 3fdee479b3..4e6ee8dfab 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
@@ -36,9 +36,6 @@ Item {
 //        anchors.top: dateGroupLbl.visible ? dateGroupLbl.bottom : parent.top
         anchors.top: parent.top
         anchors.left: chatImage.right
-        userName: messageItem.userName
-        localName: messageItem.localName
-        alias: messageItem.alias
     }
 
     ChatReply {
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml
index 49edddd0cc..343ae8d116 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml
@@ -36,9 +36,6 @@ Item {
         anchors.top: dateGroupLbl.visible ? dateGroupLbl.bottom : parent.top
         anchors.topMargin: 0
         anchors.left: chatImage.right
-        userName: messageItem.userName
-        localName: messageItem.localName
-        alias: messageItem.alias
     }
 
     Rectangle {
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/UsernameLabel.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/UsernameLabel.qml
index c101ef6a78..b6bbcc2c42 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/UsernameLabel.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/UsernameLabel.qml
@@ -6,9 +6,6 @@ Item {
     id: root
     height: childrenRect.height
     width: chatName.width + (ensOrAlias.visible ? ensOrAlias.width + ensOrAlias.anchors.leftMargin : 0)
-    property string userName: ""
-    property string localName: ""
-    property string alias: ""
     property alias label: chatName
     visible: isMessage && authorCurrentMsg != authorPrevMsg
 
@@ -19,16 +16,16 @@ Item {
                 return qsTr("You")
             }
 
-            if (root.localName !== "") {
-                return root.localName
+            if (localName !== "") {
+                return localName
             }
 
-            if (root.userName !== "") {
-                return Utils.removeStatusEns(root.userName)
+            if (userName !== "") {
+                return Utils.removeStatusEns(userName)
             }
-            return Utils.removeStatusEns(root.alias)
+            return Utils.removeStatusEns(alias)
         }
-        color: text.startsWith("@") || isCurrentUser || root.localName !== "" ? Style.current.blue : Style.current.secondaryText
+        color: text.startsWith("@") || isCurrentUser || localName !== "" ? Style.current.blue : Style.current.secondaryText
         font.weight: Font.Medium
         font.pixelSize: Style.current.secondaryTextFontSize
         readOnly: true
@@ -53,8 +50,8 @@ Item {
 
     StyledText {
         id: ensOrAlias
-        visible: root.localName !== "" && root.userName.startsWith("@")
-        text: root.userName
+        visible: localName !== "" && userName.startsWith("@")
+        text: userName
         color: Style.current.secondaryText
         font.pixelSize: chatName.font.pixelSize
         anchors.left: chatName.right