diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index bd962cdfefea1385744fe58f3f6c2aa49ab06068..9953e2dbc8b068dec543de8b8c47df22c36c77e1 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1035,10 +1035,6 @@ class ConnectionHandlersBase:
             self.dispatch_error_message(obj.stanza, obj.msgtxt,
                 obj.session, obj.fjid, obj.timestamp)
             return True
-        elif obj.mtype == 'groupchat':
-            gajim.nec.push_incoming_event(GcMessageReceivedEvent(None,
-                conn=self, msg_obj=obj))
-            return True
         elif obj.invite_tag is not None:
             gajim.nec.push_incoming_event(GcInvitationReceivedEvent(None,
                 conn=self, msg_obj=obj))
@@ -1047,6 +1043,10 @@ class ConnectionHandlersBase:
             gajim.nec.push_incoming_event(GcDeclineReceivedEvent(None,
                 conn=self, msg_obj=obj))
             return True
+        elif obj.mtype == 'groupchat':
+            gajim.nec.push_incoming_event(GcMessageReceivedEvent(None,
+                conn=self, msg_obj=obj))
+            return True
 
     # process and dispatch an error message
     def dispatch_error_message(self, msg, msgtxt, session, frm, tim):
diff --git a/src/gui_interface.py b/src/gui_interface.py
index bfda4ea864ecf751584497b67c79b4713ad5a9b6..d9ba07c711172cf45e3610e7215ecadcdadada83 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -621,7 +621,7 @@ class Interface:
         if gc_control:
             gc_control.print_conversation(
                 _('%(jid)s declined the invitation: %(reason)s') % {
-                'jid': obj.room_jid, 'reason': obj.reason}, graphics=False)
+                'jid': obj.jid_from, 'reason': obj.reason}, graphics=False)
 
     def handle_event_gc_invitation(self, obj):
         #('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued))