diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index b1d57fef74cc7b7933866fe646cfd2ddbef7e040..ee51cf743b58e430cb165b04e9f9575ce22bd4c8 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -109,6 +109,7 @@ public class MessageGenerator extends AbstractGenerator {
             packet.addChild("x", Namespace.OOB).addChild("url").setContent(content);
             packet.addChild("fallback", "urn:xmpp:fallback:0").setAttribute("for", Namespace.OOB)
                   .addChild("body", "urn:xmpp:fallback:0");
+            message.setBody(content);
         } else {
             content = message.getBody();
         }