Index: mail/ChangeLog
===================================================================
--- mail/ChangeLog	(revision 36026)
+++ mail/ChangeLog	(working copy)
@@ -1,3 +1,11 @@
+2008-08-20  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #337082
+
+	* em-folder-tree.c: (emft_tree_row_expanded): Do not set we finished
+	with loading until we are really done with it. The previous behavior
+	can cause duplicate nodes in tree for subscribed folders.
+
 2008-08-18  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #508732
Index: mail/em-folder-tree.c
===================================================================
--- mail/em-folder-tree.c	(revision 36026)
+++ mail/em-folder-tree.c	(working copy)
@@ -1896,7 +1896,8 @@ emft_tree_row_expanded (GtkTreeView *tre
 		return;
 	}
 
-	gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1);
+	/* do not set LOAD_SUBDIRS to FALSE until we are really done with loading */
+	/* gtk_tree_store_set ((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); */
 
 	m = mail_msg_new (&get_folder_info_info);
 	m->root = gtk_tree_row_reference_new (model, tree_path);
