From f8c251b0620ce40fe523ecf74b0af4c7cfbb3484 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Wed, 20 Aug 2025 10:20:17 -0400
Subject: [PATCH] Do not merge if true counterpart differs

---
 .../eu/siacs/conversations/ui/adapter/MessageAdapter.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index fc9397a37be931f1f5fdf9cda5ce1301831cc948..d5e71ee7056f0deb13f749c609b140687d42438d 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -1776,6 +1776,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 return false;
             }
         }
+        final var trueCounterA = a.getTrueCounterpart();
+        final var trueCounterB = b.getTrueCounterpart();
+        if ((trueCounterA != null || trueCounterB != null) && (trueCounterA == null || !trueCounterA.equals(trueCounterB))) {
+            return false;
+        }
         return b.getTimeSent() - a.getTimeSent() <= Config.MESSAGE_MERGE_WINDOW;
     }