diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 962ac5fb9..2ac035c2a 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -228,7 +228,7 @@ bool NeoChatRoom::lastEventIsSpoiler() const
 QString NeoChatRoom::lastEventToString() const
 {
     if (auto event = lastEvent()) {
-        return htmlSafeMemberName(event->senderId()) + (event->isStateEvent() ? " " : ": ") + eventToString(*event);
+        return memberName(event->senderId()) + (event->isStateEvent() ? " " : ": ") + eventToString(*event);
     }
     return QLatin1String("");
 }
diff --git a/src/qml/Panel/RoomDrawer.qml b/src/qml/Panel/RoomDrawer.qml
index ad38d3359..874f48ae4 100644
--- a/src/qml/Panel/RoomDrawer.qml
+++ b/src/qml/Panel/RoomDrawer.qml
@@ -271,6 +271,7 @@ Kirigami.OverlayDrawer {
                         leftPadding: Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing
 
                         label: name
+                        labelItem.textFormat: Text.PlainText
 
                         onClicked: {
                             const popup = userDetailDialog.createObject(ApplicationWindow.overlay, {room: room, user: user, displayName: name, avatarMediaId: avatar})