diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index ab941516a888af6f4121d49c93442c56d59fd193..046bf12c4da962be8ef3b612774c72df2ef196ad 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -229,6 +229,9 @@ public class MessageGenerator extends AbstractGenerator {
         final var fallback = packet.addChild("fallback", "urn:xmpp:fallback:0").setAttribute("for", "urn:xmpp:reactions:0");
         fallback.addChild("body", "urn:xmpp:fallback:0");
 
+        final var thread = inReplyTo.getThread();
+        if (thread != null) packet.addChild(thread);
+
         packet.addChild("store", "urn:xmpp:hints");
         return packet;
     }