diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index 6be5e39414..ab69371654 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -274,7 +274,7 @@
                      onclick="if (event.button == 1) BrowserHome(event);"
                      tooltip="home-button-tooltip"
                      ondragstart="homeButtonObserver.onDragStart(event);"
-                     ondragdrop="homeButtonObserver.onDrop(event);"
+                     ondrop="homeButtonObserver.onDrop(event);"
                      ondragenter="event.stopPropagation();"
                      ondragexit="homeButtonObserver.onDragExit(event);"
                      ondragover="homeButtonObserver.onDragOver(event);"/>
@@ -349,7 +349,7 @@
                 oncommand="handleURLBarCommand('none', event);"
                 onclick="checkForMiddleClick(this, event);"
                 ondragover="goButtonObserver.onDragOver(event);"
-                ondragdrop="goButtonObserver.onDrop(event);"/>
+                ondrop="goButtonObserver.onDrop(event);"/>
       </toolbaritem>
 
       <toolbaritem id="search-button-container"
@@ -361,7 +361,7 @@
                 tooltiptext="&searchButton.tooltip;"
                 oncommand="BrowserSearch.loadSearch(QualifySearchTerm());"
                 ondragover="searchButtonObserver.onDragOver(event);"
-                ondragdrop="searchButtonObserver.onDrop(event);"/>
+                ondrop="searchButtonObserver.onDrop(event);"/>
       </toolbaritem>
 
       <toolbaritem id="search-container" title="&searchItem.title;"
diff --git a/suite/browser/pageinfo/pageInfo.xul b/suite/browser/pageinfo/pageInfo.xul
index ee264a11e6..5dd6586af4 100644
--- a/suite/browser/pageinfo/pageInfo.xul
+++ b/suite/browser/pageinfo/pageInfo.xul
@@ -209,7 +209,7 @@
       <!-- Media information -->
       <vbox id="mediaPanel">
         <tree id="imagetree" onselect="onImageSelect();" contextmenu="picontext"
-              ondraggesture="onBeginLinkDrag(event,'image-address','image-alt')">
+              ondragstart="onBeginLinkDrag(event,'image-address','image-alt')">
           <treecols>
             <treecol sortSeparators="true" primary="true" persist="width" flex="10"
                      width="10" id="image-address" label="&mediaAddress;"/>
@@ -466,7 +466,7 @@
       <vbox>
         <tree id="linktree"
               flex="1"
-              ondraggesture="onBeginLinkDrag(event,'link-address','link-name')"
+              ondragstart="onBeginLinkDrag(event,'link-address','link-name')"
               contextmenu="piLinksContext">
           <treecols>
             <treecol sortSeparators="true" primary="true" persist="width" flex="5"
diff --git a/suite/common/directory/directory.xul b/suite/common/directory/directory.xul
index 85ea1955d7..636750cb5e 100644
--- a/suite/common/directory/directory.xul
+++ b/suite/common/directory/directory.xul
@@ -29,7 +29,7 @@
         persist="sortDirection sortResource sortResource2"
         onclick="OnClick(event);"
         onkeypress="OnClick(event);"
-        ondraggesture="return BeginDragTree(event);">
+        ondragstart="return BeginDragTree(event);">
       <treecols onclick="doSort(event.target)">
         <treecol id="FilenameColumn" flex="3" persist="ordinal hidden"
             label="&directoryWindow.filename.label;"
diff --git a/suite/mailnews/addrbook/abEditListDialog.xul b/suite/mailnews/addrbook/abEditListDialog.xul
index 24b3b3ca9a..e151a5f18e 100644
--- a/suite/mailnews/addrbook/abEditListDialog.xul
+++ b/suite/mailnews/addrbook/abEditListDialog.xul
@@ -16,7 +16,7 @@
         onload="OnLoadEditList()"
         ondialogaccept="return EditListOKButton();"
         ondragover="DragOverAddressListTree(event);"
-        ondragdrop="DropOnAddressListTree(event);">
+        ondrop="DropOnAddressListTree(event);">
 
   <stringbundleset id="stringbundleset"/>
   <vbox id="editlist" flex="1"/>		
diff --git a/suite/mailnews/addrbook/abMailListDialog.xul b/suite/mailnews/addrbook/abMailListDialog.xul
index 2761b87f40..68a500945b 100644
--- a/suite/mailnews/addrbook/abMailListDialog.xul
+++ b/suite/mailnews/addrbook/abMailListDialog.xul
@@ -15,7 +15,7 @@
     ondialogaccept="return MailListOKButton();"
     onload="OnLoadNewMailList()"
     ondragover="DragOverAddressListTree(event);"
