diff --git a/content/preferences.xul b/content/preferences.xul
index 723c557..f19d49f 100644
--- a/content/preferences.xul
+++ b/content/preferences.xul
@@ -86,10 +86,10 @@
                accesskey="&feeds.accesskey;"/>
         <radio label="&twitter.label;"
                accesskey="&twitter.accesskey;"/>
-        <radio label="&mail.label;" disabled="true"
-               accesskey="&mail.accesskey;"/>
-        <radio label="&newsgroup.label;" disabled="true"
-               accesskey="&newsgroup.accesskey;"/>
+        <!--<radio label="&mail.label;" disabled="true"-->
+        <!--       accesskey="&mail.accesskey;"/>-->
+        <!--<radio label="&newsgroup.label;" disabled="true"-->
+        <!--       accesskey="&newsgroup.accesskey;"/>-->
       </radiogroup>
       <separator class="groove-thin"/>
 
@@ -181,22 +181,22 @@
   </prefpane>
   
   <!-- Subscriptions -->
-  <prefpane id="subscriptions"
-          label="&subscriptions.title;"
-          XXXonpaneload="SnowlPreferences.onPaneLoad();">
-    <groupbox>
-      <caption label="Subscriptions"/>
-    </groupbox>
-  </prefpane>
+  <!--<prefpane id="subscriptions"-->
+  <!--        label="&subscriptions.title;"-->
+  <!--        XXXonpaneload="SnowlPreferences.onPaneLoad();">-->
+  <!--  <groupbox>-->
+  <!--    <caption label="Subscriptions"/>-->
+  <!--  </groupbox>-->
+  <!--</prefpane>-->
 
   <!-- Organize -->
-  <prefpane id="organize"
-          label="&organize.title;"
-          XXXonpaneload="SnowlPreferences.onPaneLoad();">
-    <groupbox>
-      <caption label="Organize"/>
-    </groupbox>
-  </prefpane>
+  <!--<prefpane id="organize"-->
+  <!--        label="&organize.title;"-->
+  <!--        XXXonpaneload="SnowlPreferences.onPaneLoad();">-->
+  <!--  <groupbox>-->
+  <!--    <caption label="Organize"/>-->
+  <!--  </groupbox>-->
+  <!--</prefpane>-->
 
   <hbox id="resizerBox" flex="1">
     <spacer flex="1"/>
diff --git a/locale/en-US/preferences.dtd b/locale/en-US/preferences.dtd
index 936104c..a64feb3 100644
--- a/locale/en-US/preferences.dtd
+++ b/locale/en-US/preferences.dtd
@@ -2,9 +2,6 @@
 <!ENTITY prefWindow.title             "Snowl Options">
 <!ENTITY page.title                   "Snowl: Subscribe to Message Sources">
 
-<!-- General pane -->
-<!ENTITY general.title                "General">
-
 <!-- Subscribe pane -->
 <!ENTITY subscribe.title              "Subscribe">
 <!ENTITY source.label                 "Subscribe to a Message Source">
@@ -12,10 +9,6 @@
 <!ENTITY feeds.accesskey              "F">
 <!ENTITY twitter.label                "Twitter">
 <!ENTITY twitter.accesskey            "T">
-<!ENTITY mail.label                   "Mail">
-<!ENTITY mail.accesskey               "M">
-<!ENTITY newsgroup.label              "Newsgroup">
-<!ENTITY newsgroup.accesskey          "N">
 <!ENTITY location.label               "Location:">
 <!ENTITY name.label                   "Name:">
 <!ENTITY subscribeButton.label        "Subscribe">
@@ -25,8 +18,19 @@
 <!ENTITY clearButton.label            "Clear">
 <!ENTITY clearButton.accesskey        "C">
 
+<!-- The entities below are commented out because they aren't being used yet,
+   - and they may change before we start using them, so don't localize them. -->
+
+<!--<!ENTITY mail.label                   "Mail">-->
+<!--<!ENTITY mail.accesskey               "M">-->
+<!--<!ENTITY newsgroup.label              "Newsgroup">-->
+<!--<!ENTITY newsgroup.accesskey          "N">-->
+
+<!-- General pane -->
+<!--<!ENTITY general.title                "General">-->
+
 <!-- Subscriptions pane -->
-<!ENTITY subscriptions.title          "Subscriptions">
+<!--<!ENTITY subscriptions.title          "Subscriptions">-->
 
 <!-- Organize pane -->
-<!ENTITY organize.title               "Organize">
+<!--<!ENTITY organize.title               "Organize">-->