diff --git a/src/eventhandler.cpp b/src/eventhandler.cpp
index 4d062994a..8cad14601 100644
--- a/src/eventhandler.cpp
+++ b/src/eventhandler.cpp
@@ -294,7 +294,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
{
if (event->isRedacted()) {
auto reason = event->redactedBecause()->reason();
- return (reason.isEmpty()) ? i18n("[This message was deleted]") : i18n("[This message was deleted: %1]", reason);
+ return (reason.isEmpty()) ? i18n("[This message was deleted]") : i18n("[This message was deleted: %1]", reason.toHtmlEscaped());
}
const bool prettyPrint = (format == Qt::RichText);
diff --git a/src/models/messagecontentmodel.cpp b/src/models/messagecontentmodel.cpp
index 1ee186271..7de11f274 100644
--- a/src/models/messagecontentmodel.cpp
+++ b/src/models/messagecontentmodel.cpp
@@ -225,11 +225,6 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
if (m_event == nullptr) {
return QString();
}
- if (m_event->isRedacted()) {
- auto reason = m_event->redactedBecause()->reason();
- return (reason.isEmpty()) ? i18n("[This message was deleted]")
- : i18n("[This message was deleted: %1]", m_event->redactedBecause()->reason());
- }
if (!component.content.isEmpty()) {
return component.content;
}
diff --git a/src/models/messageeventmodel.cpp b/src/models/messageeventmodel.cpp
index 01383c918..09c738d0e 100644
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -433,11 +433,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
EventHandler eventHandler(m_currentRoom, &evt);
if (role == Qt::DisplayRole) {
- if (evt.isRedacted()) {
- auto reason = evt.redactedBecause()->reason();
- return (reason.isEmpty()) ? i18n("[This message was deleted]")
- : i18n("[This message was deleted: %1]", evt.redactedBecause()->reason().toHtmlEscaped());
- }
return eventHandler.getRichBody();
}