--- a/mcabber/src/jabglue.c	Mon Oct 15 19:33:06 2007 +0200
+++ b/mcabber/src/jabglue.c	Sat Oct 20 19:37:11 2007 +0200
@@ -2294,6 +2294,10 @@
   g_free(r);
 }
 
+//  got_invite(from, to, reason, passwd)
+// This function should be called when receiving an invitation from user
+// "from", to enter the room "to".  Optional reason and room password can
+// be provided.
 static void got_invite(char* from, char *to, char* reason, char* passwd)
 {
   eviqs *evn;
@@ -2333,8 +2337,10 @@
   scr_WriteIncomingMessage(barejid, sbuf->str, 0, HBB_PREFIX_INFO, 0);
   scr_LogPrint(LPRINT_LOGNORM, "%s", sbuf->str);
   g_string_free(sbuf, TRUE);
-
-  // Make sure the barejid is a room in the roster
+  g_free(barejid);
+
+  // Make sure the MUC room barejid is a room in the roster
+  barejid = jidtodisp(to);
   room_elt = roster_find(barejid, jidsearch, 0);
   if (room_elt)
     buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);