--- evolution-2.12.3/mail/em-folder-tree.c.no-drop-personal-folder	2008-07-01 14:49:09.000000000 +0200
+++ evolution-2.12.3/mail/em-folder-tree.c	2008-07-01 14:50:16.000000000 +0200
@@ -1106,6 +1106,7 @@
 	gboolean is_store;
 	GtkTreeIter iter;
 	GList *targets;
+	guint32 flags = 0;
 	
 	/* This is a bit of a mess, but should handle all the cases properly */
 
@@ -1115,6 +1116,7 @@
 	gtk_tree_model_get((GtkTreeModel *)p->model, &iter, COL_BOOL_IS_STORE, &is_store,
 			   COL_STRING_FULL_NAME, &full_name,
 			   COL_POINTER_CAMEL_STORE, &dstore,
+			   COL_UINT_FLAGS, &flags,
 			   COL_STRING_URI, &uri, -1);
 	
 	local = mail_component_peek_local_store (NULL);
@@ -1150,6 +1152,9 @@
 		if (!strcmp (full_name, CAMEL_VTRASH_NAME)
 		    || !strcmp (full_name, CAMEL_VJUNK_NAME))
 			goto done;
+
+		if (flags & CAMEL_FOLDER_NOSELECT)
+			goto done;
 	}
 	
 	if (p->drag_row) {