Fix null errors in qml

2 files changed, 2 insertions, 2 deletions

diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml

index 56b8040e..90e52442 100644
--- a/resources/qml/delegates/MessageDelegate.qml
+++ b/resources/qml/delegates/MessageDelegate.qml
@@ -36,7 +36,7 @@ Item {
 		DelegateChoice {
 			roleValue: MtxEvent.EmoteMessage
 			NoticeMessage {
-				formatted: chat.model.escapeEmoji(modelData.userName) + " " + model.data.formattedBody
+				formatted: timelineManager.escapeEmoji(modelData.userName) + " " + model.data.formattedBody
 				color: timelineManager.userColor(modelData.userId, colors.window)
 			}
 		}
diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml

index f9fd3f11..36a6d373 100644
--- a/resources/qml/delegates/Reply.qml
+++ b/resources/qml/delegates/Reply.qml
@@ -37,7 +37,7 @@ Item {
 
 		Text { 
 			id: userName
-			text: chat.model ? chat.model.escapeEmoji(reply.modelData.userName) : ""
+			text: timelineManager.escapeEmoji(reply.modelData.userName)
 			color: replyComponent.userColor
 			textFormat: Text.RichText