Index: album-ui.c
===================================================================
--- album-ui.c	(revision 106)
+++ album-ui.c	(working copy)
@@ -631,13 +631,17 @@
 	/* Show icons for all the accounts of the contact. */
 	if (list != NULL)
 	{
+		int id;
+
 		list = g_list_sort(list, (GCompareFunc)buddy_icon_compare);
 		success = (list != NULL);
 		key->list = list;
 
 		/* It's possible we already have one of these loops running, but
 		 * having two won't harm anything, so we don't do anything about it. */
-		g_idle_add(add_icon_from_list_cb, key);
+		id = g_idle_add(add_icon_from_list_cb, key);
+		g_object_set_data_full(G_OBJECT(iconview), "update-idle-callback",
+					GINT_TO_POINTER(id), (GDestroyNotify)g_source_remove);
 	}
 
 	if (!success)