X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=39dbea77a0a47b5acfd8aedbe375ece95a26d2d0;hp=70b0bdbfa725b293b4545bd40b32b12a8a6c543a;hb=85e6aca5e8c16f61f95e29b62ea295d785c9cbdf;hpb=bfd933c3b43405833c3c8f794479c16b0c29f49f

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 70b0bdb..39dbea7 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -717,6 +717,7 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self,
 			tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
 			tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
 			g_object_unref (header);
+			g_object_unref (folder);
 		}
 	}
 
@@ -1585,9 +1586,12 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
 		trash_folder = modest_tny_account_get_special_folder (account,
 								      TNY_FOLDER_TYPE_TRASH);
 		/* TODO: error_handling */
-		 modest_mail_operation_xfer_folder (self, folder,
+		if (trash_folder) {
+			modest_mail_operation_xfer_folder (self, folder,
 						    TNY_FOLDER_STORE (trash_folder), 
 						    TRUE, NULL, NULL);
+			g_object_unref (trash_folder);
+		}
 	} else {
 		TnyFolderStore *parent = tny_folder_get_folder_store (folder);