diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
index 795331f176a..5c08aef8e80 100644
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -24,6 +24,12 @@
   var defaultStatus = "default status text";
   var explicitURL = false;
 
+
+  function GeneralDrag ( event )
+  {
+    dump("****** GENERAL DRAG ********\n");
+  }
+  
   function BeginDragPersonalToolbar ( event )
   {
     //XXX we rely on a capturer to already have determined which item the mouse was over
@@ -210,7 +216,7 @@ this doesn't work anymore (target is null), not sure why.
         if ( validFlavor ) {
           //XXX this is really slow and likes to refresh N times per second.
           var toolbar = document.getElementById("PersonalToolbar");
-          toolbar.setAttribute ( "tb-triggerrepaint", 0 );
+          toolbar.setAttribute ( "dd-triggerrepaint", 0 );
           dragSession.canDrop = true;
         }
       }
diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index a7d36c3c7d9..75ea40c9d6d 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -42,7 +42,8 @@ Contributor(s): ______________________________________. -->
   align="vertical"
   width="640" height="480"
   x="10" y="10"
-  persist="width height x y"> 
+  persist="width height x y"
+  ondraggesture="return GeneralDrag(event);"> 
 
 <html:script language="javascript" src="chrome://global/content/strres.js" />
 <html:script language="javascript" src="navigator.js" />
diff --git a/suite/common/bookmarks/bookmarks.js b/suite/common/bookmarks/bookmarks.js
index 30b666cfcd6..f11e3b120b7 100644
--- a/suite/common/bookmarks/bookmarks.js
+++ b/suite/common/bookmarks/bookmarks.js
@@ -25,6 +25,124 @@
 */
 
 
