diff --git a/toys/mug2/mug-msg-list-view.c b/toys/mug2/mug-msg-list-view.c
index abe44631..4c21d8bc 100644
--- a/toys/mug2/mug-msg-list-view.c
+++ b/toys/mug2/mug-msg-list-view.c
@@ -393,9 +393,14 @@ update_model (GtkListStore * store, const char *xpath, const char *query,
 	}
 
 	for (count = 0; !mu_msg_iter_is_done (iter);
-	     mu_msg_iter_next (iter), ++count)
+	     mu_msg_iter_next (iter), ++count) {
+
 		add_row (store, iter);
 
+		if (count % 50 == 0)
+			gtk_main_iteration ();
+	}
+
 	mu_msg_iter_destroy (iter);
 
 	return count;