diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index b839b8efa8ab7872290882c90270d6979f0e0099..652a35233790bfc7e8ef69e176a8ba1d3493c4db 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1029,8 +1029,12 @@ public class XmppConnectionService extends Service {
 
     private void directReply(final Conversation conversation, final String body, final String lastMessageUuid, final boolean dismissAfterReply) {
         final Message inReplyTo = lastMessageUuid == null ? null : conversation.findMessageWithUuid(lastMessageUuid);
-        final Message message = new Message(conversation, body, conversation.getNextEncryption());
-        if (inReplyTo != null) message.setThread(inReplyTo.getThread());
+        Message message = new Message(conversation, body, conversation.getNextEncryption());
+        if (inReplyTo != null) {
+            message = inReplyTo.reply();
+            message.appendBody(body);
+            message.setEncryption(conversation.getNextEncryption());
+        }
         if (inReplyTo != null && inReplyTo.isPrivateMessage()) {
             Message.configurePrivateMessage(message, inReplyTo.getCounterpart());
         }