diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 062c0671d..6748ebc9e 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -445,6 +445,7 @@ QVariantMap NeoChatRoom::getUser(User *user) const
         {QStringLiteral("isLocalUser"), user->id() == localUser()->id()},
         {QStringLiteral("id"), user->id()},
         {QStringLiteral("displayName"), user->displayname(this)},
+        {QStringLiteral("escapedDisplayName"), htmlSafeMemberName(user->id())},
         {QStringLiteral("avatarSource"), avatarForMember(user)},
         {QStringLiteral("avatarMediaId"), user->avatarMediaId(this)},
         {QStringLiteral("color"), Utils::getUserColor(user->hueF())},
diff --git a/src/qml/MessageDelegate.qml b/src/qml/MessageDelegate.qml
index 45e26a40b..d548c7b76 100644
--- a/src/qml/MessageDelegate.qml
+++ b/src/qml/MessageDelegate.qml
@@ -354,6 +354,7 @@ TimelineDelegate {
                 name: root.author.displayName
                 source: root.author.avatarSource
                 color: root.author.color
+                QQC2.ToolTip.text: root.author.escapedDisplayName
 
                 onClicked: RoomManager.resolveResource(root.author.id, "mention")
             }