diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 89016ba636b43cda6e5b8a3fe5dc8acd65a2cf9d..886535cc904ea43fcef6de2fefba5fe809a49dec 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -485,11 +485,14 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
             if (fasten != null) {
                 replaceElement = fasten.findChild("retract", "urn:xmpp:message-retract:0");
                 if (replaceElement == null) replaceElement = fasten.findChild("moderated", "urn:xmpp:message-moderate:0");
-                if (replaceElement != null) {
-                    final String reason = replaceElement.findChildContent("reason", "urn:xmpp:message-moderate:0");
-                    replacementId = fasten.getAttribute("id");
-                    packet.setBody(reason == null ? "" : reason);
-                }
+            }
+            if (replaceElement == null) replaceElement = packet.findChild("retract", "urn:xmpp:message-retract:1");
+            if (replaceElement == null) replaceElement = packet.findChild("moderate", "urn:xmpp:message-moderate:1");
+            if (replaceElement != null) {
+                var reason = replaceElement.findChildContent("reason", "urn:xmpp:message-moderate:0");
+                if (reason == null) reason = replaceElement.findChildContent("reason", "urn:xmpp:message-moderate:1");
+                replacementId = (fasten == null ? replaceElement : fasten).getAttribute("id");
+                packet.setBody(reason == null ? "" : reason);
             }
         }
         LocalizedContent body = packet.getBody();
diff --git a/src/main/java/im/conversations/android/xmpp/model/stanza/Message.java b/src/main/java/im/conversations/android/xmpp/model/stanza/Message.java
index 9b12bffb38f25467b5b4880829b7ce0f358fa858..ddbdb84551e8d456286aedaee1ac8126c8a4614f 100644
--- a/src/main/java/im/conversations/android/xmpp/model/stanza/Message.java
+++ b/src/main/java/im/conversations/android/xmpp/model/stanza/Message.java
@@ -46,6 +46,7 @@ public class Message extends Stanza {
     }
 
     public void setBody(final String text) {
+        removeChild(findChild("body"));
         this.addExtension(new Body(text));
     }