Index: mail/message-list.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-list.c,v
retrieving revision 1.430
diff -u -p -r1.430 message-list.c
--- mail/message-list.c	9 Jun 2006 02:21:03 -0000	1.430
+++ mail/message-list.c	15 Jun 2006 09:55:28 -0000
@@ -1924,6 +1924,20 @@ ml_tree_drag_motion(ETree *tree, GdkDrag
 	GList *targets;
 	GdkDragAction action, actions = 0;
 
+	/* If drop target is name of the account/store and not actual folder, 
+	   don't allow any action 
+	*/
+	if (!ml->folder) {
+		gdk_drag_status(context, 0, time);
+		return TRUE;
+	}
+
+	/* If source and destination or same widget, don't allow any action */
+	if (gtk_drag_get_source_widget (context) == tree) {
+		gdk_drag_status (context, 0, time);
+		return TRUE;
+	}
+	
 	for (targets = context->targets; targets; targets = targets->next) {
 		int i;
 
