# HG changeset patch
# User Ian Neal <iann_cvs@blueyonder.co.uk>
# Date 1620487524 -3600
# Parent  b2a691464c44c63675a0c469e892c2427eee16ac
Bug 515675 - Move thread code to threadPane.js and remove messengerdnd.js. r=frg a=frg

diff --git a/suite/mailnews/content/SearchDialog.xul b/suite/mailnews/content/SearchDialog.xul
--- a/suite/mailnews/content/SearchDialog.xul
+++ b/suite/mailnews/content/SearchDialog.xul
@@ -33,17 +33,16 @@
   <script src="chrome://messenger/content/mailWindow.js"/>
   <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://messenger/content/mailCommands.js"/>
   <script src="chrome://messenger/content/mailWindowOverlay.js"/>
   <script src="chrome://messenger/content/commandglue.js"/>
   <script src="chrome://messenger/content/SearchDialog.js"/>
   <script src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
-  <script src="chrome://messenger/content/messengerdnd.js"/>
   <script src="chrome://messenger/content/tabmail.js"/>
   <script src="chrome://messenger/content/folderDisplay.js"/>
   <script src="chrome://global/content/contentAreaUtils.js"/>
   <script src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
 
   <commands id="commands">
     <commandset id="mailSearchItems"
                 commandupdater="true"
diff --git a/suite/mailnews/content/messenger.xul b/suite/mailnews/content/messenger.xul
--- a/suite/mailnews/content/messenger.xul
+++ b/suite/mailnews/content/messenger.xul
@@ -40,17 +40,16 @@
 </stringbundleset>
 
 <script src="chrome://messenger/content/commandglue.js"/>
 <script src="chrome://messenger/content/msgViewNavigation.js"/>
 <script src="chrome://messenger/content/mailWindow.js"/>
 <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
 <script src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
 <script src="chrome://messenger/content/mailContextMenus.js"/>
-<script src="chrome://messenger/content/messengerdnd.js"/>
 <script src="chrome://messenger/content/accountUtils.js"/>
 <script src="chrome://messenger/content/folderPane.js"/>
 <script src="chrome://messenger/content/phishingDetector.js"/>
 <script src="chrome://communicator/content/contentAreaClick.js"/>
 <script src="chrome://global/content/nsDragAndDrop.js"/>
 <script src="chrome://messenger/content/searchBar.js"/>
 <script src="chrome://messenger/content/tabmail.js"/>
 
diff --git a/suite/mailnews/content/messengerdnd.js b/suite/mailnews/content/messengerdnd.js
deleted file mode 100644
--- a/suite/mailnews/content/messengerdnd.js
+++ /dev/null
@@ -1,397 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-// cache these services
-var nsIDragService = Ci.nsIDragService;
-var dragService = Cc["@mozilla.org/widget/dragservice;1"]
-                    .getService(nsIDragService);
-
-function CanDropOnFolderTree(aIndex, aOrientation)
-{
-  var dragSession = dragService.getCurrentSession();
-  if (!dragSession)
-    return false;
-
-  var folderTree = document.getElementById("folderTree");
-  var targetFolder = GetFolderResource(folderTree, aIndex)
-                       .QueryInterface(Ci.nsIMsgFolder);
-  var dt = dragSession.dataTransfer;
-  var count = dt.mozItemCount;
-
-  // We only support drag of a single flavor at a time.
-  var types = Array.from(dt.mozTypesAt(0));
-  if (types.includes("text/x-moz-message"))
-  {
-    // Only allow dragging onto container.
-    if (aOrientation != Ci.nsITreeView.DROP_ON)
-      return false;
-    // Don't allow drop onto server itself.
-    if (targetFolder.isServer)
-      return false;
-    // Don't allow drop into a folder that cannot take messages.
-    if (!targetFolder.canFileMessages)
-      return false;
-    for (let i = 0; i < count; i++)
-    {
-      let msgHdr = messenger.msgHdrFromURI(dt.mozGetDataAt("text/x-moz-message", i));
-      // Don't allow drop onto original folder.
-      if (msgHdr.folder == targetFolder)
-        return false;
-    }
-    return true;
-  }
-  else if (types.includes("text/x-moz-folder"))
-  {
-    // Only allow dragging onto container.
-    if (aOrientation != Ci.nsITreeView.DROP_ON)
-      return false;
-    // If cannot create subfolders then don't allow drop here.
-    if (!targetFolder.canCreateSubfolders)
-      return false;
-
-    for (let i = 0; i < count; i++)
-    {
-      let folder = dt.mozGetDataAt("text/x-moz-folder", i)
-                     .QueryInterface(Ci.nsIMsgFolder);
-      // Don't allow to drop on itself.
-      if (targetFolder == folder)
-        return false;
-      // Don't copy within same server.
-      if (folder.server == targetFolder.server && dt.dropEffect == "copy")
-        return false;
-      // Don't allow immediate child to be dropped onto its parent.
-      if (targetFolder == folder.parent)
-        return false;
-      // Don't allow dragging of virtual folders across accounts.
-      if ((folder.flags & Ci.nsMsgFolderFlags.Virtual) &&
-          folder.server != targetFolder.server)
-        return false;
-      // Don't allow parent to be dropped on its ancestors.
-      if (folder.isAncestorOf(targetFolder))
-        return false;
-      // If there is a folder that can't be renamed, don't allow it to be
-      // dropped if it is not to "Local Folders" or is to the same account.
-      if (!folder.canRename && (targetFolder.server.type != "none" ||
-                                folder.server == targetFolder.server))
-        return false;
-    }
-    return true;
-  }
-  else if (types.includes("text/x-moz-newsfolder"))
-  {
-    // Don't allow dragging onto newsgroup.
-    if (aOrientation == Ci.nsITreeView.DROP_ON)
-      return false;
-    // Don't allow drop onto server itself.
-    if (targetFolder.isServer)
-      return false;
-    for (let i = 0; i < count; i++)
-    {
-      let folder = dt.mozGetDataAt("text/x-moz-newsfolder", i)
-                     .QueryInterface(Ci.nsIMsgFolder);
-      // Don't allow dragging newsgroup to other account.
-      if (targetFolder.rootFolder != folder.rootFolder)
-        return false;
-      // Don't allow dragging newsgroup to before/after itself.
-      if (targetFolder == folder)
-        return false;
-      // Don't allow dragging newsgroup to before item after or
-      // after item before.
-      aIndex += aOrientation;
-      if (aIndex < folderTree.view.rowCount) {
-        targetFolder = GetFolderResource(folderTree, aIndex)
-                         .QueryInterface(Ci.nsIMsgFolder);
-        if (targetFolder == folder)
-          return false;
-      }
-    }
-    return true;
-  }
-  else if (types.includes("text/x-moz-url"))
-  {
-    // Only allow dragging onto container.
-    if (aOrientation != Ci.nsITreeView.DROP_ON)
-      return false;
-    // This is a potential RSS feed to subscribe to
-    // and there's only one, so just get the 0th element.
-    let url = dt.mozGetDataAt("text/x-moz-url", 0);
-    let scheme = Services.io.extractScheme(url);
-    if (/^https?$/.test(scheme) && targetFolder.server.type == "rss")
-      return true;
-  }
-  else if (types.includes("application/x-moz-file"))
-  {
-    // Only allow dragging onto container.
-    if (aOrientation != Ci.nsITreeView.DROP_ON)
-      return false;
-    // Don't allow drop onto server itself.
-    if (targetFolder.isServer)
-      return false;
-    // Don't allow drop into a folder that cannot take messages.
-    if (!targetFolder.canFileMessages)
-      return false;
-
-    let extFile = dt.mozGetDataAt("application/x-moz-file", 0);
-    if (extFile instanceof Ci.nsIFile)
-      return extFile.isFile();
-  }
-  return false;
-}
-
-function DropOnFolderTree(aRow, aOrientation)
-{
-  var dragSession = dragService.getCurrentSession();
-  if (!dragSession)
-    return;
-
-  var folderTree = document.getElementById("folderTree");
-  var targetFolder = GetFolderResource(folderTree, aRow)
-                       .QueryInterface(Ci.nsIMsgFolder);
-  var dt = dragSession.dataTransfer;
-  var count = dt.mozItemCount;
-
-  // We only support drag of a single flavor at a time.
-  var types = Array.from(dt.mozTypesAt(0));
-  if (types.includes("text/x-moz-folder"))
-  {
-    const NS_MSG_FOLDER_EXISTS = 0x80550013;
-    const NS_MSG_ERROR_COPY_FOLDER_ABORTED = 0x8055001a;
-
-    for (let i = 0; i < count; i++)
-    {
-      let folder = dt.mozGetDataAt("text/x-moz-folder", i);
-      let array = Cc["@mozilla.org/array;1"]
-                    .createInstance(Ci.nsIMutableArray);
-      array.appendElement(folder);
-      try
-      {
-        MailServices.copy.CopyFolders(array, targetFolder,
-                                      (folder.server == targetFolder.server),
-                                      null, msgWindow);
-      }
-      // Ignore known errors from canceled warning dialogs.
-      catch (ex if (ex.result == NS_MSG_FOLDER_EXISTS)) {}
-      catch (ex if (ex.result == NS_MSG_ERROR_COPY_FOLDER_ABORTED)) {}
-    }
-  }
-  else if (types.includes("text/x-moz-newsfolder"))
-  {
-    // Start by getting folders into order.
-    let folders = new Array;
-    for (let i = 0; i < count; i++) {
-      let folder = dt.mozGetDataAt("text/x-moz-newsfolder", i)
-                     .QueryInterface(Ci.nsIMsgFolder);
-      let folderIndex = EnsureFolderIndex(folderTree.builderView, folder);
-      folders[folderIndex] = folder;
-    }
-    let newsFolder = targetFolder.rootFolder
-                                 .QueryInterface(Ci.nsIMsgNewsFolder);
-    // When moving down, want to insert last one first.
-    // When moving up, want to insert first one first.
-    let i = (aOrientation == 1) ? folders.length - 1 : 0;
-    while (i >= 0 && i < folders.length) {
-      let folder = folders[i];
-      if (folder) {
-        newsFolder.moveFolder(folder, targetFolder, aOrientation);
-
-        let folderIndex = EnsureFolderIndex(folderTree.builderView, folder);
-        folderTree.view.selection.toggleSelect(folderIndex);
-        folderTree.treeBoxObject.ensureRowIsVisible(folderIndex);
-      }
-      i -= aOrientation;
-    }
-  }
-  else if (types.includes("text/x-moz-message"))
-  {
-    let array = Cc["@mozilla.org/array;1"]
-                  .createInstance(Ci.nsIMutableArray);
-    let sourceFolder;
-    for (let i = 0; i < count; i++)
-    {
-      let msgHdr = messenger.msgHdrFromURI(dt.mozGetDataAt("text/x-moz-message", i));
-      if (!sourceFolder)
-        sourceFolder = msgHdr.folder;
-      array.appendElement(msgHdr);
-    }
-    let isMove = dragSession.dragAction == nsIDragService.DRAGDROP_ACTION_MOVE;
-    if (!sourceFolder.canDeleteMessages)
-      isMove = false;
-
-    Services.prefs.setCharPref("mail.last_msg_movecopy_target_uri", targetFolder.URI);
-    Services.prefs.setBoolPref("mail.last_msg_movecopy_was_move", isMove);
-    // ### ugh, so this won't work with cross-folder views. We would
-    // really need to partition the messages by folder.
-    MailServices.copy.CopyMessages(sourceFolder, array, targetFolder, isMove,
-                                   null, msgWindow, true);
-  }
-  else if (types.includes("application/x-moz-file"))
-  {
-    for (let i = 0; i < count; i++)
-    {
-      let extFile = dt.mozGetDataAt("application/x-moz-file", i)
-                      .QueryInterface(Ci.nsIFile);
-      if (extFile.isFile() && /\.eml$/i.test(extFile.leafName))
-        MailServices.copy.CopyFileMessage(extFile, targetFolder, null, false,
-                                          1, "", null, msgWindow);
-    }
-  }
-  else if (types.includes("text/x-moz-url"))
-  {
-    // This is a potential RSS feed to subscribe to
-    // and there's only one, so just get the 0th element.
-    let url = dt.mozGetDataAt("text/x-moz-url", 0);
-    Cc["@mozilla.org/newsblog-feed-downloader;1"]
-      .getService(Ci.nsINewsBlogFeedDownloader)
-      .subscribeToFeed(url, targetFolder, msgWindow);
-  }
-}
-
-function BeginDragFolderTree(aEvent)
-{
-  if (aEvent.originalTarget.localName != "treechildren")
-    return false;
-
-  var folders = GetSelectedMsgFolders();
-  folders = folders.filter(function(f) { return !f.isServer; });
-  if (!folders.length)
-    return false;
-  var dataTransfer = aEvent.dataTransfer;
-  for (let i in folders) {
-    let flavor = folders[i].server.type == "nntp" ? "text/x-moz-newsfolder" :
-                                                    "text/x-moz-folder";
-    dataTransfer.mozSetDataAt(flavor, folders[i], i);
-  }
-  dataTransfer.effectAllowed = "copyMove";
-  dataTransfer.addElement(aEvent.originalTarget);
-  return false;  // don't propagate the event if a drag has begun
-}
-
-function ThreadPaneOnDragStart(aEvent) {
-  if (aEvent.originalTarget.localName != "treechildren")
-    return;
-
-  let messageUris = gFolderDisplay.selectedMessageUris;
-  if (!messageUris)
-     return;
-
-  // A message can be dragged from one window and dropped on another window.
-  // Therefore we setNextMessageAfterDelete() here since there is no major
-  // disadvantage, even if it is a copy operation.
-  SetNextMessageAfterDelete();
-  let messengerBundle = document.getElementById("bundle_messenger");
-  let noSubject = messengerBundle.getString("defaultSaveMessageAsFileName");
-  if (noSubject.endsWith(".eml")) {
-    noSubject = noSubject.slice(0, -4);
-  }
-  var fileNames = [];
-  var dataTransfer = aEvent.dataTransfer;
-
-  for (let [index, msgUri] of messageUris.entries()) {
-    let msgService = messenger.messageServiceFromURI(msgUri);
-    let msgHdr = msgService.messageURIToMsgHdr(msgUri);
-    let subject = msgHdr.mime2DecodedSubject || noSubject;
-    if (msgHdr.flags & Ci.nsMsgMessageFlags.HasRe) {
-      subject = "Re: " + subject;
-    }
-    let uniqueFileName = suggestUniqueFileName(subject.substr(0, 120), ".eml",
-                                               fileNames);
-    fileNames[index] = uniqueFileName;
-    let msgUrl = {};
-    msgService.GetUrlForUri(msgUri, msgUrl, null);
-    dataTransfer.mozSetDataAt("text/x-moz-message", msgUri, index);
-    dataTransfer.mozSetDataAt("text/x-moz-url", msgUrl.value.spec, index);
-    dataTransfer.mozSetDataAt("application/x-moz-file-promise-url",
-                               msgUrl.value.spec + "?fileName=" +
-                               encodeURIComponent(uniqueFileName),
-                               index);
-    dataTransfer.mozSetDataAt("application/x-moz-file-promise",
-                              new messageFlavorDataProvider(), index);
-  }
-  dataTransfer.effectAllowed = "copyMove";
-  dataTransfer.addElement(aEvent.originalTarget);
-}
-
-function messageFlavorDataProvider() {}
-
-messageFlavorDataProvider.prototype = {
-  QueryInterface: XPCOMUtils.generateQI(["nsIFlavorDataProvider"]),
-
-  getFlavorData(aTransferable, aFlavor, aData, aDataLen) {
-    if (aFlavor !== "application/x-moz-file-promise") {
-      return;
-    }
-    let fileUriPrimitive = {};
-    let dataSize = {};
-    aTransferable.getTransferData("application/x-moz-file-promise-url",
-                                  fileUriPrimitive, dataSize);
-
-    let fileUriStr = fileUriPrimitive.value
-                                     .QueryInterface(Ci.nsISupportsString);
-    let fileUri = Services.io.newURI(fileUriStr.data);
-    let fileUrl = fileUri.QueryInterface(Ci.nsIURL);
-    let fileName = fileUrl.fileName;
-
-    let destDirPrimitive = {};
-    aTransferable.getTransferData("application/x-moz-file-promise-dir",
-                                  destDirPrimitive, dataSize);
-    let destDirectory = destDirPrimitive.value.QueryInterface(Ci.nsIFile);
-    let file = destDirectory.clone();
-    file.append(fileName);
-
-    let messageUriPrimitive = {};
-    aTransferable.getTransferData("text/x-moz-message", messageUriPrimitive,
-                                  dataSize);
-    let messageUri = messageUriPrimitive.value
-                                        .QueryInterface(Ci.nsISupportsString);
-
-    messenger.saveAs(messageUri.data, true, null, decodeURIComponent(file.path),
-                     true);
-  },
-};
-
-function DragOverThreadPane(aEvent)
-{
-  if (!gMsgFolderSelected.canFileMessages ||
-      gMsgFolderSelected.server.type == "rss")
-    return;
-  let dt = aEvent.dataTransfer;
-  dt.effectAllowed = "copy";
-  for (let i = 0; i < dt.mozItemCount; i++)
-  {
-    if (Array.from(dt.mozTypesAt(i)).includes("application/x-moz-file"))
-    {
-      let extFile = dt.mozGetDataAt("application/x-moz-file", i);
-      if (!extFile) {
-        return;
-      }
-
-      extFile = extFile.QueryInterface(Ci.nsIFile);
-      if (extFile.isFile() && /\.eml$/i.test(extFile.leafName))
-      {
-        aEvent.preventDefault();
-        return;
-      }
-    }
-  }
-}
-
-function DropOnThreadPane(aEvent)
-{
-  let dt = aEvent.dataTransfer;
-  for (let i = 0; i < dt.mozItemCount; i++)
-  {
-    let extFile = dt.mozGetDataAt("application/x-moz-file", i);
-    if (!extFile) {
-      continue;
-    }
-
-    extFile = extFile.QueryInterface(Ci.nsIFile);
-    if (extFile.isFile() && /\.eml$/i.test(extFile.leafName))
-      MailServices.copy.CopyFileMessage(extFile, gMsgFolderSelected, null,
-                                        false, 1, "", null, msgWindow);
-  }
-}
diff --git a/suite/mailnews/content/threadPane.js b/suite/mailnews/content/threadPane.js
--- a/suite/mailnews/content/threadPane.js
+++ b/suite/mailnews/content/threadPane.js
@@ -1,13 +1,15 @@
 /* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+
 var gLastMessageUriToLoad = null;
 var gThreadPaneCommandUpdater = null;
 
 function ThreadPaneOnClick(event)
 {
   // usually, we're only interested in tree content clicks, not scrollbars etc.
   let t = event.originalTarget;
 
@@ -459,9 +461,131 @@ function ThreadPaneOnLoad()
 
 function ThreadPaneSelectionChanged()
 {
   UpdateStatusMessageCounts(gMsgFolderSelected);
   if (!gRightMouseButtonDown)
     GetThreadTree().view.selectionChanged();
 }
 
+var ThreadPaneDND = {
+  onDragStart(aEvent) {
+    if (aEvent.originalTarget.localName != "treechildren")
+      return;
+
+    let messageUris = gFolderDisplay.selectedMessageUris;
+    if (!messageUris)
+       return;
+
+    // A message can be dragged from one window and dropped on another window.
+    // Therefore we setNextMessageAfterDelete() here since there is no major
+    // disadvantage, even if it is a copy operation.
+    SetNextMessageAfterDelete();
+    let messengerBundle = document.getElementById("bundle_messenger");
+    let noSubject = messengerBundle.getString("defaultSaveMessageAsFileName");
+    if (noSubject.endsWith(".eml")) {
+      noSubject = noSubject.slice(0, -4);
+    }
+    let fileNames = [];
+    let dataTransfer = aEvent.dataTransfer;
+
+    for (let [index, msgUri] of messageUris.entries()) {
+      let msgService = messenger.messageServiceFromURI(msgUri);
+      let msgHdr = msgService.messageURIToMsgHdr(msgUri);
+      let subject = msgHdr.mime2DecodedSubject || noSubject;
+      if (msgHdr.flags & Ci.nsMsgMessageFlags.HasRe) {
+        subject = "Re: " + subject;
+      }
+      let uniqueFileName = suggestUniqueFileName(subject.substr(0, 120), ".eml",
+                                                 fileNames);
+      fileNames[index] = uniqueFileName;
+      let msgUrl = {};
+      msgService.GetUrlForUri(msgUri, msgUrl, null);
+      dataTransfer.mozSetDataAt("text/x-moz-message", msgUri, index);
+      dataTransfer.mozSetDataAt("text/x-moz-url", msgUrl.value.spec, index);
+      dataTransfer.mozSetDataAt("application/x-moz-file-promise-url",
+                                 msgUrl.value.spec + "?fileName=" +
+                                 encodeURIComponent(uniqueFileName),
+                                 index);
+      dataTransfer.mozSetDataAt("application/x-moz-file-promise",
+                                new messageFlavorDataProvider(), index);
+    }
+    dataTransfer.effectAllowed = "copyMove";
+    dataTransfer.addElement(aEvent.originalTarget);
+  },
+
+  onDragOver(aEvent) {
+    if (!gMsgFolderSelected.canFileMessages ||
+        gMsgFolderSelected.server.type == "rss")
+      return;
+    let dt = aEvent.dataTransfer;
+    dt.effectAllowed = "copy";
+    for (let i = 0; i < dt.mozItemCount; i++) {
+      if (Array.from(dt.mozTypesAt(i)).includes("application/x-moz-file")) {
+        let extFile = dt.mozGetDataAt("application/x-moz-file", i);
+        if (!extFile) {
+          return;
+        }
+
+        extFile = extFile.QueryInterface(Ci.nsIFile);
+        if (extFile.isFile() && /\.eml$/i.test(extFile.leafName)) {
+          aEvent.preventDefault();
+          return;
+        }
+      }
+    }
+  },
+
+  onDrop(aEvent) {
+    let dt = aEvent.dataTransfer;
+    for (let i = 0; i < dt.mozItemCount; i++) {
+      let extFile = dt.mozGetDataAt("application/x-moz-file", i);
+      if (!extFile) {
+        continue;
+      }
+
+      extFile = extFile.QueryInterface(Ci.nsIFile);
+      if (extFile.isFile() && /\.eml$/i.test(extFile.leafName))
+        MailServices.copy.CopyFileMessage(extFile, gMsgFolderSelected, null,
+                                          false, 1, "", null, msgWindow);
+    }
+  },
+}
+
+function messageFlavorDataProvider() {}
+
+messageFlavorDataProvider.prototype = {
+  QueryInterface: XPCOMUtils.generateQI(["nsIFlavorDataProvider"]),
+
+  getFlavorData(aTransferable, aFlavor, aData, aDataLen) {
+    if (aFlavor !== "application/x-moz-file-promise") {
+      return;
+    }
+    let fileUriPrimitive = {};
+    let dataSize = {};
+    aTransferable.getTransferData("application/x-moz-file-promise-url",
+                                  fileUriPrimitive, dataSize);
+
+    let fileUriStr = fileUriPrimitive.value
+                                     .QueryInterface(Ci.nsISupportsString);
+    let fileUri = Services.io.newURI(fileUriStr.data);
+    let fileUrl = fileUri.QueryInterface(Ci.nsIURL);
+    let fileName = fileUrl.fileName;
+
+    let destDirPrimitive = {};
+    aTransferable.getTransferData("application/x-moz-file-promise-dir",
+                                  destDirPrimitive, dataSize);
+    let destDirectory = destDirPrimitive.value.QueryInterface(Ci.nsIFile);
+    let file = destDirectory.clone();
+    file.append(fileName);
+
+    let messageUriPrimitive = {};
+    aTransferable.getTransferData("text/x-moz-message", messageUriPrimitive,
+                                  dataSize);
+    let messageUri = messageUriPrimitive.value
+                                        .QueryInterface(Ci.nsISupportsString);
+
+    messenger.saveAs(messageUri.data, true, null, decodeURIComponent(file.path),
+                     true);
+  },
+};
+
 addEventListener("load",ThreadPaneOnLoad,true);
diff --git a/suite/mailnews/content/threadPane.xul b/suite/mailnews/content/threadPane.xul
--- a/suite/mailnews/content/threadPane.xul
+++ b/suite/mailnews/content/threadPane.xul
@@ -78,14 +78,14 @@
              label="&totalColumn.label;" tooltiptext="&totalColumn2.tooltip;"/>
     <splitter class="tree-splitter"/>
     <treecol id="locationCol" persist="width" flex="1" hidden="true" ignoreincolumnpicker="true"
              label="&locationColumn.label;" tooltiptext="&locationColumn2.tooltip;"/>
     <splitter class="tree-splitter"/>
     <treecol id="idCol" persist="hidden ordinal width" flex="1" hidden="true"
              label="&idColumn.label;" tooltiptext="&idColumn2.tooltip;"/>
   </treecols>
-  <treechildren ondragstart="ThreadPaneOnDragStart(event);"
-                ondragover="DragOverThreadPane(event);"
-                ondrop="DropOnThreadPane(event);"/>
+  <treechildren ondragstart="ThreadPaneDND.onDragStart(event);"
+                ondragover="ThreadPaneDND.onDragOver(event);"
+                ondrop="ThreadPaneDND.onDrop(event);"/>
 </tree>
 
 </overlay>
diff --git a/suite/mailnews/jar.mn b/suite/mailnews/jar.mn
--- a/suite/mailnews/jar.mn
+++ b/suite/mailnews/jar.mn
@@ -44,17 +44,16 @@ messenger.jar:
     content/messenger/mailWidgets.xml                                          (content/mailWidgets.xml)
     content/messenger/mailWindow.js                                            (content/mailWindow.js)
     content/messenger/mailWindowOverlay.js                                     (content/mailWindowOverlay.js)
 *   content/messenger/mailWindowOverlay.xul                                    (content/mailWindowOverlay.xul)
     content/messenger/messageWindow.js                                         (content/messageWindow.js)
     content/messenger/messageWindow.xul                                        (content/messageWindow.xul)
     content/messenger/messenger.css                                            (content/messenger.css)
     content/messenger/messenger.xul                                            (content/messenger.xul)
-    content/messenger/messengerdnd.js                                          (content/messengerdnd.js)
     content/messenger/msgHdrViewOverlay.js                                     (content/msgHdrViewOverlay.js)
     content/messenger/msgHdrViewOverlay.xul                                    (content/msgHdrViewOverlay.xul)
     content/messenger/msgMail3PaneWindow.js                                    (content/msgMail3PaneWindow.js)
     content/messenger/msgPrintEngine.xul                                       (content/msgPrintEngine.xul)
     content/messenger/msgViewNavigation.js                                     (content/msgViewNavigation.js)
     content/messenger/msgViewPickerOverlay.js                                  (content/msgViewPickerOverlay.js)
     content/messenger/nsDragAndDrop.js                                         (content/nsDragAndDrop.js)
     content/messenger/phishingDetector.js                                      (content/phishingDetector.js)