diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 9ec894a..7f48b69 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -136,24 +136,10 @@ em_migrate_setup_progress_dialog (const gchar *title, const gchar *desc)
 	gtk_widget_show (vbox);
 	gtk_container_add ((GtkContainer *) window, vbox);
 
-	w = gtk_label_new (desc);
-
-	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
-	gtk_widget_show (w);
-	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
-
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
 
-	label = (GtkLabel *) gtk_label_new ("");
-	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
-
-	progress = (GtkProgressBar *) gtk_progress_bar_new ();
-	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
-
 	/* Prepare the message */
 	vbox = gtk_vbox_new (FALSE, 12);
 	gtk_widget_show (vbox);
@@ -185,7 +171,7 @@ em_migrate_setup_progress_dialog (const gchar *title, const gchar *desc)
 	gtk_widget_show (GTK_WIDGET (progress));
 	gtk_box_pack_start (GTK_BOX (w), GTK_WIDGET (progress), TRUE, TRUE, 0);
 
-	gtk_container_add (GTK_CONTAINER (window), hbox);
+	//gtk_container_add (GTK_CONTAINER (window), hbox);
 	gtk_widget_show_all (hbox);
 	gtk_widget_show (window);
 }
@@ -1016,8 +1002,9 @@ migrate_local_store (EShellBackend *shell_backend)
 {
 	EMMigrateSession *session;
 	const gchar *data_dir;
+	EAccountList *accounts;
 	gchar *local_store;
-	gint response;
+	gint response, i=0, len;
 
 	if (!mbox_to_maildir_migration_needed (shell_backend))
 		return TRUE;
@@ -1028,8 +1015,21 @@ migrate_local_store (EShellBackend *shell_backend)
 
 	if (response == GTK_RESPONSE_CANCEL)
 		exit (EXIT_SUCCESS);
+	
+	if (!(accounts = e_get_account_list ()))
+		return;
+	
+	len = e_list_length ((EList *) accounts);
 
+	em_migrate_setup_progress_dialog (
+		_("Migrating Folders"),
+		_("The summary format of the Evolution mailbox "
+		  "folders has been moved to SQLite since Evolution 2.24.\n\nPlease be "
+		  "patient while Evolution migrates your folders..."));
+
+	em_migrate_set_progress ( (double)i++/(len+1));
 	rename_mbox_dir (shell_backend);
+	em_migrate_set_progress ( (double)i++/(len+1));
 	data_dir = e_shell_backend_get_data_dir (shell_backend);
 	local_store = g_build_filename (data_dir, "local", NULL);
 
@@ -1040,7 +1040,10 @@ migrate_local_store (EShellBackend *shell_backend)
 	camel_session_set_online (CAMEL_SESSION (session), FALSE);
 
 	migrate_mbox_to_maildir (shell_backend, session);
+	em_migrate_set_progress ( (double)i++/(len+1));
 	create_mbox_account (shell_backend, session);
+	em_migrate_set_progress ( (double)i/(len+1));
+	em_migrate_close_progress_dialog ();
 
 	g_object_unref (session);
 
