1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index cc0d5525f..2233e22ac 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -141,7 +141,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     }
 
     public void deleteMessage(Message message) {
-        this.messages.remove(message);
+        synchronized (this.messages) {
+            this.messages.remove(message);
+        }
     }
 
     public Message getFirstUnreadMessage() {