From: Philip Van Hoof <philip@codeminded.be>
Date: Mon, 3 Mar 2008 10:44:52 +0000 (+0000)
Subject: Bugfix for 81611
X-Git-Tag: git_migration_finished~1599
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=f4acb098c977ecd11d88eba443946ca7c0e53338

Bugfix for 81611

pmo-trunk-r4263
---

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index e8ddc50..48d8291 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1044,9 +1044,29 @@ get_account_from_header_list (TnyList *headers)
 		TnyIterator *iter = tny_list_create_iterator (headers);
 		TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
 		TnyFolder *folder = tny_header_get_folder (header);
-		account = tny_folder_get_account (folder);
-		g_object_unref (folder);
-		g_object_unref (header);
+		
+		if (!folder) {
+			g_object_unref (header);
+			
+			while (!tny_iterator_is_done (iter)) {
+				header = TNY_HEADER (tny_iterator_get_current (iter));
+				folder = tny_header_get_folder (header);
+				if (folder) 
+					break;
+				g_object_unref (header);
+				header = NULL;
+				tny_iterator_next (iter);
+			}
+		}
+
+		if (folder) {
+			account = tny_folder_get_account (folder);
+			g_object_unref (folder);
+		}
+		
+		if (header)
+			g_object_unref (header);
+		
 		g_object_unref (iter);
 	}
 	return account;