diff --git a/imports/NeoChat/Component/ChatBox/ReplyPane.qml b/imports/NeoChat/Component/ChatBox/ReplyPane.qml
index d283fe06f..f5cb00cb9 100644
--- a/imports/NeoChat/Component/ChatBox/ReplyPane.qml
+++ b/imports/NeoChat/Component/ChatBox/ReplyPane.qml
@@ -57,7 +57,7 @@ Loader {
                     elide: Text.ElideRight
                     text: {
                         let heading = "<b>%1</b>"
-                        let userName = user ? "<font color=\""+ user.color +"\">" + user.displayName + "</font>" : ""
+                        let userName = user ? "<font color=\""+ user.color +"\">" + currentRoom.htmlSafeMemberName(user.id) + "</font>" : ""
                         if (isEdit) {
                             heading = heading.arg(i18n("Editing message:")) + "<br/>"
                         } else {
diff --git a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml b/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
index a4529e085..ffa0c1135 100644
--- a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
+++ b/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
@@ -130,7 +130,7 @@ Loader {
                         Kirigami.Heading {
                             level: 3
                             Layout.fillWidth: true
-                            text: author.displayName
+                            text: currentRoom.htmlSafeMemberName(author.id)
                             wrapMode: Text.WordWrap
                         }
                         QQC2.Label {