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 &&