diff --git a/mozilla/security/manager/pki/resources/content/pref-ssl.xul b/mozilla/security/manager/pki/resources/content/pref-ssl.xul
index 3edd722289b..395156e7086 100644
--- a/mozilla/security/manager/pki/resources/content/pref-ssl.xul
+++ b/mozilla/security/manager/pki/resources/content/pref-ssl.xul
@@ -42,7 +42,7 @@
   <![CDATA[
     var _elementIDs = ["enableSSL2", "enableSSL3", "enableTLS", 
         "warnEnteringSecure", "warnEnteringWeak", 
-        "warnInsecurePost",
+        "warnLeavingSecure", "warnInsecurePost",
         "warnViewMixed" ];
   ]]>
   </script>
@@ -84,6 +84,9 @@
     <checkbox id="warnEnteringWeak" label="&warn.enteringweak;"
               pref="true" preftype="bool" prefstring="security.warn_entering_weak"
               prefattribute="checked"/>
+    <checkbox id="warnLeavingSecure" label="&warn.leavingsecure;"
+              pref="true" preftype="bool" prefstring="security.warn_leaving_secure"
+              prefattribute="checked"/>
     <checkbox id="warnInsecurePost" label="&warn.insecurepost;"
               pref="true" preftype="bool" prefstring="security.warn_submit_insecure"
               prefattribute="checked"/>
diff --git a/mozilla/security/manager/pki/resources/locale/en-US/pref-ssl.dtd b/mozilla/security/manager/pki/resources/locale/en-US/pref-ssl.dtd
index 996f9c09618..cda6bcaa9b3 100644
--- a/mozilla/security/manager/pki/resources/locale/en-US/pref-ssl.dtd
+++ b/mozilla/security/manager/pki/resources/locale/en-US/pref-ssl.dtd
@@ -32,13 +32,12 @@
 <!ENTITY edit.sslciphers "Edit Ciphers...">
 
 <!ENTITY warn.description "&brandShortName; can alert you to the security status of the web page you are viewing. Set &brandShortName; to show a warning and ask permission before:">
-<!ENTITY warn.enteringsecure "Entering a site that supports encryption">
-<!ENTITY warn.enteringweak "Entering a site that uses low-grade encryption">
-<!ENTITY warn.insecurepost
- "Sending form data from an insecure page to an insecure page">
-<!ENTITY warn.secureredirect "Redirection from one secure site to another">
-<!ENTITY warn.secureredirecttoinsecure
- "Redirection from a secure site to an insecure site">
+<!ENTITY warn.enteringsecure "Loading a page that supports encryption">
+<!ENTITY warn.enteringweak "Loading a page that uses low-grade encryption">
+<!ENTITY warn.insecurepost "Sending form data from an unencrypted page to an unencrypted page">
+<!ENTITY warn.leavingsecure "Leaving a page that supports encryption">
+<!ENTITY warn.secureredirect "Redirecting from one encrypted page to another">
+<!ENTITY warn.secureredirecttoinsecure "Redirecting from an encrypted page to an unencrypted page">
 <!ENTITY warn.viewmixed "Viewing a page with an encrypted/unencrypted mix">
 
 <!ENTITY certselect.description "Decide how &brandShortName; selects a security certificate to present to web sites that require one:">