Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3815
diff -u -r1.3815 ChangeLog
--- ChangeLog	3 Mar 2006 10:03:25 -0000	1.3815
+++ ChangeLog	3 Mar 2006 12:46:06 -0000
@@ -1,3 +1,9 @@
+2006-03-03  Jeff Cai <jeff.cai@sun.com>
+
+	** Fixes 333243
+	* em-folder-tree-model.c: (em_folder_tree_model_remove_folders):
+	For null uri, don't need remove it.
+
 2006-03-03  Žygimantas Beručka  <zygis@gnome.org>
 
 	* default/Makefile.am: Added Lithuanian to SUBDIRS.
Index: em-folder-tree-model.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-tree-model.c,v
retrieving revision 1.74
diff -u -r1.74 em-folder-tree-model.c
--- em-folder-tree-model.c	10 Jan 2006 08:10:30 -0000	1.74
+++ em-folder-tree-model.c	3 Mar 2006 12:46:06 -0000
@@ -898,7 +898,8 @@
 		gtk_tree_row_reference_free (row);
 	}
 	
-	em_folder_tree_model_remove_uri (model, uri);
+	if (uri)
+		em_folder_tree_model_remove_uri (model, uri);
 	
 	gtk_tree_store_remove ((GtkTreeStore *) model, toplevel);
 	
