From 08bc3ca0d522e05ea4d8cc8bb4eed798aefe5a17 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 2 Mar 2020 11:10:38 +0100
Subject: [PATCH] do not merge oob messages

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

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 360103aa0..e44d2a2c0 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -613,6 +613,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 						this.getBody().length() + message.getBody().length() <= Config.MAX_DISPLAY_MESSAGE_CHARS &&
 						!message.isGeoUri() &&
 						!this.isGeoUri() &&
+						!message.isOOb() &&
+						!this.isOOb() &&
 						!message.treatAsDownloadable() &&
 						!this.treatAsDownloadable() &&
 						!message.getBody().startsWith(ME_COMMAND) &&