-    ondragdrop="DropOnAddressListTree(event);">
+    ondrop="DropOnAddressListTree(event);">
 
   <stringbundleset id="stringbundleset"/>
 
diff --git a/suite/mailnews/addrbook/abSelectAddressesDialog.xul b/suite/mailnews/addrbook/abSelectAddressesDialog.xul
index 48fe0e9c1b..3f1e9c34b2 100644
--- a/suite/mailnews/addrbook/abSelectAddressesDialog.xul
+++ b/suite/mailnews/addrbook/abSelectAddressesDialog.xul
@@ -71,7 +71,7 @@
         <label value="&addressMessageTo.label;" control="addressBucket"/>
         <tree id="addressBucket" flex="1" hidecolumnpicker="true"
             ondragover="DragAddressOverTargetControl(event);"
-            ondragdrop="DropAddressOverTargetControl(event);"
+            ondrop="DropAddressOverTargetControl(event);"
             onselect="DialogBucketPaneSelectionChanged();">
           <treecols>
             <treecol id="addressCol" flex="1" hideheader="true"/>
diff --git a/suite/mailnews/addrbook/addressbook-panel.xul b/suite/mailnews/addrbook/addressbook-panel.xul
index cb5c8b5182..2c55031417 100644
--- a/suite/mailnews/addrbook/addressbook-panel.xul
+++ b/suite/mailnews/addrbook/addressbook-panel.xul
@@ -86,7 +86,7 @@
       hiddenbydefault="true"
       flex="1" label="&PrimaryEmail.label;"/>
   </treecols>
-  <treechildren ondraggesture="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
+  <treechildren ondragstart="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
 </tree>
 
   </vbox>
diff --git a/suite/mailnews/compose/addressingWidgetOverlay.xul b/suite/mailnews/compose/addressingWidgetOverlay.xul
index be670d95b2..27fd7cfd4d 100644
--- a/suite/mailnews/compose/addressingWidgetOverlay.xul
+++ b/suite/mailnews/compose/addressingWidgetOverlay.xul
@@ -17,13 +17,13 @@
     onkeydown="awKeyDown(event, this)"
     onclick="awClickEmptySpace(event.originalTarget, true)"
     ondragover="DragAddressOverTargetControl(event);"
-    ondragdrop="DropAddressOverTargetControl(event);">
-    
+    ondrop="DropAddressOverTargetControl(event);">
+
     <listcols>
       <listcol id="typecol-addressingWidget"/>
       <listcol id="textcol-addressingWidget" flex="1"/>
     </listcols>
-  
+
     <listitem class="addressingWidgetItem" allowevents="true">
       <listcell class="addressingWidgetCell" align="stretch">
         <menulist id="addressCol1#1" disableonsend="true"
@@ -40,7 +40,7 @@
           </menupopup>
         </menulist>
       </listcell>
-      
+
       <listcell class="addressingWidgetCell">
         <textbox id="addressCol2#1" class="plain textbox-addressingWidget uri-element"
                  aria-labelledby="addressCol1#1"
@@ -61,5 +61,5 @@
     </listitem>
 
   </listbox>
-  
+
 </overlay>
diff --git a/suite/mailnews/compose/messengercompose.xul b/suite/mailnews/compose/messengercompose.xul
index b3c9847cfb..c92bfbd1c5 100644
--- a/suite/mailnews/compose/messengercompose.xul
+++ b/suite/mailnews/compose/messengercompose.xul
@@ -277,7 +277,7 @@
                         command="cmd_sendLater"/>
               <menuseparator id="menuFileAfterSendLaterSeparator"/>
               <menuitem id="menu_printSetup"/>
-              <menuitem id="menu_printPreview"/>
+              <menuitem id="menu_printPreview"/>
               <menuitem id="menu_print"/>
             </menupopup>
           </menu>
@@ -581,7 +581,7 @@
                    onkeypress="if (event.keyCode == 8 || event.keyCode == 46) RemoveSelectedAttachment();"
                    onclick="AttachmentBucketClicked(event);"
                    ondragover="nsDragAndDrop.dragOver(event, attachmentBucketObserver);"
-                   ondragdrop="nsDragAndDrop.drop(event, attachmentBucketObserver);"
+                   ondrop="nsDragAndDrop.drop(event, attachmentBucketObserver);"
                    ondragexit="nsDragAndDrop.dragExit(event, attachmentBucketObserver);"/>
         </vbox>
       </hbox>
