Bug 473168: Move Again context menu item doesn't show destination folder. r=jminta

mail/base/content/mailContextMenus.js

@@ -44,12 +44,18 @@
 
 const mailtolength = 7;
 
-// Function to change the highlighted row back to the row that is currently
-// outline/dotted without loading the contents of either rows.  This is
-// triggered when the context menu for a given row is hidden/closed
-// (onpopuphiding).
+/**
+ * Function to change the highlighted row back to the row that is currently
+ * outline/dotted without loading the contents of either rows. This is
+ * triggered when the context menu for a given row is hidden/closed
+ * (onpopuphiding).
+ * @param tree the tree element to restore selection for
+ */
 function RestoreSelectionWithoutContentLoad(tree)
 {
+    if (!tree)
+      return;
+
     // If a delete or move command had been issued, then we should
     // reset gRightMouseButtonDown and gThreadPaneDeleteOrMoveOccurred
     // and return (see bug 142065).
@@ -182,8 +188,10 @@ function fillMailContextMenu(event)
 
   ShowMenuItem("mailContext-moveToFolderAgain",
                numSelected && !hideMailItems);
-  if (!numSelected && !hideMailItems)
+  if (numSelected && !hideMailItems) {
     initMoveToFolderAgainMenu(document.getElementById("mailContext-moveToFolderAgain"));
+    goUpdateCommand("cmd_moveToFolderAgain");
+  }
 
   ShowMenuItem("paneContext-afterMove", !inThreadPane);
 

mail/base/content/mailWindowOverlay.js

@@ -320,9 +320,11 @@ function InitMessageMenu()
 }
 
 /**
- * Enables / disables aMenuItem based on the value of
- * mail.last_msg_movecopy_target_uri and  adjusts the label and accesskey
- * for aMenuItem to include the folder name.
+ * Initializes the menu item aMenuItem to show either "Move" or "Copy" to
+ * folder again, based on the value of mail.last_msg_movecopy_target_uri.
+ * The menu item label and accesskey are adjusted to include the folder name.
+ *
+ * @param aMenuItem the menu item to adjust
  */
 function initMoveToFolderAgainMenu(aMenuItem)
 {

mail/base/content/mailWindowOverlay.xul

@@ -501,7 +501,7 @@
 
   <popup id="mailContext"
          onpopupshowing="return fillMailContextMenu(event);"
-         onpopuphiding="RestoreSelectionWithoutContentLoad(GetThreadTree());">
+         onpopuphiding="RestoreSelectionWithoutContentLoad(document.getElementById('threadTree'));">
     <menuseparator id="mailContext-sep-link"/>
     <menuitem id="mailContext-selectall"
               label="&selectAllCmd.label;"