--- ../../../../SOURCES/evolution-2.25.1/mail/em-folder-tree-model.c	2008-10-13 17:09:15.000000000 +0800
+++ em-folder-tree-model.c	2008-12-03 15:23:22.325005000 +0800
@@ -447,10 +447,17 @@
 	gboolean emitted = FALSE;
 	const char *name;
 	guint32 flags;
+	char *folder_name;
 
 	/* make sure we don't already know about it? */
-	if (g_hash_table_lookup (si->full_hash, fi->full_name))
+	if (g_hash_table_lookup (si->full_hash, fi->full_name)) {
+		gtk_tree_model_get((GtkTreeModel *)model, iter, COL_STRING_FULL_NAME, &folder_name, -1);
+		if (folder_name == NULL) {
+			/* remove the folder if the folder_name is null */
+			gtk_tree_store_remove((GtkTreeStore*)model, iter);
+		}
 		return;
+	}
 	
 	if (!fully_loaded)
 		load = fi->child == NULL && !(fi->flags & (CAMEL_FOLDER_NOCHILDREN | CAMEL_FOLDER_NOINFERIORS));
