From b48522c59b0b62abd5bf72e8a8f725f13f6f1af7 Mon Sep 17 00:00:00 2001
From: Andrea Maria Piana <andrea.maria.piana@gmail.com>
Date: Wed, 8 Sep 2021 11:55:06 +0200
Subject: [PATCH] Fix removing message from map

---
 protocol/messenger_response.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/protocol/messenger_response.go b/protocol/messenger_response.go
index 13ea165cf..ce168502c 100644
--- a/protocol/messenger_response.go
+++ b/protocol/messenger_response.go
@@ -259,6 +259,11 @@ func (r *MessengerResponse) AddRemovedMessage(rm *RemovedMessage) {
 	}
 
 	r.removedMessages[rm.MessageID] = rm
+	// Remove original message from the map
+
+	if len(r.messages) != 0 && r.messages[rm.MessageID] != nil {
+		delete(r.messages, rm.MessageID)
+	}
 }
 
 func (r *MessengerResponse) AddActivityCenterNotifications(ns []*ActivityCenterNotification) {