diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 3d547f2e5d0f974e2ba7ddbbfeebbcab5e2e0c37..de6a21d6163106baa2e565d62f5e3263b7eb14b8 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -4995,8 +4995,7 @@ public class XmppConnectionService extends Service {
                     message.setServerMsgId(serverMessageId);
                 }
                 if (message.getEncryption() == Message.ENCRYPTION_NONE
-                        && message.isTypeText()
-                        && isBodyModified(message, body)) {
+                        && message.isTypeText() && (body != null || html != null)) {
                     message.setBody(body.content);
                     message.setHtml(html);
                     if (body.count > 1) {
@@ -5013,13 +5012,6 @@ public class XmppConnectionService extends Service {
         }
     }
 
-    private static boolean isBodyModified(final Message message, final LocalizedContent body) {
-        if (body == null || body.content == null) {
-            return false;
-        }
-        return !body.content.equals(message.getBody());
-    }
-
     public void markMessage(Message message, int status) {
         markMessage(message, status, null);
     }