From a4c26371d62047290b70f0bf60b3f6e0ee470a4a Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Thu, 27 Oct 2022 21:01:47 +0200
Subject: [PATCH] Fix two cases of usernames containing html being rendered
 wrong

---
 src/neochatroom.cpp          | 2 +-
 src/qml/Panel/RoomDrawer.qml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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})