diff --git a/mailnews/base/resources/content/folderPane.xul b/mailnews/base/resources/content/folderPane.xul
index 4428956a8e09..c712df938311 100644
--- a/mailnews/base/resources/content/folderPane.xul
+++ b/mailnews/base/resources/content/folderPane.xul
@@ -35,7 +35,7 @@
 	<tree datasources="rdf:null"
 	      id="folderTree" class="mail-folders"
 		  onselect="top.FolderPaneSelectionChange(); document.commandDispatcher.updateCommands('tree-select');"
-		  onblur="goOnEvent(this,'blur')"
+		  onblur="goOnEvent(this,'blur')" dd-nodropbetweenrows="true"
 		ondragover="return DragOverTree(event);"
 		ondraggesture="return BeginDragFolderTree(event);"
 		ondragdrop="return DropOnFolderTree(event);"
diff --git a/mailnews/base/resources/content/messengerdnd.js b/mailnews/base/resources/content/messengerdnd.js
index 0f0f64a6e525..4ef8a1f0da40 100644
--- a/mailnews/base/resources/content/messengerdnd.js
+++ b/mailnews/base/resources/content/messengerdnd.js
@@ -48,13 +48,14 @@ function GetRDFService()
 
 function DragOverTree(event)
 {
-    if (event.target.localName != "treecell" &&
-        event.target.localName != "treeitem")
-        return false;
+  if (event.target.localName != "treecell" &&
+       event.target.localName != "treeitem") {        
+    event.preventBubble();
+    return;
+  }
 
 	var validFlavor = false;
 	var dragSession = null;
-	var retVal = true;
 
 	var dragService = GetDragService();
 	if ( !dragService )	return(false);
@@ -65,17 +66,16 @@ function DragOverTree(event)
 	if ( dragSession.isDataFlavorSupported("text/nsmessage") )	validFlavor = true;
 	//XXX other flavors here...
 
-	// touch the attribute on the rowgroup to trigger the repaint with the drop feedback.
+	// touch the attribute on the treeItem to trigger the repaint with the drop feedback
+	// (recall that it is two levels above the target, which is a treeCell).
 	if ( validFlavor )
 	{
 		//XXX this is really slow and likes to refresh N times per second.
-		var rowGroup = event.target.parentNode.parentNode;
-		rowGroup.setAttribute ( "dd-triggerrepaint", 0 );
+		event.target.parentNode.parentNode.setAttribute ( "dd-triggerrepaint", 0 );
 		dragSession.canDrop = true;
-		// necessary??
-		retVal = false; // do not propagate message
+		event.preventBubble();  // do not propagate message
 	}
-	return(retVal);
+
 }
 
 function BeginDragFolderTree(event)