tom@linux1:~/src/evolution$ svn diff ./evolution-data-server/camel/providers/imap/camel-imap-command.c ./evolution/mail/em-folder-browser.c
Index: evolution-data-server/camel/providers/imap/camel-imap-command.c
===================================================================
--- evolution-data-server/camel/providers/imap/camel-imap-command.c	(Revision 9707)
+++ evolution-data-server/camel/providers/imap/camel-imap-command.c	(Arbeitskopie)
@@ -179,6 +179,9 @@
 {
 	ssize_t nwritten;
 
+	if (!camel_imap_store_connected(store, ex))
+		return FALSE;
+	
 	if (!store->ostream) {
 		camel_exception_set (ex, CAMEL_EXCEPTION_STORE_INVALID, _("No output stream"));
 		return FALSE;
Index: evolution/mail/em-folder-browser.c
===================================================================
--- evolution/mail/em-folder-browser.c	(Revision 36692)
+++ evolution/mail/em-folder-browser.c	(Arbeitskopie)
@@ -1254,7 +1254,33 @@
 				    }
 				    l = l->next;
 			    }
-
+          
+          EAccountList *accounts;
+          EAccount *account;
+          EIterator *iter;
+          
+          accounts = mail_config_get_accounts ();
+          iter = e_list_get_iterator ((EList *) accounts);
+          while (e_iterator_is_valid (iter)) {
+            char *curi;
+            account = (EAccount *) e_iterator_get (iter);
+            if (account->sent_folder_uri) {
+              curi = em_uri_to_camel(account->sent_folder_uri);
+              folder = mail_tool_uri_to_folder (curi, 0,ex);
+              if (folder) {
+                folder_list = g_list_append(folder_list, folder);
+              }             
+            }
+            if (account->drafts_folder_uri) {
+              curi = em_uri_to_camel(account->drafts_folder_uri);
+              folder = mail_tool_uri_to_folder(curi, 0, ex);
+              if (folder) {
+                folder_list = g_list_append(folder_list, folder);
+              }
+            }
+            e_iterator_next (iter);
+          }
+          
 			    efb->account_search_cancel = camel_operation_new (NULL, NULL);
 			    vfolder_setup ((CamelFolder *)efb->all_account_search_vf, search_word, NULL, folder_list, efb->account_search_cancel);
