From 4c6599b39579d53c7d7316ab223ba370fde9ff95 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian.schneppe@pix-art.de>
Date: Mon, 16 Mar 2020 19:38:31 +0100
Subject: do not merge oob messages

---
 src/main/java/de/pixart/messenger/entities/Message.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index b2297cd08..21ab33975 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -637,6 +637,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
                         !this.isGeoUri() &&
                         !message.isWebUri() &&
                         !this.isWebUri() &&
+                        !message.isOOb() &&
+                        !this.isOOb() &&
                         !message.treatAsDownloadable() &&
                         !this.treatAsDownloadable() &&
                         !message.getBody().startsWith(ME_COMMAND) &&
-- 
cgit v1.2.3