X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-view-window.c;h=772f4405589a145b0867b0ef48fe2ea67549a4bb;hb=5c0bea1874a655ba23a2df458e12faf9e23b3ae6;hp=3d8626b8dfc076b18f2033004d9c6b670c932c64;hpb=bcfdc265ed89edbef118c0dfd046c91fce175116;p=modest

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 3d8626b..772f440 100644
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -1947,7 +1947,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 */
@@ -2001,7 +2001,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;
 		}
 	}
@@ -2009,7 +2010,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)
@@ -2026,14 +2029,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;