X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-view-window.c;h=55192067a87bbdddc6a5ce89bf4e5aff288cf84f;hp=93637d4a31931a5f04c9d7c338a53868c17b1a1d;hb=2d993bd381d631c6b8527dbc19011138fccb7759;hpb=9de4a682c6c45422a713c5e3f53fcaed2618b3fb

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 93637d4..5519206 100644
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -1830,6 +1830,11 @@ message_reader (ModestMsgViewWindow *window,
 	mgr = modest_runtime_get_window_mgr ();
 	/* Msg download completed */
 	if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)) {
+
+		/* We set the header from model while we're loading */
+		tny_header_view_set_header (TNY_HEADER_VIEW (priv->msg_view), header);
+		gtk_window_set_title (GTK_WINDOW (window), _CS("ckdg_pb_updating"));
+
 		/* Ask the user if he wants to download the message if
 		   we're not online */
 		if (!tny_device_is_online (modest_runtime_get_device())) {
@@ -2785,7 +2790,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
 						      GTK_FILE_CHOOSER_ACTION_SAVE);
 
 	/* set folder */
-	folder = g_build_filename (g_get_home_dir (), g_getenv (MYDOCS_ENV), DOCS_FOLDER, NULL);
+	folder = g_build_filename (g_getenv (MYDOCS_ENV), DOCS_FOLDER, NULL);
 	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (save_dialog), folder);
 	g_free (folder);
 
@@ -3114,7 +3119,7 @@ setup_menu (ModestMsgViewWindow *self)
 					   APP_MENU_CALLBACK (modest_ui_actions_remove_attachments),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_remove_attachments));
 	
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_newemail"), "<Control>n",
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
 					   APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
 	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,