X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fmessageview.c;h=b1d065b05c37b201be883c2949c38d7fc4b3fd24;hp=189163c9b5f0c3eb79c373e19ecc70cab10b08cf;hb=20c2f0ef3ef1920d9879c404a465b658821f35f1;hpb=7ed2d41bb0ccdcc7cc5df14ed9520457c7733c36

diff --git a/src/messageview.c b/src/messageview.c
index 189163c9b..b1d065b05 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -830,6 +830,8 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 	}
 	headerview_show(messageview->headerview, messageview->msginfo);
 
+	messageview_set_position(messageview, 0);
+
 	textview_set_all_headers(messageview->mimeview->textview, 
 			messageview->all_headers);
 
@@ -852,8 +854,6 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 		g_free(subject);
 	}
 
-	messageview_set_position(messageview, 0);
-
 	main_create_mailing_list_menu(messageview->mainwin, messageview->msginfo);
 
 	if (messageview->msginfo->extradata
@@ -917,8 +917,17 @@ void messageview_destroy(MessageView *messageview)
 	}
 
 	if (messageview->updating) {
-		debug_print("uh oh, better not touch that now\n");
+		debug_print("uh oh, better not touch that now (fetching)\n");
+		messageview->deferred_destroy = TRUE;
+		gtk_widget_hide(messageview->window);
+		return;
+	}
+	
+	if (messageview->mimeview->textview
+	&&  messageview->mimeview->textview->loading) {
+		debug_print("uh oh, better not touch that now (loading text)\n");
 		messageview->deferred_destroy = TRUE;
+		messageview->mimeview->textview->stop_loading = TRUE;
 		gtk_widget_hide(messageview->window);
 		return;
 	}