--- a/browser/components/preferences/jar.mn
+++ b/browser/components/preferences/jar.mn
@@ -25,14 +25,12 @@ browser.jar:
 *   content/browser/preferences/permissions.js
 *   content/browser/preferences/permissionsutils.js
 *   content/browser/preferences/preferences.xul
 *   content/browser/preferences/privacy.xul
 *   content/browser/preferences/privacy.js
 *   content/browser/preferences/sanitize.xul
 *   content/browser/preferences/security.xul
 *   content/browser/preferences/security.js
-*   content/browser/preferences/securityWarnings.xul
-*   content/browser/preferences/securityWarnings.js
 *   content/browser/preferences/selectBookmark.xul
 *   content/browser/preferences/selectBookmark.js
 *   content/browser/preferences/tabs.xul
 *   content/browser/preferences/tabs.js

--- a/browser/components/preferences/security.js
+++ b/browser/components/preferences/security.js
@@ -239,25 +239,11 @@ var gSecurityPane = {
    * Shows the sites where the user has saved passwords and the associated login
    * information.
    */
   showPasswords: function ()
   {
     document.documentElement.openWindow("Toolkit:PasswordManager",
                                         "chrome://passwordmgr/content/passwordManager.xul",
                                         "", null);
-  },
-
-
-  // WARNING MESSAGES
-
-  /**
-   * Displays the security warnings dialog which allows changing the
-   * "submitting unencrypted information", "moving from secure to unsecure",
-   * etc. dialogs that every user immediately disables when he sees them.
-   */
-  showWarningMessageSettings: function ()
-  {
-    document.documentElement.openSubDialog("chrome://browser/content/preferences/securityWarnings.xul",
-                                           "", null);
   }
 
 };

--- a/browser/components/preferences/security.xul
+++ b/browser/components/preferences/security.xul
@@ -136,25 +136,11 @@
         <spacer flex="1"/>
         <button id="showPasswords"
                 label="&savedPasswords.label;" accesskey="&savedPasswords.accesskey;"
                 oncommand="gSecurityPane.showPasswords();"
                 preference="pref.privacy.disable_button.view_passwords"/>
       </hbox>
     </groupbox>
 
-    <!-- Warning Messages -->
-    <hbox class="bottomBox">
-      <groupbox id="warningMessagesGroup" orient="horizontal" flex="1"
-                align="center">
-        <caption label="&warnings.label;"/>
-
-        <description control="warningSettings" flex="1">&chooseWarnings.label;</description>
-        <button id="warningSettings"
-                label="&warningSettings.label;"
-                accesskey="&warningSettings.accesskey;"
-                oncommand="gSecurityPane.showWarningMessageSettings();"/>
-      </groupbox>
-    </hbox>
-
   </prefpane>
 
 </overlay>

deleted file mode 100644
--- a/browser/components/preferences/securityWarnings.js
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# ***** BEGIN LICENSE BLOCK *****
-# 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
-# Gavin Sharp.
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Gavin Sharp <gavin@gavinsharp.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 *****
-
-function secWarningSyncTo(aEvent) {
-  var prefName = aEvent.target.getAttribute("preference") + ".show_once";
-  var prefOnce = document.getElementById(prefName);
-  prefOnce.value = false;
-  return undefined;    
-}

deleted file mode 100644
--- a/browser/components/preferences/securityWarnings.xul
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0"?>
-
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# ***** BEGIN LICENSE BLOCK *****
-# 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
-# Gavin Sharp.
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Gavin Sharp <gavin@gavinsharp.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/securityWarnings.dtd">
-
-<?xml-stylesheet href="chrome://global/skin/"?>
-
-<prefwindow id="SecurityWarnings" type="child"
-            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-            title="&securityWarnings.title;"
-            dlgbuttons="accept,cancel">
-
-  <prefpane id="SecurityWarningsPane">
-    <preferences>
-      <preference id="security.warn_entering_secure"
-                  name="security.warn_entering_secure"
-                  type="bool"/>
-      <preference id="security.warn_entering_secure.show_once"
-                  name="security.warn_entering_secure.show_once"
-                  type="bool"/>
-      <preference id="security.warn_entering_weak"
-                  name="security.warn_entering_weak"
-                  type="bool"/>
-      <preference id="security.warn_entering_weak.show_once"
-                  name="security.warn_entering_weak.show_once"
-                  type="bool"/>
-      <preference id="security.warn_leaving_secure"
-                  name="security.warn_leaving_secure"
-                  type="bool"/>
-      <preference id="security.warn_leaving_secure.show_once"
-                  name="security.warn_leaving_secure.show_once"
-                  type="bool"/>
-      <preference id="security.warn_submit_insecure"
-                  name="security.warn_submit_insecure"
-                  type="bool"/>
-      <preference id="security.warn_submit_insecure.show_once"
-                  name="security.warn_submit_insecure.show_once"
-                  type="bool"/>
-      <preference id="security.warn_viewing_mixed"
-                  name="security.warn_viewing_mixed"
-                  type="bool"/>
-      <preference id="security.warn_viewing_mixed.show_once"
-                  name="security.warn_viewing_mixed.show_once"
-                  type="bool"/>
-    </preferences>
-    
-    <script type="application/x-javascript" src="chrome://browser/content/preferences/securityWarnings.js"/>
-
-    <description value="&security.warn_when;"/>
-    <vbox class="indent">
-      <checkbox id="warn_entering_secure"
-                onsynctopreference="secWarningSyncTo(event);"
-                label="&security.warn_entering_secure.label;"
-                accesskey="&security.warn_entering_secure.accesskey;"
-                preference="security.warn_entering_secure"/>
-      <checkbox id="warn_entering_weak"
-                onsynctopreference="secWarningSyncTo(event);"
-                label="&security.warn_entering_weak.label;"
-                accesskey="&security.warn_entering_weak.accesskey;"
-                preference="security.warn_entering_weak"/>
-      <checkbox id="warn_leaving_secure"
-                onsynctopreference="secWarningSyncTo(event);"
-                label="&security.warn_leaving_secure.label;"
-                accesskey="&security.warn_leaving_secure.accesskey;"
-                preference="security.warn_leaving_secure"/>
-      <checkbox id="warn_submit_insecure"
-                onsynctopreference="secWarningSyncTo(event);"
-                label="&security.warn_submit_insecure.label;"
-                accesskey="&security.warn_submit_insecure.accesskey;"
-                preference="security.warn_submit_insecure"/>
-      <checkbox id="warn_viewing_mixed"
-                onsynctopreference="secWarningSyncTo(event);"
-                label="&security.warn_viewing_mixed.label;"
-                accesskey="&security.warn_viewing_mixed.accesskey;"
-                preference="security.warn_viewing_mixed"/>
-    </vbox>
-  </prefpane>
-</prefwindow>

