diff --git a/src/e-util/e-attachment-view.c b/src/e-util/e-attachment-view.c
index d7d9efc44d..5565ce6133 100644
--- a/src/e-util/e-attachment-view.c
+++ b/src/e-util/e-attachment-view.c
@@ -1978,8 +1978,7 @@ e_attachment_view_drag_data_get (EAttachmentView *view,
 	/* We can't return until we have results, so crank
 	 * the main loop until the callback gets triggered. */
 	while (!status.done)
-		if (gtk_main_iteration ())
-			break;
+		g_main_context_iteration (NULL, TRUE);
 
 	if (status.uris) {
 		gtk_selection_data_set_uris (selection, status.uris);
diff --git a/src/mail/e-mail-migrate.c b/src/mail/e-mail-migrate.c
index e0c9f6d54b..2998045506 100644
--- a/src/mail/e-mail-migrate.c
+++ b/src/mail/e-mail-migrate.c
@@ -68,7 +68,7 @@ em_migrate_set_progress (double percent)
 	gtk_progress_bar_set_text (progress, text);
 
 	while (gtk_events_pending ())
-		gtk_main_iteration ();
+		g_main_context_iteration (NULL, TRUE);
 }
 
 enum {
diff --git a/src/modules/itip-formatter/itip-view.c b/src/modules/itip-formatter/itip-view.c
index 4c17f82db6..558162b2c1 100644
--- a/src/modules/itip-formatter/itip-view.c
+++ b/src/modules/itip-formatter/itip-view.c
@@ -5144,7 +5144,7 @@ get_uri_for_part (CamelMimePart *mime_part)
 	 * loop until the callback gets triggered. */
 	/* coverity[loop_condition] */
 	while (!status.done)
-		gtk_main_iteration ();
+		g_main_context_iteration (NULL, TRUE);
 
 	status.file = NULL;
 	status.done = FALSE;
@@ -5157,7 +5157,7 @@ get_uri_for_part (CamelMimePart *mime_part)
 	 * the main loop until the callback gets triggered. */
 	/* coverity[loop_condition] */
 	while (!status.done)
-		gtk_main_iteration ();
+		g_main_context_iteration (NULL, TRUE);
 
 	if (status.file != NULL) {
 		path = g_file_get_path (status.file);