diff --git a/src/app/commoncomponents/SBSMessageBase.qml b/src/app/commoncomponents/SBSMessageBase.qml
index 7a251ea7f59b39679311ed363a643da0278881d0..3e7d3b05ad422b14a5aeaf0459cac8238ebbcc42 100644
--- a/src/app/commoncomponents/SBSMessageBase.qml
+++ b/src/app/commoncomponents/SBSMessageBase.qml
@@ -74,7 +74,7 @@ Control {
 
             Label {
                 id: username
-                text: chatView.headerUserUserNameLabelText
+                text: UtilsAdapter.getBestNameForUri(CurrentAccount.id, Author)
                 font.bold: true
                 visible: (seq === MsgSeq.first || seq === MsgSeq.single) && !isOutgoing
                 font.pixelSize: JamiTheme.usernameBlockFontSize
diff --git a/src/app/mainview/MainView.qml b/src/app/mainview/MainView.qml
index 7baddcbe92f91074cabe094e0743136770ffc5a5..231025209d508647487de20c4ec6af1a31629ae6 100644
--- a/src/app/mainview/MainView.qml
+++ b/src/app/mainview/MainView.qml
@@ -182,7 +182,6 @@ Rectangle {
         if (item.convId === undefined)
             return
         chatView.headerUserAliasLabelText = item.title
-        chatView.headerUserUserNameLabelText = item.bestId
         if (item.callStackViewShouldShow) {
             if (inSettingsView) {
                 toggleSettingsView()
diff --git a/src/app/mainview/components/ChatView.qml b/src/app/mainview/components/ChatView.qml
index 213cd4a988c3d87dd45118cb4ce64c5623e87316..e3777b146fb0682982f892555ae97d4da853ce75 100644
--- a/src/app/mainview/components/ChatView.qml
+++ b/src/app/mainview/components/ChatView.qml
@@ -33,7 +33,6 @@ Rectangle {
     id: root
 
     property string headerUserAliasLabelText: ""
-    property string headerUserUserNameLabelText: ""
 
     property bool allMessagesLoaded
 
@@ -64,7 +63,6 @@ Rectangle {
             Layout.minimumWidth: JamiTheme.chatViewHeaderMinimumWidth
 
             userAliasLabelText: headerUserAliasLabelText
-            userUserNameLabelText: headerUserUserNameLabelText
 
             DropArea {
                 anchors.fill: parent