diff --git a/gajim/common/connection_handlers_events.py b/gajim/common/connection_handlers_events.py
index 758303e33..af99a0e58 100644
--- a/gajim/common/connection_handlers_events.py
+++ b/gajim/common/connection_handlers_events.py
@@ -1152,6 +1152,7 @@ class MamGcMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
             return False
 
         self.unique_id = self.get_stanza_id(self.result, query=True)
+        self.message_id = self.msg_.getID()
 
         # Check for duplicates
         if app.logger.find_stanza_id(account,
diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py
index 8f91c0772..b22d38f16 100644
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -1107,8 +1107,9 @@ class GroupchatControl(ChatControlBase):
             return
         self.print_conversation(
             obj.msgtxt, contact=obj.nick,
-            tim=obj.timestamp, encrypted=obj.encrypted,
-            msg_stanza_id=obj.unique_id,
+            tim=obj.timestamp, correct_id=obj.correct_id,
+            encrypted=obj.encrypted,
+            msg_stanza_id=obj.message_id,
             additional_data=obj.additional_data)
 
     def _nec_gc_message_received(self, obj):