diff --git a/mozilla/editor/ui/composer/content/pref-composer.xul b/mozilla/editor/ui/composer/content/pref-composer.xul
index 82b96f7be68..9a77764738f 100644
--- a/mozilla/editor/ui/composer/content/pref-composer.xul
+++ b/mozilla/editor/ui/composer/content/pref-composer.xul
@@ -59,7 +59,9 @@
   <groupbox>
     <caption label="&recentFiles.title;"/>
     <hbox align="center">
-      <label value="&documentsInMenu;" accesskey="&documentsInMenu.accesskey;" control="recentFiles"/>
+      <label value = "&documentsInMenu.label;"
+        accesskey  = "&documentsInMenu.accesskey;"
+        control    = "recentFiles"/>
       <textbox
         id="recentFiles"
         name="recent string" 
@@ -76,27 +78,19 @@
   <groupbox>
     <caption label="&savingFiles.title;"/>
     <spacer class="spacer"/>
-    <radiogroup
-      id            = "preserveFormatting"
-      preftype      = "bool"
-      prefstring    = "editor.prettyprint">
-      <radio 
-        value       = "false"
-        label      = "&preserveExistingFormatting;" 
-        accesskey  = "&preserveExistingFormatting.accesskey;"
-        tooltiptext= "&preserveExistingFormatting.tooltip;"
-      />
-      <radio 
-        value       = "true"
-        label      = "&reformat.label;" 
-        accesskey  = "&reformat.accesskey;"
-        tooltiptext= "&reformat.tooltip;"
-      />
-    </radiogroup>
-    <separator class="thin"/>
+    <checkbox
+      label       = "&preserveExisting.label;"
+      id          = "preserveFormatting"
+      accesskey   = "&preserveExisting.accesskey;"
+      tooltiptext = "&preserveExisting.tooltip;"
+      preftype    = "bool"
+      prefstring  = "editor.prettyprint"
+      reversed    = "true"
+    />
     <checkbox 
       label      = "&saveAssociatedFiles.label;"
       id         = "saveAssociatedFiles"
+      accesskey  = "&saveAssociatedFiles.accesskey;"
       preftype   = "bool" 
       prefindex  = "0" 
       prefstring = "editor.save_associated_files"
@@ -104,6 +98,7 @@
     <checkbox 
       label      = "&showPublishDialog.label;"
       id         = "showPublishDialog"
+      accesskey  = "&showPublishDialog.accesskey;"
       preftype   = "bool" 
       prefindex  = "0" 
       prefstring = "editor.always_show_publish_dialog"
@@ -111,15 +106,26 @@
   </groupbox>
   
   <groupbox align="start">
-    <caption label="&tableEditing.label;"/>
+    <caption label = "&composerEditing.label;"/>
     <checkbox 
-      label     = "&maintainTableStructure.label;"
-      id        = "maintainTableStructure" 
-      accesskey = "&maintainStructure.accesskey;"
-      tooltiptext="&maintainTableStructure.tooltip;"
-      prefstring= "editor.table.maintain_structure"
+      label       = "&maintainStructure.label;"
+      id          = "maintainTableStructure" 
+      accesskey   = "&maintainStructure.accesskey;"
+      tooltiptext = "&maintainStructure.tooltip;"
+      prefstring  = "editor.table.maintain_structure"
     />
-    <separator class = "thin"/>
+    <checkbox
+      label      = "&useCSS.label;"
+      id         = "useCSS"
+      accesskey  = "&useCSS.accesskey;"
+      prefstring = "editor.use_css"
+    />
+    <checkbox
+      label      = "&crInPCreatesNewP.label;"
+      id         = "crInPCreatesNewP"
+      accesskey  = "&crInPCreatesNewP.accesskey;"
+      prefstring = "editor.CR_creates_new_p"
+      />
   </groupbox>
 
 <!-- Take out Auto-Save; not supported at this time
@@ -184,21 +190,4 @@
 
   </groupbox>
   -->
-  <groupbox>
-    <caption label="&cssEditing.label;"/>
-    <checkbox
-      label      = "&useCSS.label;"
-      id         = "useCSS"
-      prefstring = "editor.use_css"
-    />
-  </groupbox>
-
-  <groupbox>
-    <caption label="&carriageReturns.label;"/>
-    <checkbox
-      label      = "&crInPCreatesNewP.label;"
-      id         = "crInPCreatesNewP"
-      prefstring = "editor.CR_creates_new_p"
-      />
-  </groupbox>
 </page>
