--- a/mcabber/mcabber/xmpp.c	Wed Dec 21 20:43:58 2016 +0100
+++ b/mcabber/mcabber/xmpp.c	Tue Nov 01 08:39:07 2016 +0100
@@ -142,7 +142,7 @@
 
   roster_add_user(cleanjid, name, group, ROSTER_TYPE_USER, sub_pending, -1);
   g_free(cleanjid);
-  buddylist_build();
+  buddylist_defer_build();
 
   update_roster = TRUE;
 }
@@ -229,7 +229,7 @@
 
   roster_del_user(cleanjid);
   g_free(cleanjid);
-  buddylist_build();
+  buddylist_defer_build();
 
   update_roster = TRUE;
 }
@@ -986,7 +986,7 @@
       buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);
     }
 
-    buddylist_build();
+    buddylist_defer_build();
     scr_draw_roster();
     goto gotmessage_return;
   }