diff --git a/gajim/common/modules/message.py b/gajim/common/modules/message.py
index c301cd213..8eef87fb0 100644
--- a/gajim/common/modules/message.py
+++ b/gajim/common/modules/message.py
@@ -213,7 +213,10 @@ class Message:
         groupchat = event.mtype == 'groupchat'
 
         # Determine timestamps
-        delay_jid = self._con.get_own_jid().getDomain()
+        if groupchat:
+            delay_jid = event.jid
+        else:
+            delay_jid = self._con.get_own_jid().getDomain()
         timestamp = parse_delay(event.stanza, from_=delay_jid)
         if timestamp is None:
             timestamp = time.time()