--- a/mcabber/mcabber/screen.c	Sun Feb 07 17:11:52 2010 +0100
+++ b/mcabber/mcabber/screen.c	Sun Feb 07 17:34:00 2010 +0100
@@ -2589,6 +2589,7 @@
     p_closebuf = g_new(guint, 1);
     *p_closebuf = closebuf;
     buffer_purge((gpointer)cjid, win_entry, p_closebuf);
+    roster_msg_setflag(cjid, FALSE, FALSE);
     g_free(p_closebuf);
     if (closebuf && !hold_chatmode) {
       scr_set_chatmode(FALSE);
@@ -2600,11 +2601,14 @@
     hbuf_free(&win_entry->bd->hbuf);
     // Currently it can only be the status buffer
     statushbuf = NULL;
+    roster_msg_setflag(SPECIAL_BUFFER_STATUS_ID, TRUE, FALSE);
 
     win_entry->bd->cleared = FALSE;
     win_entry->bd->top = NULL;
   }
 
+  update_roster = TRUE;
+
   // Refresh the window
   scr_UpdateBuddyWindow();