+  function BeginDragTree ( event )
+  {
+    //XXX we rely on a capturer to already have determined which item the mouse was over
+    //XXX and have set an attribute.
+    
+    // if the click is on the tree proper, ignore it. We only care about clicks on
+    // items.
+    var tree = document.getElementById("bookmarksTree");
+    if ( event.target == tree )
+      return true;  // continue propagating the event
+    
+    var childWithDatabase = tree;
+    if ( ! childWithDatabase )
+      return false;
+    
+    var dragStarted = false;
+    var dragService = Components.classes["component://netscape/widget/dragservice"].getService();
+    if ( dragService ) dragService = dragService.QueryInterface(Components.interfaces.nsIDragService);
+    if ( dragService ) {
+      var trans = Components.classes["component://netscape/widget/transferable"].createInstance();
+      if ( trans ) trans = trans.QueryInterface(Components.interfaces.nsITransferable);
+      if ( trans ) {
+//        trans.addDataFlavor("moz/toolbaritem");
+        var genData = Components.classes["component://netscape/supports-wstring"].createInstance();
+        if ( genData ) genData = genData.QueryInterface(Components.interfaces.nsISupportsWString);
+        trans.addDataFlavor("text/plain");
+        var genTextData = Components.classes["component://netscape/supports-string"].createInstance();
+        if ( genTextData ) genTextData = genTextData.QueryInterface(Components.interfaces.nsISupportsString);
+        
+        if ( genData && genTextData ) {
+        
+        // id (url) is on the <treeitem> which is two levels above the <treecell> which is
+        // the target of the event.
+		var id = event.target.parentNode.parentNode.getAttribute("id");
+		genData.data = id;
+        genTextData.data = id;
+        
+		dump("ID: " + id + "\n");
+
+		var database = childWithDatabase.database;
+		var rdf = Components.classes["component://netscape/rdf/rdf-service"].getService();
+		if (rdf)   rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
+		if ((!rdf) || (!database))	{ dump("CAN'T GET DATABASE\n"); return(false); }
+
+		// make sure its a bookmark, bookmark separator, or bookmark folder
+		var src = rdf.GetResource(id, true);
+		var prop = rdf.GetResource("http://www.w3.org/1999/02/22-rdf-syntax-ns#type", true);
+		var target = database.GetTarget(src, prop, true);
+/*
+pinkerton
+this doesn't work anymore (target is null), not sure why.
+		if (target)	target = target.QueryInterface(Components.interfaces.nsIRDFResource);
+		if (target)	target = target.Value;
+		if ((!target) || (target == "")) {dump("BAD\n"); return(false);}
+
+		dump("Type: '" + target + "'\n");
+
+		if ((target != "http://home.netscape.com/NC-rdf#BookmarkSeparator") &&
+		   (target != "http://home.netscape.com/NC-rdf#Bookmark") &&
+		   (target != "http://home.netscape.com/NC-rdf#Folder"))	return(false);
+*/
+
+//        trans.setTransferData ( "moz/toolbaritem", genData, id.length*2 );  // double byte data (len*2)
+          trans.setTransferData ( "text/plain", genTextData, id.length );  // single byte data
+          var transArray = Components.classes["component://netscape/supports-array"].createInstance();
+          if ( transArray ) transArray = transArray.QueryInterface(Components.interfaces.nsISupportsArray);
+          if ( transArray ) {
+            // put it into the transferable as an |nsISupports|
+            var genTrans = trans.QueryInterface(Components.interfaces.nsISupports);
+            transArray.AppendElement(genTrans);
+            var nsIDragService = Components.interfaces.nsIDragService;
+            dragService.invokeDragSession ( transArray, null, nsIDragService.DRAGDROP_ACTION_COPY + 
+                                                nsIDragService.DRAGDROP_ACTION_MOVE );
+            dragStarted = true;
+          }
+        } // if data object
+      } // if transferable
+    } // if drag service
+
+    return !dragStarted;  // don't propagate the event if a drag has begun
+
+  } // BeginDragTree
+
+
+  function DragOverTree ( event )
+  {
+    var validFlavor = false;
+    var dragSession = null;
+    var retVal = true;
+
+    var dragService = Components.classes["component://netscape/widget/dragservice"].getService();
+    if ( dragService ) dragService = dragService.QueryInterface(Components.interfaces.nsIDragService);
+    if ( dragService ) {
+      dragSession = dragService.getCurrentSession();
+      if ( dragSession ) {
+        if ( dragSession.isDataFlavorSupported("moz/toolbaritem") )
+          validFlavor = true;
+        else if ( dragSession.isDataFlavorSupported("text/plain") )
+          validFlavor = true;
+        //XXX other flavors here...
+
+        // touch the attribute on the rowgroup to trigger the repaint with the drop feedback.
+        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 );
+          dragSession.canDrop = true;
+          // necessary??
+          retVal = false; // do not propagate message
+        }
+      }
+    }
+
+    return retVal;
+
+  } // DragOverTree
+
+
 
 function copySelectionToClipboard()
 {
diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js
index 795331f176a..5c08aef8e80 100644
--- a/xpfe/browser/resources/content/navigator.js
+++ b/xpfe/browser/resources/content/navigator.js
@@ -24,6 +24,12 @@
   var defaultStatus = "default status text";
   var explicitURL = false;
 
+
+  function GeneralDrag ( event )
+  {
+    dump("****** GENERAL DRAG ********\n");
+  }
+  
   function BeginDragPersonalToolbar ( event )
   {
     //XXX we rely on a capturer to already have determined which item the mouse was over
@@ -210,7 +216,7 @@ this doesn't work anymore (target is null), not sure why.
         if ( validFlavor ) {
           //XXX this is really slow and likes to refresh N times per second.
           var toolbar = document.getElementById("PersonalToolbar");
-          toolbar.setAttribute ( "tb-triggerrepaint", 0 );
+          toolbar.setAttribute ( "dd-triggerrepaint", 0 );
           dragSession.canDrop = true;
         }
       }
diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul
index a7d36c3c7d9..75ea40c9d6d 100644
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@@ -42,7 +42,8 @@ Contributor(s): ______________________________________. -->
   align="vertical"
   width="640" height="480"
   x="10" y="10"
-  persist="width height x y"> 
+  persist="width height x y"
+  ondraggesture="return GeneralDrag(event);"> 
 
 <html:script language="javascript" src="chrome://global/content/strres.js" />
 <html:script language="javascript" src="navigator.js" />
diff --git a/xpfe/components/bookmarks/resources/bookmarks.js b/xpfe/components/bookmarks/resources/bookmarks.js
index 30b666cfcd6..f11e3b120b7 100644
--- a/xpfe/components/bookmarks/resources/bookmarks.js
+++ b/xpfe/components/bookmarks/resources/bookmarks.js
@@ -25,6 +25,124 @@
 */
 
 
+  function BeginDragTree ( event )
+  {
+    //XXX we rely on a capturer to already have determined which item the mouse was over
+    //XXX and have set an attribute.
+    
+    // if the click is on the tree proper, ignore it. We only care about clicks on
+    // items.
+    var tree = document.getElementById("bookmarksTree");
+    if ( event.target == tree )
+      return true;  // continue propagating the event
+    
+    var childWithDatabase = tree;
+    if ( ! childWithDatabase )
+      return false;
+    
+    var dragStarted = false;
+    var dragService = Components.classes["component://netscape/widget/dragservice"].getService();
+    if ( dragService ) dragService = dragService.QueryInterface(Components.interfaces.nsIDragService);
+    if ( dragService ) {
+      var trans = Components.classes["component://netscape/widget/transferable"].createInstance();
+      if ( trans ) trans = trans.QueryInterface(Components.interfaces.nsITransferable);
+      if ( trans ) {
+//        trans.addDataFlavor("moz/toolbaritem");
+        var genData = Components.classes["component://netscape/supports-wstring"].createInstance();
+        if ( genData ) genData = genData.QueryInterface(Components.interfaces.nsISupportsWString);
+        trans.addDataFlavor("text/plain");
+        var genTextData = Components.classes["component://netscape/supports-string"].createInstance();
+        if ( genTextData ) genTextData = genTextData.QueryInterface(Components.interfaces.nsISupportsString);
+        
+        if ( genData && genTextData ) {
+        
+        // id (url) is on the <treeitem> which is two levels above the <treecell> which is
+        // the target of the event.
+		var id = event.target.parentNode.parentNode.getAttribute("id");
+		genData.data = id;
+        genTextData.data = id;
+        
+		dump("ID: " + id + "\n");
+
+		var database = childWithDatabase.database;
+		var rdf = Components.classes["component://netscape/rdf/rdf-service"].getService();
+		if (rdf)   rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
+		if ((!rdf) || (!database))	{ dump("CAN'T GET DATABASE\n"); return(false); }
+
+		// make sure its a bookmark, bookmark separator, or bookmark folder
+		var src = rdf.GetResource(id, true);
+		var prop = rdf.GetResource("http://www.w3.org/1999/02/22-rdf-syntax-ns#type", true);
+		var target = database.GetTarget(src, prop, true);
+/*
+pinkerton
+this doesn't work anymore (target is null), not sure why.
+		if (target)	target = target.QueryInterface(Components.interfaces.nsIRDFResource);
+		if (target)	target = target.Value;
+		if ((!target) || (target == "")) {dump("BAD\n"); return(false);}
+
+		dump("Type: '" + target + "'\n");
+
+		if ((target != "http://home.netscape.com/NC-rdf#BookmarkSeparator") &&
+		   (target != "http://home.netscape.com/NC-rdf#Bookmark") &&
+		   (target != "http://home.netscape.com/NC-rdf#Folder"))	return(false);
+*/
+
+//        trans.setTransferData ( "moz/toolbaritem", genData, id.length*2 );  // double byte data (len*2)
+          trans.setTransferData ( "text/plain", genTextData, id.length );  // single byte data
+          var transArray = Components.classes["component://netscape/supports-array"].createInstance();
+          if ( transArray ) transArray = transArray.QueryInterface(Components.interfaces.nsISupportsArray);
+          if ( transArray ) {
+            // put it into the transferable as an |nsISupports|
+            var genTrans = trans.QueryInterface(Components.interfaces.nsISupports);
+            transArray.AppendElement(genTrans);
+            var nsIDragService = Components.interfaces.nsIDragService;
+            dragService.invokeDragSession ( transArray, null, nsIDragService.DRAGDROP_ACTION_COPY + 
+                                                nsIDragService.DRAGDROP_ACTION_MOVE );
+            dragStarted = true;
+          }
+        } // if data object
+      } // if transferable
+    } // if drag service
+
+    return !dragStarted;  // don't propagate the event if a drag has begun
+
+  } // BeginDragTree
+
+
+  function DragOverTree ( event )
+  {
+    var validFlavor = false;
+    var dragSession = null;
+    var retVal = true;
+
+    var dragService = Components.classes["component://netscape/widget/dragservice"].getService();
+    if ( dragService ) dragService = dragService.QueryInterface(Components.interfaces.nsIDragService);
+    if ( dragService ) {
+      dragSession = dragService.getCurrentSession();
+      if ( dragSession ) {
+        if ( dragSession.isDataFlavorSupported("moz/toolbaritem") )
+          validFlavor = true;
+        else if ( dragSession.isDataFlavorSupported("text/plain") )
+          validFlavor = true;
+        //XXX other flavors here...
+
+        // touch the attribute on the rowgroup to trigger the repaint with the drop feedback.
+        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 );
+          dragSession.canDrop = true;
+          // necessary??
+          retVal = false; // do not propagate message
+        }
+      }
+    }
+
+    return retVal;
+
+  } // DragOverTree
+
+
 
 function copySelectionToClipboard()
 {
diff --git a/xpfe/components/bookmarks/resources/bookmarks.xul b/xpfe/components/bookmarks/resources/bookmarks.xul
index 64dabe292ff..b27844a061d 100644
--- a/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -78,7 +78,9 @@
 <tree  id="bookmarksTree" ref="NC:BookmarksRoot" context="contextual"
        datasources="rdf:bookmarks rdf:files rdf:ftp rdf:localsearch rdf:internetsearch"
        onclick="if (event.clickCount == 2) return OpenURL(event, event.target.parentNode.parentNode, 'bookmarksTree');"
-       style="width:100%;height:100%">
+       style="width:100%;height:100%"
+       ondragover="return DragOverTree(event);"
+       ondraggesture="return BeginDragTree(event);">
 
   <template>
     <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">