From 9ebb719d71b55fe952cc871e9a9a399c0af0e6e6 Mon Sep 17 00:00:00 2001
From: kosyak <kosyak@narayana.im>
Date: Sun, 17 Dec 2023 18:44:35 +0100
Subject: [PATCH] allow to merge private messages

---
 src/main/java/eu/siacs/conversations/entities/Message.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 5fe9128d7..04343bfaf 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -702,7 +702,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 
     public boolean mergeable(final Message message) {
         return message != null &&
-                (message.getType() == Message.TYPE_TEXT &&
+                ((message.getType() == Message.TYPE_TEXT || message.getType() == Message.TYPE_PRIVATE) &&
                         this.getTransferable() == null &&
                         message.getTransferable() == null &&
                         message.getEncryption() != Message.ENCRYPTION_PGP &&