diff --git a/mozilla/suite/browser/navigator.js b/mozilla/suite/browser/navigator.js
index 9a429b2753a..a31b196aae7 100644
--- a/mozilla/suite/browser/navigator.js
+++ b/mozilla/suite/browser/navigator.js
@@ -323,9 +323,6 @@ function Startup()
   window.browserContentListener =
     new nsBrowserContentListener(window, getBrowser());
   
-  // XXXjag hack for directory.xul/js
-  _content.appCore = appCore;
-
   // Initialize browser instance..
   appCore.setWebShellWindow(window);
 
@@ -343,10 +340,10 @@ function Startup()
       var arrayArgComponents = window.arguments[1].split("=");
       if (arrayArgComponents) {
         //we should "inherit" the charset menu setting in a new window
-        appCore.setDefaultCharacterSet(arrayArgComponents[1]); //XXXjag see bug 67442
+        getMarkupDocumentViewer().defaultCharacterSet = arrayArgComponents[1];
       }
     } else if (window.arguments[1].indexOf("turbo=yes") != -1) {
-        turboMode = true;
+      turboMode = true;
     }
   }
 
diff --git a/mozilla/suite/browser/viewsource.js b/mozilla/suite/browser/viewsource.js
index 576866742c9..5799eb832b2 100644
--- a/mozilla/suite/browser/viewsource.js
+++ b/mozilla/suite/browser/viewsource.js
@@ -66,7 +66,8 @@ function viewSource(url)
       if (window.arguments[1].indexOf('charset=') != -1) {
         var arrayArgComponents = window.arguments[1].split('=');
         if (arrayArgComponents) {
-          appCore.setDefaultCharacterSet(arrayArgComponents[1]); //XXXjag see bug 67442
+          //we should "inherit" the charset menu setting in a new window
+          getMarkupDocumentViewer().defaultCharacterSet = arrayArgComponents[1];
         } 
       }
     }