diff --git a/mozilla/browser/app/profile/firefox.js b/mozilla/browser/app/profile/firefox.js
index bd8fd81b3b3..afa331a4021 100644
--- a/mozilla/browser/app/profile/firefox.js
+++ b/mozilla/browser/app/profile/firefox.js
@@ -263,6 +263,10 @@ pref("dom.disable_window_open_feature.status",    true);
 // cannot do it by default because it affects UE for web applications.
 pref("dom.disable_window_open_feature.location",  false);
 pref("dom.disable_window_status_change",          true);
+// prevent JS from moving/resizing existing windows
+pref("dom.disable_window_move_resize",            true);
+// prevent JS from monkeying with window focus, etc
+pref("dom.disable_window_flip",                   true);
  
 pref("browser.trim_user_and_password",            true);
 
diff --git a/mozilla/browser/components/preferences/advanced-scripts.xul b/mozilla/browser/components/preferences/advanced-scripts.xul
new file mode 100644
index 00000000000..d916f7ce007
--- /dev/null
+++ b/mozilla/browser/components/preferences/advanced-scripts.xul
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+# 
+# The Original Code is the Firefox Preferences System.
+# 
+# The Initial Developer of the Original Code is Mike Connor.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   Mike Connor <mconnor@steelgryphon.com>
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+# 
+# ***** END LICENSE BLOCK *****
+
+<!DOCTYPE prefwindow SYSTEM "chrome://browser/locale/preferences/advanced-scripts.dtd">
+
+<?xml-stylesheet href="chrome://global/skin/"?>
+
+<prefwindow id="AdvancedJSDialog" type="child"
+            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+            title="&advancedJSDialog.title;"
+            dlgbuttons="accept,cancel,help">
+
+  <prefpane id="AdvancedJSDialogPane"
+            helpTopic="prefs-advanced-javascript" helpURI="chrome://browser/locale/help/help.rdf">
+
+    <preferences>
+     <preference id="dom.event.contextmenu.enabled"  name="dom.event.contextmenu.enabled"  type="bool"/>
+     <preference id="dom.disable_window_move_resize" name="dom.disable_window_move_resize" type="bool" inverted="true"/>
+     <preference id="dom.disable_window_flip"        name="dom.disable_window_flip"        type="bool" inverted="true"/>
+     <preference id="dom.disable_window_open_feature.status" inverted="true"
+                 name="dom.disable_window_open_feature.status" type="bool"/>
+     <preference id="dom.disable_window_status_change" inverted="true"
+                 name="dom.disable_window_status_change" type="bool"/>
+    </preferences>
+    
+    <script type="application/x-javascript" src="chrome://browser/content/preferences/advanced-scripts.js"/>
+
+    <stringbundle id="preferencesBundle" src="chrome://browser/locale/preferences/preferences.properties"/>
+
+    <description value="&allowScripts.label;"/>
+
+    <checkbox id="moveResizeWindows" label="&moveResizeWindows.label;" 
+              accesskey="&moveResizeWindows.accesskey;"
+              preference="dom.disable_window_move_resize"/>
+    <checkbox id="raiseLowerWindows" label="&raiseLowerWindows.label;" 
+              accesskey="&raiseLowerWindows.accesskey;"
+              preference="dom.disable_window_flip"/>
+    <checkbox id="disableContextMenus" label="&disableContextMenus.label;" 
+              accesskey="&disableContextMenus.accesskey;"
+              preference="dom.event.contextmenu.enabled"/>
+    <checkbox id="hideStatusBar" label="&hideStatusBar.label;" 
+              accesskey="&hideStatusBar.accesskey;"
+              preference="dom.disable_window_open_feature.status"/>
+    <checkbox id="changeStatusBar" label="&changeStatusBar.label;" 
+              accesskey="&changeStatusBar.accesskey;"
+              preference="dom.disable_window_status_change"/>
+  </prefpane>
+</prefwindow>
+
diff --git a/mozilla/browser/components/preferences/content.js b/mozilla/browser/components/preferences/content.js
index 742bcbca435..00c346950b4 100644
--- a/mozilla/browser/components/preferences/content.js
+++ b/mozilla/browser/components/preferences/content.js
@@ -164,37 +164,12 @@ var gContentPane = {
     return undefined;
   },
   