diff --git a/suite/mailnews/folderPane.xul b/suite/mailnews/folderPane.xul
index b2a8435abe..b9ee2574de 100644
--- a/suite/mailnews/folderPane.xul
+++ b/suite/mailnews/folderPane.xul
@@ -22,7 +22,7 @@
             datasources="rdf:null"
             statedatasource="rdf:mailnewsfolders"
             flags="dont-build-content"
-            ondraggesture="BeginDragFolderTree(event);"
+            ondragstart="BeginDragFolderTree(event);"
             onselect="FolderPaneSelectionChange();">
     <template>
       <rule>
diff --git a/suite/mailnews/messageWindow.xul b/suite/mailnews/messageWindow.xul
index 2987725753..6faf70cb2b 100644
--- a/suite/mailnews/messageWindow.xul
+++ b/suite/mailnews/messageWindow.xul
@@ -116,7 +116,7 @@
                    flex="3"
                    persist="collapsed"
                    ondragover="nsDragAndDrop.dragOver(event, messagepaneObserver);"
-                   ondragdrop="nsDragAndDrop.drop(event, messagepaneObserver);"
+                   ondrop="nsDragAndDrop.drop(event, messagepaneObserver);"
                    ondragexit="nsDragAndDrop.dragExit(event, messagepaneObserver);">
 
     <hbox id="msgHeaderView"/>
diff --git a/suite/mailnews/msgHdrViewOverlay.xul b/suite/mailnews/msgHdrViewOverlay.xul
index 80c49e7c6c..0407cef707 100644
--- a/suite/mailnews/msgHdrViewOverlay.xul
+++ b/suite/mailnews/msgHdrViewOverlay.xul
@@ -226,7 +226,9 @@
            crop="right"
            control="attachmentList"/>
     <listbox id="attachmentList" rows="3" seltype="multiple"
-              onclick="attachmentListClick(event);" ondraggesture="nsDragAndDrop.startDrag(event,attachmentAreaDNDObserver);" ondragover="nsDragAndDrop.dragOver(event, attachmentAreaDNDObserver);" context="attachmentListContext"/>
+              onclick="attachmentListClick(event);"
+              ondragstart="nsDragAndDrop.startDrag(event,attachmentAreaDNDObserver);"
+              context="attachmentListContext"/>
   </vbox>
 </hbox>
 </hbox>
diff --git a/suite/mailnews/tabmail.xml b/suite/mailnews/tabmail.xml
index e90fc78ec5..b98f36e2fc 100644
--- a/suite/mailnews/tabmail.xml
+++ b/suite/mailnews/tabmail.xml
@@ -174,9 +174,9 @@
                   tooltip="_child"
                   context="_child"
                   anonid="strip"
-                  ondraggesture="nsDragAndDrop.startDrag(event, this.parentNode.parentNode); event.stopPropagation();"
+                  ondragstart="nsDragAndDrop.startDrag(event, this.parentNode.parentNode); event.stopPropagation();"
                   ondragover="nsDragAndDrop.dragOver(event, this.parentNode.parentNode); event.stopPropagation();"
-                  ondragdrop="nsDragAndDrop.drop(event, this.parentNode.parentNode); event.stopPropagation();"
+                  ondrop="nsDragAndDrop.drop(event, this.parentNode.parentNode); event.stopPropagation();"
                   ondragexit="nsDragAndDrop.dragExit(event, this.parentNode.parentNode); event.stopPropagation();">
           <xul:tooltip onpopupshowing="var tabmail = this.parentNode.parentNode.parentNode;
                                        return tabmail.FillTabmailTooltip(document, event);"/>
diff --git a/suite/mailnews/threadPane.xul b/suite/mailnews/threadPane.xul
index dcc20b1636..11179e0441 100644
--- a/suite/mailnews/threadPane.xul
+++ b/suite/mailnews/threadPane.xul
@@ -84,7 +84,7 @@
     <treecol id="idCol" persist="hidden ordinal width" flex="1" hidden="true"
              label="&idColumn.label;" tooltiptext="&idColumn2.tooltip;"/>
   </treecols>
-  <treechildren ondraggesture="BeginDragThreadPane(event);"
+  <treechildren ondragstart="BeginDragThreadPane(event);"
                 ondragover="DragOverThreadPane(event);"
                 ondrop="DropOnThreadPane(event);"/>
 </tree>