--- a/browser/locales/en-US/chrome/browser/preferences/security.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/security.dtd
@@ -27,16 +27,8 @@
 
 <!ENTITY  useMasterPassword.label        "Use a master password">
 <!ENTITY  useMasterPassword.accesskey    "U">
 <!ENTITY  changeMasterPassword.label     "Change Master Password…">
 <!ENTITY  changeMasterPassword.accesskey "M">
 
 <!ENTITY  savedPasswords.label            "Saved Passwords…">
 <!ENTITY  savedPasswords.accesskey        "P">
-
-
-<!ENTITY  warnings.label                "Warning Messages">
-
-<!ENTITY  chooseWarnings.label          "Choose which warning messages you want to see while browsing the web">
-
-<!ENTITY  warningSettings.label         "Settings…">
-<!ENTITY  warningSettings.accesskey     "S">

deleted file mode 100644
--- a/browser/locales/en-US/chrome/browser/preferences/securityWarnings.dtd
+++ /dev/null
@@ -1,13 +0,0 @@
-<!ENTITY securityWarnings.title                   "Security Warnings">
-
-<!ENTITY security.warn_when                       "Show a warning dialog when:">
-<!ENTITY security.warn_entering_secure.label      "I am about to view an encrypted page.">
-<!ENTITY security.warn_entering_secure.accesskey  "v">
-<!ENTITY security.warn_entering_weak.label        "I am about to view a page that uses low-grade encryption.">
-<!ENTITY security.warn_entering_weak.accesskey    "g">
-<!ENTITY security.warn_leaving_secure.label       "I leave an encrypted page for one that isn't encrypted.">
-<!ENTITY security.warn_leaving_secure.accesskey   "l">
-<!ENTITY security.warn_submit_insecure.label      "I submit information that's not encrypted.">
-<!ENTITY security.warn_submit_insecure.accesskey  "s">
-<!ENTITY security.warn_viewing_mixed.label        "I'm about to view an encrypted page that contains some unencrypted information.">
-<!ENTITY security.warn_viewing_mixed.accesskey    "u">

--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -54,17 +54,16 @@
     locale/browser/preferences/fonts.dtd              (%chrome/browser/preferences/fonts.dtd)
     locale/browser/preferences/main.dtd               (%chrome/browser/preferences/main.dtd)
     locale/browser/preferences/languages.dtd          (%chrome/browser/preferences/languages.dtd)
     locale/browser/preferences/permissions.dtd        (%chrome/browser/preferences/permissions.dtd)
     locale/browser/preferences/preferences.dtd        (%chrome/browser/preferences/preferences.dtd)
     locale/browser/preferences/preferences.properties (%chrome/browser/preferences/preferences.properties)
     locale/browser/preferences/privacy.dtd            (%chrome/browser/preferences/privacy.dtd)
     locale/browser/preferences/security.dtd           (%chrome/browser/preferences/security.dtd)
-    locale/browser/preferences/securityWarnings.dtd   (%chrome/browser/preferences/securityWarnings.dtd)
     locale/browser/preferences/tabs.dtd               (%chrome/browser/preferences/tabs.dtd)
     locale/browser/sidebar/sidebar.properties      (%chrome/browser/sidebar/sidebar.properties)
 % locale browser-region @AB_CD@ %locale/browser-region/
     locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
 # the following files are browser-specific overrides
 *   locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)
 *   locale/browser/appstrings.properties       (%chrome/overrides/appstrings.properties)
 *   locale/browser/downloads/settingsChange.dtd  (%chrome/overrides/settingsChange.dtd)