diff --git a/mozilla/editor/ui/locales/en-US/chrome/composer/pref-composer.dtd b/mozilla/editor/ui/locales/en-US/chrome/composer/pref-composer.dtd
index 3fa9bc62464..c19000edc8c 100644
--- a/mozilla/editor/ui/locales/en-US/chrome/composer/pref-composer.dtd
+++ b/mozilla/editor/ui/locales/en-US/chrome/composer/pref-composer.dtd
@@ -7,22 +7,6 @@
 <!ENTITY  lHeader                   "Composer">
 <!ENTITY  rHeader                   "Settings for authoring of new Web pages">
 
-<!ENTITY  tableEditing.label                    "Table Editing">
-<!ENTITY  maintainTableStructure.label          "Maintain table layout when inserting or deleting cells">
-<!ENTITY  maintainTableStructure.tooltip        "Preserves table's rectangular shape by automatically adding cells after inserting or deleting cells">
-<!ENTITY  maintainStructure.accesskey           "m">
-
-<!ENTITY  savingFiles.title           "When Saving or Publishing Pages">
-<!ENTITY  preserveExistingFormatting  "Retain original source formatting">
-<!ENTITY  preserveExistingFormatting.accesskey  "o">
-<!ENTITY  preserveExistingFormatting.tooltip    "Preserves line breaks and page's original formatting">
-<!ENTITY  reformat.label              "Reformat HTML source">
-<!ENTITY  reformat.accesskey          "r">
-<!ENTITY  reformat.tooltip            "Reformat HTML tags using line breaks and indentation">
-
-<!ENTITY  saveAssociatedFiles.label "Save images and other associated files when saving pages">
-<!ENTITY  showPublishDialog.label   "Always show Publish dialog when publishing pages">
-
 <!ENTITY  saving                    "Saving">
 <!ENTITY  AutoSaveCheck             "Automatically save every">
 <!ENTITY  minText                   "minutes">
@@ -33,12 +17,23 @@
 <!ENTITY  chooseButton.label        "Choose">
 
 <!ENTITY  recentFiles.title         "Recent Pages Menu">
-<!ENTITY  documentsInMenu.accesskey     "n">
-<!ENTITY  documentsInMenu           "Maximum number of pages listed:">
+<!ENTITY  documentsInMenu.label     "Maximum number of pages listed:">
+<!ENTITY  documentsInMenu.accesskey "n">
 
+<!ENTITY  savingFiles.title             "When Saving or Publishing Pages">
+<!ENTITY  preserveExisting.label        "Preserve original source formatting">
+<!ENTITY  preserveExisting.accesskey    "P">
+<!ENTITY  preserveExisting.tooltip      "Preserves line breaks and page's original formatting">
+<!ENTITY  saveAssociatedFiles.label     "Save images and other associated files when saving pages">
+<!ENTITY  saveAssociatedFiles.accesskey "S">
+<!ENTITY  showPublishDialog.label       "Always show Publish dialog when publishing pages">
+<!ENTITY  showPublishDialog.accesskey   "A">
 
-<!ENTITY  cssEditing.label          "Cascading Style Sheets (CSS) Editing">
-<!ENTITY  useCSS.label              "Use CSS styles instead of HTML elements and attributes">
-
-<!ENTITY  carriageReturns.label     "Behavior of the return key">
-<!ENTITY  crInPCreatesNewP.label    "Return in a paragraph always creates a new paragraph">
+<!ENTITY  composerEditing.label         "Editing">
+<!ENTITY  maintainStructure.label       "Maintain table layout when inserting or deleting cells">
+<!ENTITY  maintainStructure.tooltip     "Preserves table's rectangular shape by automatically adding cells after inserting or deleting cells">
+<!ENTITY  maintainStructure.accesskey   "M">
+<!ENTITY  useCSS.label                  "Use CSS styles instead of HTML elements and attributes">
+<!ENTITY  useCSS.accesskey              "U">
+<!ENTITY  crInPCreatesNewP.label        "Return in a paragraph always creates a new paragraph">
+<!ENTITY  crInPCreatesNewP.accesskey    "R">