diff --git a/mozilla/suite/common/contentAreaContextOverlay.xul b/mozilla/suite/common/contentAreaContextOverlay.xul
index b2319301bbb..c78563afb25 100644
--- a/mozilla/suite/common/contentAreaContextOverlay.xul
+++ b/mozilla/suite/common/contentAreaContextOverlay.xul
@@ -52,6 +52,7 @@
   </script>
   <script type="application/x-javascript" src="chrome://communicator/content/nsContextMenu.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/XPCNativeWrapper.js"/>
 
   <popupset id="contentAreaContextSet">
     <!-- This is a generic context menu for a content area. It contains 
diff --git a/mozilla/suite/common/contentAreaUtils.js b/mozilla/suite/common/contentAreaUtils.js
index 1f1bed18e3e..44c4f97929b 100644
--- a/mozilla/suite/common/contentAreaUtils.js
+++ b/mozilla/suite/common/contentAreaUtils.js
@@ -45,8 +45,7 @@ function isContentFrame(aFocusedWindow)
   if (!aFocusedWindow)
     return false;
 
-  var focusedTop = Components.lookupMethod(aFocusedWindow, 'top')
-                             .call(aFocusedWindow);
+  var focusedTop = new XPCNativeWrapper(aFocusedWindow, 'top').top;
 
   return (focusedTop == window.content);
 }
@@ -69,7 +68,7 @@ function urlSecurityCheck(url, doc)
 function getContentFrameURI(aFocusedWindow)
 {
   var contentFrame = isContentFrame(aFocusedWindow) ? aFocusedWindow : window.content;
-  return Components.lookupMethod(contentFrame, 'location').call(contentFrame).href;
+  return new XPCNativeWrapper(contentFrame, "location").location.href;
 }
 
 function getReferrer(doc)
diff --git a/mozilla/suite/common/nsContextMenu.js b/mozilla/suite/common/nsContextMenu.js
index 7aaa090d160..522cb11c1a5 100644
--- a/mozilla/suite/common/nsContextMenu.js
+++ b/mozilla/suite/common/nsContextMenu.js
@@ -479,9 +479,9 @@ nsContextMenu.prototype = {
           // initialize popupURL
           const IOS = Components.classes["@mozilla.org/network/io-service;1"]
                       .getService(CI.nsIIOService);
-          var spec = Components.lookupMethod(window.content.opener, "location")
-                     .call();
-          this.popupURL = IOS.newURI(spec, null, null);
+          var opener = new XPCNativeWrapper(window.content, "opener").opener;
+          var location = new XPCNativeWrapper(opener, "location").location;
+          this.popupURL = IOS.newURI(location.href, null, null);
 
           // but cancel if it's an unsuitable URL
           const PM = Components.classes["@mozilla.org/PopupWindowManager;1"]
@@ -675,8 +675,8 @@ nsContextMenu.prototype = {
         // Let's try to unescape it using a character set
         // in case the address is not ASCII.
         try {
-          var characterSet = Components.lookupMethod(this.target.ownerDocument, "characterSet")
-                                       .call(this.target.ownerDocument);
+          var ownerDocument = new XPCNativeWrapper(this.target, "ownerDocument").ownerDocument;
+          var characterSet = new XPCNativeWrapper(ownerDocument, "characterSet").characterSet;
           const textToSubURI = Components.classes["@mozilla.org/intl/texttosuburi;1"]
                                          .getService(Components.interfaces.nsITextToSubURI);
           addresses = textToSubURI.unEscapeNonAsciiURI(characterSet, addresses);