X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-view-window.c;h=8f481f0ecc51ff5051bec6656b46330e69e2db6a;hb=83d48eebc8a2124f1e358c6a481221f268c983fd;hp=feb88c3bada8f639930c652e8774b77691f24a3e;hpb=91a531ee4468a77c332d9a1277e0a3aa1deadabf;p=modest

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index feb88c3..8f481f0 100644
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -230,7 +230,6 @@ static gboolean _modest_msg_view_window_map_event (GtkWidget *widget,
 						   gpointer userdata);
 static void update_branding (ModestMsgViewWindow *self);
 
-
 /* list my signals */
 enum {
 	MSG_CHANGED_SIGNAL,
@@ -290,22 +289,48 @@ static void
 save_state (ModestWindow *self)
 {
 	modest_widget_memory_save (modest_runtime_get_conf (),
-				   G_OBJECT(self), 
+				   G_OBJECT(self),
 				   MODEST_CONF_MSG_VIEW_WINDOW_KEY);
 }
 
-static 
-gboolean modest_msg_view_window_scroll_child (ModestMsgViewWindow *self,
-					      GtkScrollType scroll_type,
-					      gboolean horizontal,
-					      gpointer userdata)
+static gboolean
+modest_msg_view_window_scroll_child (ModestMsgViewWindow *self,
+				     GtkScrollType scroll_type,
+				     gboolean horizontal,
+				     gpointer userdata)
 {
 	ModestMsgViewWindowPrivate *priv;
-	gboolean return_value;
+	gint step = 0;
 
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
-	g_signal_emit_by_name (priv->main_scroll, "scroll-child", scroll_type, horizontal, &return_value);
-	return return_value;
+
+	switch (scroll_type) {
+	case GTK_SCROLL_STEP_UP:
+		step = -1;
+		break;
+	case GTK_SCROLL_STEP_DOWN:
+		step = +1;
+		break;
+	case GTK_SCROLL_PAGE_UP:
+		step = -6;
+		break;
+	case GTK_SCROLL_PAGE_DOWN:
+		step = +6;
+		break;
+	case GTK_SCROLL_START:
+		step = -100;
+		break;
+	case GTK_SCROLL_END:
+		step = +100;
+		break;
+	default:
+		step = 0;
+	}
+
+	if (step)
+		modest_maemo_utils_scroll_pannable((HildonPannableArea *) priv->main_scroll, 0, step);
+
+	return (gboolean) step;
 }
 
 static void
@@ -314,7 +339,7 @@ add_scroll_binding (GtkBindingSet *binding_set,
 		    GtkScrollType scroll)
 {
 	guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left;
-	
+
 	gtk_binding_entry_add_signal (binding_set, keyval, 0,
 				      "scroll_child", 2,
 				      GTK_TYPE_SCROLL_TYPE, scroll,
@@ -505,6 +530,10 @@ init_window (ModestMsgViewWindow *obj)
 	modest_msg_view_set_shadow_type (MODEST_MSG_VIEW (priv->msg_view), GTK_SHADOW_NONE);
 	main_vbox = gtk_vbox_new  (FALSE, 6);
 	priv->main_scroll = hildon_pannable_area_new ();
+        g_object_set (G_OBJECT (priv->main_scroll),
+		      "mov-mode", HILDON_MOVEMENT_MODE_BOTH,
+		      "hovershoot-max", 0,
+		      NULL);
 	gtk_container_add (GTK_CONTAINER (priv->main_scroll), priv->msg_view);
 	gtk_box_pack_start (GTK_BOX(main_vbox), priv->main_scroll, TRUE, TRUE, 0);
 	gtk_container_add   (GTK_CONTAINER(obj), main_vbox);
@@ -855,7 +884,7 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg,
 	/* Setup row references and connect signals */
 	priv->header_model = g_object_ref (model);
 
-	if (row_reference) {
+	if (row_reference && gtk_tree_row_reference_valid (row_reference)) {
 		priv->row_reference = gtk_tree_row_reference_copy (row_reference);
 		priv->next_row_reference = gtk_tree_row_reference_copy (row_reference);
 		select_next_valid_row (model, &(priv->next_row_reference), TRUE, priv->is_outbox);
@@ -1022,7 +1051,7 @@ modest_msg_view_window_new_from_header_view (ModestHeaderView *header_view,
 	priv->header_model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
 	g_object_ref (priv->header_model);
 
-	if (row_reference) {
+	if (row_reference && gtk_tree_row_reference_valid (row_reference)) {
 		priv->row_reference = gtk_tree_row_reference_copy (row_reference);
 		priv->next_row_reference = gtk_tree_row_reference_copy (row_reference);
 		select_next_valid_row (priv->header_model, &(priv->next_row_reference), TRUE, priv->is_outbox);
@@ -1057,17 +1086,18 @@ modest_msg_view_window_new_from_header_view (ModestHeaderView *header_view,
 	tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), NULL);
 	update_branding (MODEST_MSG_VIEW_WINDOW (window));
 
-	path = gtk_tree_row_reference_get_path (row_reference);
-	if (gtk_tree_model_get_iter (priv->header_model, &iter, path)) {
-		TnyHeader *header;
-		gtk_tree_model_get (priv->header_model, &iter, 
-				    TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
-				    &header, -1);
-		message_reader (window, priv, header, NULL, NULL, row_reference);
-		g_object_unref (header);
+	if (priv->row_reference) {
+		path = gtk_tree_row_reference_get_path (priv->row_reference);
+		if (gtk_tree_model_get_iter (priv->header_model, &iter, path)) {
+			TnyHeader *header;
+			gtk_tree_model_get (priv->header_model, &iter, 
+					    TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+					    &header, -1);
+			message_reader (window, priv, header, NULL, NULL, priv->row_reference);
+			g_object_unref (header);
+		}
+		gtk_tree_path_free (path);
 	}
-	gtk_tree_path_free (path);
-
 	/* Check dimming rules */
 	modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
 	modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
@@ -1681,7 +1711,6 @@ modest_msg_view_window_zoom_minus (ModestWindow *window)
 	modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom_level);
 
 	return TRUE;
-	
 }
 
 static gboolean
@@ -1701,52 +1730,11 @@ modest_msg_view_window_key_event (GtkWidget *window,
 			gtk_widget_event (focus, copy);
 			gdk_event_free (copy);
 			return TRUE;
-		} else 
-			return FALSE;
-	}
-	if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up ||
-	    event->keyval == GDK_Down || event->keyval == GDK_KP_Down ||
-	    event->keyval == GDK_Page_Up || event->keyval == GDK_KP_Page_Up ||
-	    event->keyval == GDK_Page_Down || event->keyval == GDK_KP_Page_Down ||
-	    event->keyval == GDK_Home || event->keyval == GDK_KP_Home ||
-	    event->keyval == GDK_End || event->keyval == GDK_KP_End) {
-		/* ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); */
-		/* gboolean return_value; */
-
-		if (event->type == GDK_KEY_PRESS) {
-			GtkScrollType scroll_type;
-
-			switch (event->keyval) {
-			case GDK_Up: 
-			case GDK_KP_Up:
-				scroll_type = GTK_SCROLL_STEP_UP; break;
-			case GDK_Down: 
-			case GDK_KP_Down:
-				scroll_type = GTK_SCROLL_STEP_DOWN; break;
-			case GDK_Page_Up:
-			case GDK_KP_Page_Up:
-				scroll_type = GTK_SCROLL_PAGE_UP; break;
-			case GDK_Page_Down:
-			case GDK_KP_Page_Down:
-				scroll_type = GTK_SCROLL_PAGE_DOWN; break;
-			case GDK_Home:
-			case GDK_KP_Home:
-				scroll_type = GTK_SCROLL_START; break;
-			case GDK_End:
-			case GDK_KP_End:
-				scroll_type = GTK_SCROLL_END; break;
-			default: scroll_type = GTK_SCROLL_NONE;
-			}
-
-			/* g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child",  */
-			/* 		       scroll_type, FALSE, &return_value); */
-			return FALSE;
 		} else {
 			return FALSE;
 		}
-	} else {
-		return FALSE;
 	}
+	return FALSE;
 }
 
 gboolean
@@ -1946,7 +1934,7 @@ message_reader (ModestMsgViewWindow *window,
 		GtkTreeRowReference *row_reference)
 {
 	ModestWindowMgr *mgr;
-	TnyAccount *account;
+	TnyAccount *account = NULL;
 	MsgReaderInfo *info;
 
 	/* We set the header from model while we're loading */
@@ -2000,7 +1988,8 @@ message_reader (ModestMsgViewWindow *window,
 								       TNY_FOLDER_STORE (folder),
 								       message_reader_performer, 
 								       info);
-			g_object_unref (folder);
+			if (folder)
+				g_object_unref (folder);
 			return TRUE;
 		}
 	}
@@ -2008,7 +1997,9 @@ message_reader (ModestMsgViewWindow *window,
 	if (header) {
 		folder = tny_header_get_folder (header);
 	}
-	account = tny_folder_get_account (folder);
+        if (folder)
+		account = tny_folder_get_account (folder);
+
 	info = g_slice_new (MsgReaderInfo);
 	info->msg_uid = g_strdup (msg_uid);
 	if (folder)
@@ -2025,14 +2016,15 @@ message_reader (ModestMsgViewWindow *window,
 		info->row_reference = NULL;
 
 	message_reader_performer (FALSE, NULL, (GtkWindow *) window, account, info);
-	g_object_unref (account);
+        if (account)
+		g_object_unref (account);
 	if (folder)
 		g_object_unref (folder);
 
 	return TRUE;
 }
 
-gboolean        
+gboolean
 modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
 {
 	ModestMsgViewWindowPrivate *priv;
@@ -2055,9 +2047,14 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
 	   tree models and reports the deletion when the row is still
 	   there */
 	if (!gtk_tree_row_reference_valid (priv->next_row_reference)) {
+		if (priv->next_row_reference) {
+			gtk_tree_row_reference_free (priv->next_row_reference);
+		}
 		if (gtk_tree_row_reference_valid (priv->row_reference)) {
 			priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
 			select_next_valid_row (priv->header_model, &(priv->next_row_reference), FALSE, priv->is_outbox);
+		} else {
+			priv->next_row_reference = NULL;
 		}
 	}
 	if (priv->next_row_reference)
@@ -2099,6 +2096,11 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window)
 	g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE);
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 
+	if (priv->row_reference && !gtk_tree_row_reference_valid (priv->row_reference)) {
+		gtk_tree_row_reference_free (priv->row_reference);
+		priv->row_reference = NULL;
+	}
+
 	/* Return inmediatly if there is no header model */
 	if (!priv->header_model || !priv->row_reference)
 		return FALSE;
@@ -2180,12 +2182,16 @@ view_msg_cb (ModestMailOperation *mail_op,
 	/* Update the row reference */
 	if (priv->row_reference != NULL) {
 		gtk_tree_row_reference_free (priv->row_reference);
-		priv->row_reference = gtk_tree_row_reference_copy (row_reference);
+		priv->row_reference = (row_reference && gtk_tree_row_reference_valid (row_reference))?gtk_tree_row_reference_copy (row_reference):NULL;
 		if (priv->next_row_reference != NULL) {
 			gtk_tree_row_reference_free (priv->next_row_reference);
 		}
-		priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
-		select_next_valid_row (priv->header_model, &(priv->next_row_reference), TRUE, priv->is_outbox);
+		if (priv->row_reference) {
+			priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
+			select_next_valid_row (priv->header_model, &(priv->next_row_reference), TRUE, priv->is_outbox);
+		} else {
+			priv->next_row_reference = NULL;
+		}
 	}
 
 	/* Mark header as read */
@@ -2253,7 +2259,7 @@ modest_msg_view_window_update_priority (ModestMsgViewWindow *window)
 
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 
-	if (priv->header_model && priv->row_reference) {
+	if (priv->header_model && priv->row_reference && gtk_tree_row_reference_valid (priv->row_reference)) {
 		GtkTreeIter iter;
 		GtkTreePath *path = NULL;
 
@@ -2655,7 +2661,11 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window,
 							       &filepath);
 
 		if (temp_stream != NULL) {
+			ModestAccountMgr *mgr;
 			DecodeAsyncHelper *helper;
+			gboolean decode_in_provider;
+			ModestProtocol *protocol;
+			const gchar *account; 
 
 			/* Activate progress hint */
 			set_progress_hint (window, TRUE);
@@ -2664,10 +2674,28 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window,
 			helper->self = g_object_ref (window);
 			helper->file_path = g_strdup (filepath);
 
-			tny_mime_part_decode_to_stream_async (mime_part, TNY_STREAM (temp_stream),
-							      on_decode_to_stream_async_handler,
-							      NULL,
-							      helper);
+			decode_in_provider = FALSE;
+			mgr = modest_runtime_get_account_mgr ();
+			account = modest_window_get_active_account (MODEST_WINDOW (window));
+			if (modest_account_mgr_account_is_multimailbox (mgr, account, &protocol)) {
+				if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) {
+					decode_in_provider = 
+						modest_account_protocol_decode_part_to_stream_async (
+							MODEST_ACCOUNT_PROTOCOL (protocol),
+							mime_part,
+							NULL,
+							TNY_STREAM (temp_stream),
+							on_decode_to_stream_async_handler,
+							NULL,
+							helper);
+				}
+			}
+
+			if (!decode_in_provider)
+				tny_mime_part_decode_to_stream_async (mime_part, TNY_STREAM (temp_stream),
+								      on_decode_to_stream_async_handler,
+								      NULL,
+								      helper);
 			g_object_unref (temp_stream);
 			/* NOTE: files in the temporary area will be automatically
 			 * cleaned after some time if they are no longer in use */
@@ -2774,6 +2802,7 @@ typedef struct
 	GList *pairs;
 	GnomeVFSResult result;
 	gchar *uri;
+	ModestMsgViewWindow *window;
 } SaveMimePartInfo;
 
 static void save_mime_part_info_free (SaveMimePartInfo *info, gboolean with_struct);
@@ -2795,6 +2824,8 @@ save_mime_part_info_free (SaveMimePartInfo *info, gboolean with_struct)
 	g_list_free (info->pairs);
 	info->pairs = NULL;
 	g_free (info->uri);
+	g_object_unref (info->window);
+	info->window = NULL;
 	if (with_struct) {
 		g_slice_free (SaveMimePartInfo, info);
 	}
@@ -2838,8 +2869,33 @@ save_mime_part_to_file (SaveMimePartInfo *info)
 	info->result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0644);
 	if (info->result == GNOME_VFS_OK) {
 		GError *error = NULL;
+		gboolean decode_in_provider;
+		gssize written;
+		ModestAccountMgr *mgr;
+		const gchar *account;
+		ModestProtocol *protocol = NULL;
+
 		stream = tny_vfs_stream_new (handle);
-		if (tny_mime_part_decode_to_stream (pair->part, stream, &error) < 0) {
+
+		decode_in_provider = FALSE;
+		mgr = modest_runtime_get_account_mgr ();
+		account = modest_window_get_active_account (MODEST_WINDOW (info->window));
+		if (modest_account_mgr_account_is_multimailbox (mgr, account, &protocol)) {
+			if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) {
+				decode_in_provider = 
+					modest_account_protocol_decode_part_to_stream (
+						MODEST_ACCOUNT_PROTOCOL (protocol),
+						pair->part,
+						pair->filename,
+						stream,
+						&written,
+						&error);
+			}
+		}
+		if (!decode_in_provider)
+			written = tny_mime_part_decode_to_stream (pair->part, stream, &error);
+
+		if (written < 0) {
 			g_warning ("modest: could not save attachment %s: %d (%s)\n", pair->filename, error?error->code:-1, error?error->message:"Unknown error");
 
 			if ((error->domain == TNY_ERROR_DOMAIN) && 
@@ -2878,11 +2934,14 @@ save_mime_parts_to_file_with_checks (GtkWindow *parent,
 
         for (iter = files; (iter != NULL) && (replaced_files < 2); iter = g_list_next(iter)) {
                 SaveMimePartPair *pair = iter->data;
-                if (modest_utils_file_exists (pair->filename)) {
+		gchar *unescaped = g_uri_unescape_string (pair->filename, NULL);
+
+                if (modest_utils_file_exists (unescaped)) {
 			replaced_files++;
 			if (replaced_files == 1)
 				to_replace = iter;
                 }
+		g_free (unescaped);
         }
 	if (replaced_files) {
 		gint response;
@@ -2915,6 +2974,11 @@ save_mime_parts_to_file_with_checks (GtkWindow *parent,
 
 }
 
+typedef struct _SaveAttachmentsInfo {
+	TnyList *attachments_list;
+	ModestMsgViewWindow *window;
+} SaveAttachmentsInfo;
+
 static void
 save_attachments_response (GtkDialog *dialog,
 			   gint       arg1,
@@ -2924,17 +2988,18 @@ save_attachments_response (GtkDialog *dialog,
 	gchar *chooser_uri;
 	GList *files_to_save = NULL;
 	gchar *current_folder;
+	SaveAttachmentsInfo *sa_info = (SaveAttachmentsInfo *) user_data;
 
-	mime_parts = TNY_LIST (user_data);
+	mime_parts = TNY_LIST (sa_info->attachments_list);
 
 	if (arg1 != GTK_RESPONSE_OK)
 		goto end;
 
 	chooser_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
 	current_folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog));
-	if (current_folder && current_folder != '\0') {
+	if (current_folder && *current_folder != '\0') {
 		GError *err = NULL;
-		modest_conf_set_string (modest_runtime_get_conf (), MODEST_CONF_LATEST_SAVE_ATTACHMENT_PATH, 
+		modest_conf_set_string (modest_runtime_get_conf (), MODEST_CONF_LATEST_SAVE_ATTACHMENT_PATH,
 					current_folder,&err);
 		if (err != NULL) {
 			g_debug ("Error storing latest used folder: %s", err->message);
@@ -2944,8 +3009,18 @@ save_attachments_response (GtkDialog *dialog,
 	g_free (current_folder);
 
 	if (!modest_utils_folder_writable (chooser_uri)) {
-		hildon_banner_show_information 
-			(NULL, NULL, _FM("sfil_ib_readonly_location"));
+		const gchar *err_msg;
+
+#ifdef MODEST_PLATFORM_MAEMO
+		if (modest_maemo_utils_in_usb_mode ()) {
+			err_msg = dgettext ("hildon-status-bar-usb", "usbh_ib_mmc_usb_connected");
+		} else {
+			err_msg = _FM("sfil_ib_readonly_location");
+		}
+#else
+		err_msg = _FM("sfil_ib_readonly_location");
+#endif
+		hildon_banner_show_information (NULL, NULL, err_msg);
 	} else {
 		TnyIterator *iter;
 
@@ -2981,6 +3056,7 @@ save_attachments_response (GtkDialog *dialog,
 		info->pairs = files_to_save;
 		info->result = TRUE;
 		info->uri = g_strdup (chooser_uri);
+		info->window = g_object_ref (sa_info->window);
 		save_mime_parts_to_file_with_checks ((GtkWindow *) dialog, info);
 	}
 	g_free (chooser_uri);
@@ -2988,6 +3064,8 @@ save_attachments_response (GtkDialog *dialog,
  end:
 	/* Free and close the dialog */
 	g_object_unref (mime_parts);
+	g_object_unref (sa_info->window);
+	g_slice_free (SaveAttachmentsInfo, sa_info);
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
@@ -3000,6 +3078,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window,
 	gchar *conf_folder = NULL;
 	gchar *filename = NULL;
 	gchar *save_multiple_str = NULL;
+	const gchar *root_folder = "file:///";
 
 	g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
@@ -3052,14 +3131,26 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window,
 	save_dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), 
 						      GTK_FILE_CHOOSER_ACTION_SAVE);
 
-	/* set folder */
-	conf_folder = modest_conf_get_string (modest_runtime_get_conf (), MODEST_CONF_LATEST_SAVE_ATTACHMENT_PATH, NULL);
+	/* Get last used folder */
+	conf_folder = modest_conf_get_string (modest_runtime_get_conf (),
+					      MODEST_CONF_LATEST_SAVE_ATTACHMENT_PATH, NULL);
+
+	/* File chooser stops working if we select "file:///" as current folder */
+	if (conf_folder && g_ascii_strcasecmp (root_folder, conf_folder) != 0) {
+		g_free (conf_folder);
+		conf_folder = NULL;
+	}
+
 	if (conf_folder && conf_folder[0] != '\0') {
 		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (save_dialog), conf_folder);
 	} else {
 		gchar *docs_folder;
-		/* Set the default folder to images folder */
-		docs_folder = g_build_filename (g_getenv (MYDOCS_ENV), DOCS_FOLDER, NULL);
+		/* Set the default folder to documents folder */
+		docs_folder = (gchar *) g_strdup(g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
+		if (!docs_folder) {
+			/* fallback */
+			docs_folder = g_build_filename (g_getenv (MYDOCS_ENV), DOCS_FOLDER, NULL);
+		}
 		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (save_dialog), docs_folder);
 		g_free (docs_folder);
 	}
@@ -3076,13 +3167,18 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window,
 	if (save_multiple_str) {
 		g_object_set (G_OBJECT (save_dialog), "save-multiple", save_multiple_str, NULL);
 		gtk_window_set_title (GTK_WINDOW (save_dialog), _FM("sfil_ti_save_objects_files"));
+		g_free (save_multiple_str);
 	}
 
 	/* We must run this asynchronously, because the hildon dialog
 	   performs a gtk_dialog_run by itself which leads to gdk
 	   deadlocks */
+	SaveAttachmentsInfo *sa_info;
+	sa_info = g_slice_new (SaveAttachmentsInfo);
+	sa_info->attachments_list = mime_parts;
+	sa_info->window = g_object_ref (window);
 	g_signal_connect (save_dialog, "response", 
-			  G_CALLBACK (save_attachments_response), mime_parts);
+			  G_CALLBACK (save_attachments_response), sa_info);
 
 	gtk_widget_show_all (save_dialog);
 }
@@ -3574,18 +3670,38 @@ void
 modest_msg_view_window_reload (ModestMsgViewWindow *self)
 {
 	ModestMsgViewWindowPrivate *priv;
-	TnyHeader *header;
+	const gchar *msg_uid;
+	TnyHeader *header = NULL;
+	TnyFolder *folder = NULL;
 
 	g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self));
 
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
-	header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (self));	
 
-	if (!message_reader (self, priv, header, NULL, NULL, priv->row_reference)) {
-		g_warning ("Shouldn't happen, trying to reload a message failed");
-	}
+	header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (self));
+	if (!header)
+		return;
 
+	folder = tny_header_get_folder (header);
 	g_object_unref (header);
+
+	if (!folder)
+		return;
+
+	msg_uid = modest_msg_view_window_get_message_uid (self);
+        if (msg_uid) {
+		GtkTreeRowReference *row_reference;
+
+		if (priv->row_reference && gtk_tree_row_reference_valid (priv->row_reference)) {
+			row_reference = priv->row_reference;
+		} else {
+			row_reference = NULL;
+		}
+		if (!message_reader (self, priv, NULL, msg_uid, folder, row_reference))
+			g_warning ("Shouldn't happen, trying to reload a message failed");
+	}
+
+	g_object_unref (folder);
 }
 
 static void