-  readAnnoyancesEnabled: function ()
+  showAdvancedJS: function ()
   {
-    var contextMenuPref = document.getElementById("dom.event.contextmenu.enabled");
-    var windowMovePref = document.getElementById("dom.disable_window_move_resize");
-    var windowFlipPref = document.getElementById("dom.disable_window_flip");
-    var hideStatusPref = document.getElementById("dom.disable_window_open_feature.status");
-    var windowStatusPref = document.getElementById("dom.disable_window_status_change");
-    return !contextMenuPref.value && windowMovePref.value && 
-           windowFlipPref.value && hideStatusPref.value && 
-           windowStatusPref.value;
+    document.documentElement.openSubDialog("chrome://browser/content/preferences/advanced-scripts.xul",
+                                           "", null);  
   },
-  
-  writeAnnoyancesEnabled: function ()
-  {
-    var contextMenuPref = document.getElementById("dom.event.contextmenu.enabled");
-    var windowMovePref = document.getElementById("dom.disable_window_move_resize");
-    var windowFlipPref = document.getElementById("dom.disable_window_flip");
-    var hideStatusPref = document.getElementById("dom.disable_window_open_feature.status");
-    var windowStatusPref = document.getElementById("dom.disable_window_status_change");
-    
-    var disableAnnoyances = document.getElementById("disableAnnoyances");
-    contextMenuPref.value = !(windowMovePref.value = windowFlipPref.value = hideStatusPref.value = windowStatusPref.value = disableAnnoyances.checked);
-    return this.readAnnoyancesEnabled();    
-  },
-  
-  annoyancesPrefChanged: function ()
-  {
-    var jsannoyancesPref = document.getElementById("browser.jsannoyances.disabled");
-    jsannoyancesPref.updateElements();
-  },
-  
+
   showFonts: function ()
   {
     document.documentElement.openSubDialog("chrome://browser/content/preferences/fonts.xul",
diff --git a/mozilla/browser/components/preferences/content.xul b/mozilla/browser/components/preferences/content.xul
index 538cab1dcb1..0aa35da9969 100644
--- a/mozilla/browser/components/preferences/content.xul
+++ b/mozilla/browser/components/preferences/content.xul
@@ -50,19 +50,6 @@
       <preference id="permissions.default.image"      name="permissions.default.image"      type="int"/>
       <preference id="security.enable_java"           name="security.enable_java"           type="bool"/>
       <preference id="javascript.enabled"             name="javascript.enabled"             type="bool"/>
-      <preference id="browser.jsannoyances.disabled"  name="browser.jsannoyances.disabled"  type="bool"/>
-      <preference id="dom.event.contextmenu.enabled"  name="dom.event.contextmenu.enabled"  type="bool" 
-                  onchange="gContentPane.annoyancesPrefChanged();"/>
-      <preference id="dom.disable_window_move_resize" name="dom.disable_window_move_resize" type="bool"
-                  onchange="gContentPane.annoyancesPrefChanged();"/>
-      <preference id="dom.disable_window_flip"        name="dom.disable_window_flip"        type="bool"
-                  onchange="gContentPane.annoyancesPrefChanged();"/>
-      <preference id="dom.disable_window_open_feature.status"
-                  name="dom.disable_window_open_feature.status"
-                  type="bool" onchange="gContentPane.annoyancesPrefChanged();"/>
-      <preference id="dom.disable_window_status_change"
-                  name="dom.disable_window_status_change"
-                  type="bool" onchange="gContentPane.annoyancesPrefChanged();"/>
       <preference id="font.language.group"            name="font.language.group"            type="wstring"  onchange="gContentPane._rebuildFonts();"/>
       <preference id="pref.advanced.images.disable_button.view_image"
                   name="pref.advanced.images.disable_button.view_image"
@@ -136,11 +123,12 @@
                         label="&enableJavaScript.label;" accesskey="&enableJavaScript.accesskey;"
                         onsyncfrompreference="return gContentPane.updateButtons('disableAnnoyances', 
                                                                             'javascript.enabled');"/>
-              <checkbox id="disableAnnoyances" class="indent" 
-                        preference="browser.jsannoyances.disabled"
-                        label="&disableAnnoyances.label;" accesskey="&disableAnnoyances.accesskey;"
-                        onsyncfrompreference="return gContentPane.readAnnoyancesEnabled();"
-                        onsynctopreference="return gContentPane.writeAnnoyancesEnabled();"/>
+            </vbox>
+            <vbox>
+              <button id="advancedJSButton" label="&advancedJS.label;"
+                      accesskey="&advancedJS.accesskey;"
+                      oncommand="gContentPane.showAdvancedJS();"
+                      preference="pref.advanced.javascript.disable_button.advanced"/>
             </vbox>
           </row>
         </rows>
diff --git a/mozilla/browser/components/preferences/jar.mn b/mozilla/browser/components/preferences/jar.mn
index f04651519b5..6ff9fee6aac 100644
--- a/mozilla/browser/components/preferences/jar.mn
+++ b/mozilla/browser/components/preferences/jar.mn
@@ -1,6 +1,7 @@
 browser.jar:
 *   content/browser/preferences/advanced.xul
 *   content/browser/preferences/advanced.js
+*   content/browser/preferences/advanced-scripts.xul
 *   content/browser/preferences/changeaction.xul
 *   content/browser/preferences/changeaction.js
 *   content/browser/preferences/colors.xul
diff --git a/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced-scripts.dtd b/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced-scripts.dtd
new file mode 100644
index 00000000000..e4ea8cc452e
--- /dev/null
+++ b/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced-scripts.dtd
@@ -0,0 +1,52 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+#if 0
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is the Firefox Preferences System.
+   -
+   - The Initial Developer of the Original Code is Mike Connor.
+   - Portions created by the Initial Developer are Copyright (C) 2005
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+#endif
+   - ***** END LICENSE BLOCK ***** -->
+
+<!ENTITY advancedJSDialog.title         "Advanced JavaScript Settings">
+<!ENTITY window.width                   "37em">
+
+<!ENTITY allowScripts .label            "Allow scripts to:">
+
+<!ENTITY moveResizeWindows.label        "Move or resize existing windows">
+<!ENTITY moveResizeWindows.accesskey    "M">
+<!ENTITY raiseLowerWindows.label        "Raise or lower windows">
+<!ENTITY raiseLowerWindows.accesskey    "R">
+<!ENTITY disableContextMenus.label      "Disable or replace context menus">
+<!ENTITY disableContextMenus.accesskey  "D">
+<!ENTITY hideStatusBar.label            "Hide the status bar">
+<!ENTITY hideStatusBar.accesskey        "H">
+<!ENTITY changeStatusBar.label          "Change status bar text">
+<!ENTITY changeStatusBar.accesskey      "C">
diff --git a/mozilla/browser/locales/en-US/chrome/browser/preferences/content.dtd b/mozilla/browser/locales/en-US/chrome/browser/preferences/content.dtd
index 0cf0744dfda..1580cbc8a5b 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/preferences/content.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/preferences/content.dtd
@@ -4,9 +4,8 @@
 <!ENTITY  enbJavaCheck.accesskey            "J">
 <!ENTITY  enableJavaScript.label            "Enable JavaScript">
 <!ENTITY  enableJavaScript.accesskey        "S">
-<!ENTITY  disableAnnoyances.label           "but disable common annoyances">
-<!ENTITY  disableAnnoyances.accesskey       "y">
-
+<!ENTITY  advancedJS.label                  "Advanced...">
+<!ENTITY  advancedJS.accesskey              "v">
 
 <!ENTITY  enableImages.label                "Load Images">
 <!ENTITY  enableImages.accesskey            "I">
diff --git a/mozilla/browser/locales/en-US/chrome/help/firebird-toc.rdf b/mozilla/browser/locales/en-US/chrome/help/firebird-toc.rdf
index 8ad4456367a..500a685f84e 100644
--- a/mozilla/browser/locales/en-US/chrome/help/firebird-toc.rdf
+++ b/mozilla/browser/locales/en-US/chrome/help/firebird-toc.rdf
@@ -422,6 +422,7 @@
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="prefs-fonts-and-colors" nc:name="Fonts and Colors" nc:link="prefs.xhtml#fonts_and_colors"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="prefs-advanced-javascript" nc:name="Advanced Javascript Settings" nc:link="prefs.xhtml#advanced_javascript"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
diff --git a/mozilla/browser/locales/en-US/chrome/help/prefs.xhtml b/mozilla/browser/locales/en-US/chrome/help/prefs.xhtml
index c6268c1ebce..870714afd86 100644
--- a/mozilla/browser/locales/en-US/chrome/help/prefs.xhtml
+++ b/mozilla/browser/locales/en-US/chrome/help/prefs.xhtml
@@ -233,13 +233,28 @@ Contributors:
     JavaScript is often used to dynamically validate forms and select buttons.
     Disabling JavaScript may cause some sites to not work properly.</p>
 
-  <p>Having JavaScript enabled exposes you to certain annoyances. Select the
-    <em>but disable common annoyances</em> checkbox to disallow sites to
-    move or resize existing windows,
-    raise or lower windows,
-    disable or replace context menus,
-    hide the status bar,
-    or change status bar text.</p>
+  <h4 id="advanced_javascript">Advanced JavaScript Settings</h4>
+  <dl>
+    <dt>Move or resize existing windows</dt>
+    <dd>Uncheck this &pref.singular; to disable moving and resizing windows using
+      scripts.</dd>
+
+    <dt>Raise or lower windows</dt>
+    <dd>Uncheck this &pref.singular; to make sure scripts cannot raise or lower
+      windows.</dd>
+
+    <dt>Disable or replace context menus</dt>
+    <dd>Uncheck this &pref.singular; to prevent web pages from disabling or changing
+      the &brandShortName; context menu.</dd>
+
+    <dt>Hide the status bar</dt>
+    <dd>Uncheck this &pref.singular; to force the status bar to be displayed in popup
+      windows.</dd>
+
+    <dt>Change status bar text</dt>
+    <dd>Uncheck this &pref.singular; to disable annoying status bar text scrolling and
+      Web address hiding.</dd>
+  </dl>
 
   <h3 id="fonts_and_colors">Fonts &amp; Colors</h3>
     <p><em>Default Font</em> and <em>Size</em><br/>
diff --git a/mozilla/browser/locales/jar.mn b/mozilla/browser/locales/jar.mn
index f55c489c4d4..9749965885d 100644
--- a/mozilla/browser/locales/jar.mn
+++ b/mozilla/browser/locales/jar.mn
@@ -29,6 +29,7 @@
     locale/browser/migration/migration.dtd         (%chrome/browser/migration/migration.dtd)
     locale/browser/migration/migration.properties  (%chrome/browser/migration/migration.properties)
     locale/browser/preferences/advanced.dtd           (%chrome/browser/preferences/advanced.dtd)
+*   locale/browser/preferences/advanced-scripts.dtd   (%chrome/browser/preferences/advanced-scripts.dtd)
     locale/browser/preferences/changeaction.dtd       (%chrome/browser/preferences/changeaction.dtd)
     locale/browser/preferences/colors.dtd             (%chrome/browser/preferences/colors.dtd)
     locale/browser/preferences/cookies.dtd            (%chrome/browser/preferences/cookies.dtd)
diff --git a/mozilla/toolkit/locales/en-US/chrome/global/dialog.properties b/mozilla/toolkit/locales/en-US/chrome/global/dialog.properties
index 12861c2f24a..b28f7e9ce60 100644
--- a/mozilla/toolkit/locales/en-US/chrome/global/dialog.properties
+++ b/mozilla/toolkit/locales/en-US/chrome/global/dialog.properties
@@ -4,5 +4,5 @@ button-help=Help
 button-disclosure=More Info
 accesskey-accept=
 accesskey-cancel=
-accesskey-help=H
-accesskey-disclosure=I
+accesskey-help=
+accesskey-disclosure=