2 files changed, 2 insertions, 2 deletions
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index be22687f..1534da2e 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -194,7 +194,6 @@ Rectangle {
                 Text {
                     Layout.fillWidth: true
                     text: model.data.body
-                    textFormat: Text.PlainText
                     elide: Text.ElideRight
                     color: colors.text
                 }
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 5db6f0c2..80ccabea 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -353,7 +353,8 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r
                 return QVariant(emojiCount);
         }
         case Body:
-                return QVariant(utils::replaceEmoji(QString::fromStdString(body(event))));
+                return QVariant(
+                  utils::replaceEmoji(QString::fromStdString(body(event)).toHtmlEscaped()));
         case FormattedBody: {
                 const static QRegularExpression replyFallback(
                   "<mx-reply>.*</mx-reply>", QRegularExpression::DotMatchesEverythingOption);