--- em-folder-browser.c	2006-09-30 07:24:41.000000000 +0200
+++ em-folder-browser.c.new	2006-10-07 00:04:57.000000000 +0200
@@ -1879,12 +1879,16 @@ emfb_set_folder(EMFolderView *emfv, Came
 		}
 
 		/* Fixme */
-		sstate = camel_object_meta_get(folder, "evolution:search_state");
-		g_object_set(emfb->search, "state", sstate, NULL);
-		g_free(sstate);
+		/* sstate = camel_object_meta_get(folder, "evolution:search_state"); */
+		/* g_object_set(emfb->search, "state", sstate, NULL); */
+		/* g_free(sstate); */
 		
 		/* set the query manually, so we dont pop up advanced or saved search stuff */
 
+		g_object_get(emfb->search, "query", &sstate, NULL);
+		message_list_set_search(emfb->view.list, sstate);
+		g_free(sstate);
+
 		if ((sstate = camel_object_meta_get (folder, "evolution:selected_uid"))) {
 			emfb->priv->select_uid = sstate;
 		} else {
