Preserver headers of messages in drafts and sending messages.

[modest] / src / widgets / modest-accounts-window.c

diff --git a/src/widgets/modest-accounts-window.c b/src/widgets/modest-accounts-window.c
index 646cb9b..2a46f28 100644 (file)
--- a/src/widgets/modest-accounts-window.c
+++ b/src/widgets/modest-accounts-window.c
@@ -489,6 +489,7 @@ on_account_activated (GtkTreeView *account_view,
        } else {
 
                new_window = GTK_WIDGET (modest_folder_window_new (NULL));
+               modest_window_set_active_account (MODEST_WINDOW (new_window), account_name);
        }
 
        registered = modest_window_mgr_register_window (modest_runtime_get_window_mgr (), 
@@ -748,10 +749,7 @@ on_delete_event (GtkWidget *widget,
 
        gdk_window_process_updates (priv->account_view->window, TRUE);
 
-       /* Take screenshot. We have to wait a bit to ensure that
-          screenshot is properly taken */
        hildon_gtk_window_take_screenshot (GTK_WINDOW (widget), TRUE);
-       g_usleep (G_USEC_PER_SEC);
 
        modest_account_view_set_show_last_update (MODEST_ACCOUNT_VIEW (priv->account_view), TRUE);
 #endif