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

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 99e202b..feb88c3 100644
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -1953,6 +1953,9 @@ message_reader (ModestMsgViewWindow *window,
 	tny_header_view_set_header (TNY_HEADER_VIEW (priv->msg_view), header);
 	gtk_window_set_title (GTK_WINDOW (window), _CS("ckdg_pb_updating"));
 
+	if (header)
+		folder = NULL;
+
 	if (folder)
 		g_object_ref (folder);
 
@@ -2023,7 +2026,8 @@ message_reader (ModestMsgViewWindow *window,
 
 	message_reader_performer (FALSE, NULL, (GtkWindow *) window, account, info);
 	g_object_unref (account);
-	g_object_unref (folder);
+	if (folder)
+		g_object_unref (folder);
 
 	return TRUE;
 }