--- a/mcabber/src/jabglue.c	Sun Nov 11 23:13:35 2007 +0100
+++ b/mcabber/src/jabglue.c	Mon Nov 12 19:27:55 2007 +0100
@@ -505,10 +505,8 @@
       room_presence.msg = msg;
       foreach_buddy(ROSTER_TYPE_ROOM, &roompresence, &room_presence);
     }
-  }
-
-  if (online) {
-    // We'll need to update the roster if we switch to/from offline because
+
+    // We'll have to update the roster if we switch to/from offline because
     // we don't know the presences of buddies when offline...
     if (mystatus == offline || st == offline)
       update_roster = TRUE;
@@ -516,8 +514,10 @@
     hk_mystatuschange(0, mystatus, st, (st != invisible ? msg : ""));
     mystatus = st;
   }
+
   if (st)
     mywantedstatus = st;
+
   if (msg != mystatusmsg) {
     g_free(mystatusmsg);
     if (*msg)