Attempt to fix broken context menus by including XPCNativeWrapper.js

Fix Save Image As context menu item.

mail/app/profile/all-thunderbird.js

@@ -262,6 +262,8 @@ pref("browser.download.progressDnldDialog.keepAlive", true); // keep the dnload
 pref("browser.download.progressDnldDialog.enable_launch_reveal_buttons", true);
 pref("browser.download.useDownloadDir", false);
 pref("browser.download.folderList", 0);
+pref("browser.download.autoDownload", false);
+pref("browser.download.lastLocation", false);
 
 // various default search settings
 pref("browser.search.defaulturl", "chrome://navigator-region/locale/region.properties");

mail/base/content/contentAreaClick.js

@@ -166,3 +166,27 @@
 
     return ioService.newURI(baseURI.resolve(url), null, null).spec;
   }
+
+  function findParentNode(node, parentNode)
+  {
+    if (node && node.nodeType == Node.TEXT_NODE) {
+      node = node.parentNode;
+    }
+    
+    while (node) {
+      var nodeName = node.localName;
+      if (!nodeName)
+        return null;
+      nodeName = nodeName.toLowerCase();
+      if (nodeName == "body" || nodeName == "html" ||
+          nodeName == "#document") {
+        return null;
+      }
+      if (nodeName == parentNode)
+        return node;
+      node = node.parentNode;
+    }
+    
+    return null;
+  }
+

mail/base/content/messageWindow.xul

@@ -59,6 +59,7 @@
   <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/messageWindow.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/nsContextMenu.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/mailContextMenus.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
@@ -66,6 +67,7 @@
   <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
 
   <commandset id="mailCommands">
     <commandset id="mailFileMenuItems"/>

mail/base/content/messenger.xul

@@ -59,6 +59,8 @@
 <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
+<script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
+<script type="application/x-javascript" src="chrome://communicator/content/nsContextMenu.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mailContextMenus.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/messengerdnd.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
@@ -67,6 +69,7 @@
 <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
 <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
 <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
 
 <!-- move needed functions into a single js file -->
 <script type="application/x-javascript" src="chrome://messenger/content/threadPane.js"/>