diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index 5c73b9196..f7337402b 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -81,6 +81,10 @@ public class MessageGenerator extends AbstractGenerator {
             for (Element el : message.getPayloads()) {
                 packet.addChild(el);
             }
+        } else {
+            for (Element el : message.getPayloads()) {
+                if ("thread".equals(el.getName())) packet.addChild(el);
+            }
         }
         return packet;
     }