Bug 1501360 - Port bug 1493844: Replace use of the "caption" and "groupbox" bindings in C-C. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Wed, 24 Oct 2018 10:17:37 +0200
changeset 33566 d79573211d8fea1ab085f703587da7391c257b52
parent 33565 10851da30d5ab9017513f2c94750023a2f6e1572
child 33567 97c5ad955dd4cc7e162cc418af4248aff595a5ce
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersjorgk
bugs1501360, 1493844
Bug 1501360 - Port bug 1493844: Replace use of the "caption" and "groupbox" bindings in C-C. r=jorgk
calendar/base/content/dialogs/calendar-event-dialog-recurrence.xul
calendar/base/content/dialogs/calendar-print-dialog.xul
calendar/base/content/preferences/alarms.xul
calendar/base/content/preferences/general.xul
calendar/base/content/preferences/views.xul
editor/ui/composer/content/pref-composer.xul
editor/ui/composer/content/pref-editing.xul
editor/ui/composer/content/pref-toolbars.xul
editor/ui/dialogs/content/EdButtonProps.xul
editor/ui/dialogs/content/EdColorProps.xul
editor/ui/dialogs/content/EdFieldSetProps.xul
editor/ui/dialogs/content/EdFormProps.xul
editor/ui/dialogs/content/EdHLineProps.xul
editor/ui/dialogs/content/EdImageProps.xul
editor/ui/dialogs/content/EdInputImage.xul
editor/ui/dialogs/content/EdInputProps.xul
editor/ui/dialogs/content/EdInsertChars.xul
editor/ui/dialogs/content/EdInsertMath.xul
editor/ui/dialogs/content/EdInsertTOC.xul
editor/ui/dialogs/content/EdInsertTable.xul
editor/ui/dialogs/content/EdLabelProps.xul
editor/ui/dialogs/content/EdLinkProps.xul
editor/ui/dialogs/content/EdListProps.xul
editor/ui/dialogs/content/EdSelectProps.xul
editor/ui/dialogs/content/EdTableProps.xul
editor/ui/dialogs/content/EdTextAreaProps.xul
editor/ui/dialogs/content/EditorPublishOverlay.xul
editor/ui/dialogs/content/EditorPublishSettings.xul
editor/ui/dialogs/content/EditorSaveAsCharset.xul
editor/ui/dialogs/content/edImage.inc
mail/components/preferences/advanced.inc.xul
mail/components/preferences/chat.inc.xul
mail/components/preferences/colors.xul
mail/components/preferences/compose.inc.xul
mail/components/preferences/connection.xul
mail/components/preferences/display.inc.xul
mail/components/preferences/dockoptions.xul
mail/components/preferences/fonts.xul
mail/components/preferences/general.inc.xul
mail/components/preferences/privacy.inc.xul
mail/components/preferences/sendoptions.xul
mail/themes/linux/editor/EditorDialog.css
mail/themes/linux/mail/messenger.css
mail/themes/osx/editor/EditorDialog.css
mail/themes/osx/mail/messenger.css
mail/themes/shared/mail/incontentprefs/aboutPreferences.css
mail/themes/windows/editor/EditorDialog.css
mail/themes/windows/mail/messenger.css
mailnews/base/prefs/content/SmtpServerEdit.xul
mailnews/base/prefs/content/am-addressing.inc
mailnews/base/prefs/content/am-archiveoptions.xul
mailnews/base/prefs/content/am-copies.inc
mailnews/base/prefs/content/am-identity-edit.xul
mailnews/base/prefs/content/am-junk.xul
mailnews/base/prefs/content/am-main.xul
mailnews/base/prefs/content/am-offline.xul
mailnews/base/prefs/content/am-server.xul
mailnews/base/prefs/content/am-serverwithnoidentities.xul
mailnews/base/search/content/FilterEditor.xul
mailnews/extensions/dsn/content/am-dsn.xul
mailnews/extensions/mdn/content/am-mdn.xul
mailnews/extensions/newsblog/content/am-newsblog.xul
mailnews/extensions/smime/content/am-smime.inc
mailnews/import/content/importDialog.xul
--- a/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xul
@@ -1,15 +1,16 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/content/bindings.css"?>
+<?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-daypicker.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/widgets/minimonth.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/widgets/calendar-widget-bindings.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css"?>
 
 <!DOCTYPE dialog [
@@ -29,18 +30,17 @@
   <!-- Javascript includes -->
   <script type="application/javascript" src="chrome://calendar/content/calendar-event-dialog-recurrence.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-statusbar.js"/>
 
   <!-- recurrence pattern -->
   <groupbox id="recurrence-pattern-groupbox">
-    <caption id="recurrence-pattern-caption"
-             label="&event.recurrence.pattern.label;"/>
+    <caption id="recurrence-pattern-caption">&event.recurrence.pattern.label;</caption>
     <grid id="recurrence-pattern-grid">
       <columns id="recurrence-pattern-columns">
         <column id="recurrence-pattern-description-column"/>
         <column id="recurrence-pattern-controls-column"/>
       </columns>
       <rows id="recurrence-pattern-rows">
         <row id="recurrence-pattern-repeat-row" align="center">
           <label value="&event.recurrence.occurs.label;"
@@ -451,18 +451,17 @@
           </deck>
         </row>
       </rows>
     </grid>
   </groupbox>
 
   <!-- range of recurrence -->
   <groupbox id="recurrence-range-groupbox">
-    <caption id="recurrence-range-caption"
-             label="&event.recurrence.range.label;"/>
+    <caption id="recurrence-range-caption">&event.recurrence.range.label;</caption>
     <vbox>
       <radiogroup id="recurrence-duration"
                   oncommand="updateRecurrenceControls()">
         <radio id="recurrence-range-forever"
                label="&event.recurrence.forever.label;"
                value="forever"
                selected="true"
                disable-on-readonly="true"
@@ -504,13 +503,12 @@
                       disable-on-occurrence="true"/>
         </box>
       </radiogroup>
     </vbox>
   </groupbox>
 
   <!-- preview -->
   <groupbox id="preview-border" flex="1">
-    <caption id="recurrence-preview-label"
-             label="&event.recurrence.preview.label;"/>
+    <caption id="recurrence-preview-label">&event.recurrence.preview.label;</caption>
     <recurrence-preview id="recurrence-preview" flex="1"/>
   </groupbox>
 </dialog>
--- a/calendar/base/content/dialogs/calendar-print-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-print-dialog.xul
@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet href="chrome://calendar/content/datetimepickers/datetimepickers.css" type="text/css"?>
 
 <!DOCTYPE dialog [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
 
@@ -27,17 +28,17 @@
 
   <script type="application/javascript" src="chrome://calendar/content/calendar-print-dialog.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
   <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
 
   <hbox id="firstHbox" flex="1">
     <vbox id="groupboxVbox">
       <groupbox id="settingsGroup">
-        <caption label="&calendar.print.settingsGroup.label;"/>
+        <caption>&calendar.print.settingsGroup.label;</caption>
 
         <grid>
           <columns>
             <column/>
             <column flex="1"/>
           </columns>
 
           <rows>
@@ -61,17 +62,17 @@
                 <spacer flex="1"/>
               </hbox>
             </row>
           </rows>
         </grid>
       </groupbox>
 
       <groupbox id="what-to-print-group">
-        <caption label="&calendar.print.range.label;"/>
+        <caption>&calendar.print.range.label;</caption>
         <grid id="grid-events-and-tasks">
           <columns id="columns-for-events-and-tasks">
             <column id="column-event">
               <checkbox id="events" label="&calendar.print.events.label;" checked="true"
                         oncommand="eventsAndTasksOptions(this.id); refreshHtml();" persist="checked" autocheck="false"/>
             </column>
             <column id="column-tasks">
               <checkbox id="tasks" label="&calendar.print.tasks.label;" checked="true"
@@ -109,17 +110,17 @@
                 <datepicker id="end-date-picker"
                             onchange="onDatePick();"/>
               </row>
             </rows>
           </grid>
         </radiogroup>
       </groupbox>
       <groupbox id="optionsGroup" label="&calendar.print.optionsGroup.label;">
-        <caption label="&calendar.print.optionsGroup.label;"/>
+        <caption>&calendar.print.optionsGroup.label;</caption>
         <checkbox id="tasks-with-no-due-date" label="&calendar.print.taskswithnoduedate.label;" checked="true" oncommand="refreshHtml();"/>
         <checkbox id="completed-tasks" label="&calendar.print.completedtasks.label;" checked="true" oncommand="refreshHtml();"/>
       </groupbox>
     </vbox>
 
     <splitter/>
 
     <iframe src="about:blank"
--- a/calendar/base/content/preferences/alarms.xul
+++ b/calendar/base/content/preferences/alarms.xul
@@ -57,17 +57,17 @@
                         name="calendar.alarms.todoalarmunit"
                         type="string"/>
             <preference id="calendar.alarms.defaultsnoozelength"
                         name="calendar.alarms.defaultsnoozelength"
                         type="int"/>
         </preferences>
 
         <groupbox>
-            <caption label="&pref.alarmgoesoff.label;"/>
+            <caption>&pref.alarmgoesoff.label;</caption>
             <grid id="alarm-sound-grid">
                 <columns id="alarm-sound-columns">
                     <column id="alarm-sound-label-column"/>
                     <column id="alarm-sound-content-column" flex="1"/>
                 </columns>
                 <rows id="alarm-sound-rows">
                     <row id="alarm-sound-soundfile-row" align="center">
                         <checkbox id="alarmSoundCheckbox"
@@ -114,17 +114,17 @@
                 <checkbox id="missedalarms"
                           preference="calendar.alarms.showmissed"
                           label="&pref.missedalarms2;"
                           accesskey="&pref.calendar.alarms.missedAlarms.accessKey;"/>
             </hbox>
         </groupbox>
 
         <groupbox>
-            <caption label="&pref.calendar.alarms.defaults.label;"/>
+            <caption>&pref.calendar.alarms.defaults.label;</caption>
             <grid>
                 <columns>
                     <column flex="1"/>
                     <column/>
                 </columns>
                 <rows>
                     <row align="center">
                         <label value="&pref.defaultsnoozelength.label;"
--- a/calendar/base/content/preferences/general.xul
+++ b/calendar/base/content/preferences/general.xul
@@ -63,17 +63,17 @@
                         name="calendar.agendaListbox.soondays"
                         type="int"/>
             <preference id="calendar.item.editInTab"
                         name="calendar.item.editInTab"
                         type="bool"/>
         </preferences>
 
         <groupbox>
-            <caption label="&pref.mainbox.label;"/>
+            <caption>&pref.mainbox.label;</caption>
             <vbox align="left">
               <hbox align="center">
                 <label value="&pref.dateformat.label;"
                        accesskey="&pref.dateformat.accesskey;"
                        control="dateformat"/>
                 <menulist id="dateformat" crop="none"
                           preference="calendar.date.format">
                     <menupopup id="dateformatpopup">
@@ -85,30 +85,30 @@
                                   value="1"/>
                     </menupopup>
                 </menulist>
               </hbox>
             </vbox>
         </groupbox>
 
         <groupbox>
-            <caption label="&pref.timezones.caption;"/>
+            <caption>&pref.timezones.caption;</caption>
             <hbox align="center">
                 <label value="&pref.timezones.label;"
                        accesskey="&pref.timezones.accesskey;"
                        control="calendar-timezone-menulist"/>
                 <menulist id="calendar-timezone-menulist"
                           preference="calendar-timezone-local">
                     <menupopup id="calendar-timezone-menupopup"/>
                 </menulist>
             </hbox>
         </groupbox>
 
         <groupbox id="defaults-itemtype-groupbox">
-            <caption id="defaults-itemtype-caption" label="&pref.defaults.label;"/>
+            <caption id="defaults-itemtype-caption">&pref.defaults.label;</caption>
             <hbox id="defaults-itemtype-box" align="top">
                 <menulist id="defaults-itemtype-menulist"
                           flex="1"
                           oncommand="gCalendarGeneralPane.updateItemtypeDeck()">
                     <menupopup id="defaults-itemtype-menupopup">
                         <menuitem id="defaults-itemtype-event"
                                   label="&pref.events.label;"
                                   value="defaults-event-grid"/>
@@ -258,17 +258,17 @@
                             </row>
                         </rows>
                     </grid>
                 </deck>
             </hbox>
         </groupbox>
 
         <groupbox>
-            <caption label="&pref.calendar.todaypane.agenda.caption;"/>
+            <caption>&pref.calendar.todaypane.agenda.caption;</caption>
             <hbox align="center">
                 <label value="&pref.soondays2.label;"
                        accesskey="&pref.soondays2.accesskey;"
                        control="soondays-menulist"/>
                 <menulist id="soondays-menulist"
                           preference="calendar.agendaListbox.soondays">
                     <menupopup id="soondaysdurationpopup">
                         <menuitem value="1"/>
@@ -282,27 +282,27 @@
                         <menuitem value="21"/>
                         <menuitem value="28"/>
                     </menupopup>
                 </menulist>
             </hbox>
         </groupbox>
 
         <groupbox id="systemColorsGroupbox">
-            <caption label="&pref.accessibility.label;"/>
+            <caption>&pref.accessibility.label;</caption>
             <hbox align="center">
                 <checkbox id="systemColors" pack="end"
                           label="&pref.systemcolors.label;"
                           accesskey="&pref.systemcolors.accesskey;"
                           preference="calendar.view.useSystemColors"/>
             </hbox>
         </groupbox>
 
         <groupbox>
-            <caption label="&pref.eventsandtasks.label;"/>
+            <caption>&pref.eventsandtasks.label;</caption>
             <hbox align="center">
                 <checkbox id="tabedit" pack="end"
                           label="&pref.editInTab.label;"
                           accesskey="&pref.editInTab.accesskey;"
                           preference="calendar.item.editInTab"/>
             </hbox>
         </groupbox>
     </vbox>
--- a/calendar/base/content/preferences/views.xul
+++ b/calendar/base/content/preferences/views.xul
@@ -70,17 +70,17 @@
                         name="calendar.previousweeks.inview"
                         type="int"/>
             <preference id="calendar.view.showLocation"
                         name="calendar.view.showLocation"
                         type="bool"/>
         </preferences>
 
         <groupbox>
-            <caption label="&pref.calendar.view.allview.caption;"/>
+            <caption>&pref.calendar.view.allview.caption;</caption>
             <hbox>
                 <hbox align="center" flex="1">
                     <label value="&pref.weekstarts.label;"
                            accesskey="&pref.weekstarts.accesskey;"
                            control="weekstarts"/>
                     <menulist id="weekstarts"
                               preference="calendar.week.start"
                               oncommand="gViewsPane.updateViewWorkDayCheckboxes(this.value)">
@@ -101,17 +101,17 @@
                               label="&pref.calendar.view-minimonth.showweeknumber.label;"
                               accesskey="&pref.calendar.view-minimonth.showweeknumber.accesskey;"
                               preference="calendar.view-minimonth.showWeekNumber"/>
                 </hbox>
             </hbox>
         </groupbox>
 
         <groupbox>
-            <caption label="&pref.calendar.view.workweek.caption;"/>
+            <caption>&pref.calendar.view.workweek.caption;</caption>
             <label value="&pref.daysoff.label;"/>
             <hbox>
                 <checkbox id="dayoff0"
                           class="dayOffCheckbox"
                           label="&day.1.Ddd;"
                           accesskey="&day.1.Ddd.accesskey;"
                           orient="vertical"
                           preference="calendar.week.d0sundaysoff"/>
@@ -150,17 +150,17 @@
                           label="&day.7.Ddd;"
                           accesskey="&day.7.Ddd.accesskey;"
                           orient="vertical"
                           preference="calendar.week.d6saturdaysoff"/>
             </hbox>
         </groupbox>
 
         <groupbox>
-            <caption label="&pref.calendar.view.dayandweekviews.caption;"/>
+            <caption>&pref.calendar.view.dayandweekviews.caption;</caption>
             <grid>
                 <columns>
                     <column/>
                     <column/>
                     <column flex="1"/>
                 </columns>
                 <rows>
                     <row align="center">
@@ -274,17 +274,17 @@
                                   preference="calendar.view.showLocation"/>
                         <spacer/>
                     </row>
                 </rows>
             </grid>
         </groupbox>
 
         <groupbox id="viewsMultiweekGroupbox">
-            <caption label="&pref.calendar.view.multiweekview.caption;"/>
+            <caption>&pref.calendar.view.multiweekview.caption;</caption>
             <hbox align="center">
                 <label value="&pref.numberofweeks.label;"
                        accesskey="&pref.numberofweeks.accesskey;"
                        control="viewsMultiweekTotalWeeks"/>
                 <menulist id="viewsMultiweekTotalWeeks"
                           preference="calendar.weeks.inview">
                     <menupopup>
                         <menuitem label="&pref.numberofweeks.1;" value="1"/>
--- a/editor/ui/composer/content/pref-composer.xul
+++ b/editor/ui/composer/content/pref-composer.xul
@@ -30,17 +30,17 @@
                   type="bool"/>
       <preference id="editor.CR_creates_new_p"
                   name="editor.CR_creates_new_p"
                   type="bool"/>
     </preferences>
 
     <!-- Recent files menu -->
     <groupbox>
-      <caption label="&recentFiles.title;"/>
+      <caption>&recentFiles.title;</caption>
       <hbox align="center">
         <label value="&documentsInMenu.label;"
                accesskey="&documentsInMenu.accesskey;"
                control="recentFiles"/>
         <textbox id="recentFiles"
                  name="recent string"
                  type="number"
                  max="99"
@@ -49,34 +49,34 @@
                  size="3"
                  value="10"
                  preference="editor.history.url_maximum"/>
       </hbox>
     </groupbox>
 
     <!-- HTML formatting on output -->
     <groupbox>
-      <caption label="&savingFiles.title;"/>
+      <caption>&savingFiles.title;</caption>
       <checkbox id="preserveFormatting"
                 label="&preserveExisting.label;"
                 accesskey="&preserveExisting.accesskey;"
                 tooltiptext="&preserveExisting.tooltip;"
                 preference="editor.prettyprint"/>
       <checkbox id="saveAssociatedFiles"
                 label="&saveAssociatedFiles.label;"
                 accesskey="&saveAssociatedFiles.accesskey;"
                 preference="editor.save_associated_files"/>
       <checkbox id="showPublishDialog"
                 label="&showPublishDialog.label;"
                 accesskey="&showPublishDialog.accesskey;"
                 preference="editor.always_show_publish_dialog"/>
     </groupbox>
 
     <groupbox align="start">
-      <caption label="&composerEditing.label;"/>
+      <caption>&composerEditing.label;</caption>
       <checkbox id="maintainTableStructure"
                 label="&maintainStructure.label;"
                 accesskey="&maintainStructure.accesskey;"
                 tooltiptext="&maintainStructure.tooltip;"
                 preference="editor.table.maintain_structure"/>
       <checkbox id="useCSS"
                 label="&useCSS.label;"
                 accesskey="&useCSS.accesskey;"
--- a/editor/ui/composer/content/pref-editing.xul
+++ b/editor/ui/composer/content/pref-editing.xul
@@ -58,17 +58,17 @@
         <textbox id="editorAuthor"
                  flex="1"
                  preference="editor.author"/>
         <spacer flex="1"/>
       </hbox>
     </vbox>
     <spacer class="smallspacer"/>
     <groupbox align="start">
-      <caption label="&pageColorHeader;"/>
+      <caption>&pageColorHeader;</caption>
       <radiogroup id="useCustomColors"
                   preference="editor.use_custom_colors">
         <radio id="defaultColorsRadio"
                value="false"
                label="&defaultColors.label;"
                accesskey="&defaultColors.accesskey;"/>
         <radio id="customColorsRadio"
                value="true"
--- a/editor/ui/composer/content/pref-toolbars.xul
+++ b/editor/ui/composer/content/pref-toolbars.xul
@@ -91,17 +91,17 @@
                   name="editor.toolbars.showbutton.underline"
                   type="bool"/>
       <preference id="editor.toolbars.showbutton.increaseZIndex"
                   name="editor.toolbars.showbutton.increaseZIndex"
                   type="bool"/>
     </preferences>
 
     <groupbox orient="horizontal">
-      <caption label="&composition.caption;"/>
+      <caption>&composition.caption;</caption>
       <vbox flex="1">
         <checkbox id="showNew"
                   label="&new.label;"
                   preference="editor.toolbars.showbutton.new"/>
         <checkbox id="showOpen"
                   label="&open.label;"
                   preference="editor.toolbars.showbutton.open"/>
         <checkbox id="showSave"
@@ -146,17 +146,17 @@
                   preference="editor.toolbars.showbutton.link"/>
         <checkbox id="showAnchor"
                   label="&anchor.label;"
                   preference="editor.toolbars.showbutton.namedAnchor"/>
       </vbox>
     </groupbox>
 
     <groupbox orient="horizontal">
-      <caption label="&formatting.caption;"/>
+      <caption>&formatting.caption;</caption>
       <vbox flex="1">
         <checkbox id="showSmaller"
                   label="&smaller.label;"
                   preference="editor.toolbars.showbutton.DecreaseFontSize"/>
         <checkbox id="showLarger"
                   label="&larger.label;"
                   preference="editor.toolbars.showbutton.IncreaseFontSize"/>
         <checkbox id="showBold"
--- a/editor/ui/dialogs/content/EdButtonProps.xul
+++ b/editor/ui/dialogs/content/EdButtonProps.xul
@@ -23,17 +23,17 @@
   <!-- Methods common to all editor dialogs -->
   <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdButtonProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
-  <groupbox><caption label="&Settings.label;"/>
+  <groupbox><caption>&Settings.label;</caption>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <label control="ButtonType" value="&ButtonType.label;" accesskey="&ButtonType.accesskey;"/>
           <menulist id="ButtonType">
             <menupopup>
               <menuitem label="&submit.value;"/>
               <menuitem label="&reset.value;"/>
--- a/editor/ui/dialogs/content/EdColorProps.xul
+++ b/editor/ui/dialogs/content/EdColorProps.xul
@@ -24,17 +24,17 @@
   <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdColorProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
 
   <groupbox align="start">
-    <caption label="&pageColors.label;"/>
+    <caption>&pageColors.label;</caption>
     <radiogroup id="PageColorGroup">
       <radio id="DefaultColorsRadio" label="&defaultColorsRadio.label;" oncommand="UseDefaultColors()"
         accesskey="&defaultColorsRadio.accessKey;"
         tooltiptext="&defaultColorsRadio.tooltip;" />
       <radio id="CustomColorsRadio" label="&customColorsRadio.label;" oncommand="UseCustomColors()"
         accesskey="&customColorsRadio.accessKey;"
         tooltiptext="&customColorsRadio.tooltip;" />
     </radiogroup>
--- a/editor/ui/dialogs/content/EdFieldSetProps.xul
+++ b/editor/ui/dialogs/content/EdFieldSetProps.xul
@@ -23,17 +23,17 @@
   <!-- Methods common to all editor dialogs -->
   <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdFieldSetProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
-  <groupbox><caption label="&Legend.label;" accesskey="&Legend.accesskey;"/>
+  <groupbox><caption accesskey="&Legend.accesskey;">&Legend.label;</caption>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <checkbox id="EditText" label="&EditLegendText.label;" accesskey="&EditLegendText.accesskey;" checked="true" disabled="true"
             oncommand="gDialog.legendText.disabled = !gDialog.editText.checked;"/>
           <textbox id="LegendText" accesskey="&Legend.accesskey;"/>
         </row>
         <row align="center">
--- a/editor/ui/dialogs/content/EdFormProps.xul
+++ b/editor/ui/dialogs/content/EdFormProps.xul
@@ -24,17 +24,17 @@
   <!-- Methods common to all editor dialogs -->
   <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdFormProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
-  <groupbox><caption label="&Settings.label;"/>
+  <groupbox><caption>&Settings.label;</caption>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <label control="FormName" value="&FormName.label;" accesskey="&FormName.accesskey;"/>
           <textbox id="FormName"/>
         </row>
         <row align="center">
           <label control="FormAction" value="&FormAction.label;" accesskey="&FormAction.accesskey;"/>
--- a/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/editor/ui/dialogs/content/EdHLineProps.xul
@@ -23,17 +23,17 @@
   <!-- Methods common to all editor dialogs -->
   <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <!--- Element-specific methods -->
   <script type="application/javascript" src="chrome://editor/content/EdHLineProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
-  <groupbox><caption label="&dimensionsBox.label;"/>
+  <groupbox><caption>&dimensionsBox.label;</caption>
     <grid>
       <columns><column/><column/><column /></columns>
       <rows>
         <row align="center">
           <label control="width"
                  value="&widthEditField.label;"
                  accesskey="&widthEditField.accessKey;"/>
           <textbox class="narrow" id="width" flex="1" oninput="forceInteger('width')"/>
@@ -46,17 +46,17 @@
                  accesskey="&heightEditField.accessKey;"/>
           <textbox class="narrow" id="height" oninput="forceInteger('height')"/>
           <label value="&pixelsPopup.value;" />
         </row>
       </rows>
     </grid>
     <checkbox id="3dShading" label="&threeDShading.label;" accesskey="&threeDShading.accessKey;"/>
   </groupbox>
-  <groupbox><caption label="&alignmentBox.label;"/>
+  <groupbox><caption>&alignmentBox.label;</caption>
     <radiogroup id="alignmentGroup" orient="horizontal">
       <spacer class="spacer"/>
       <radio id="leftAlign"   label="&leftRadio.label;"   accesskey="&leftRadio.accessKey;"/>
       <radio id="centerAlign" label="&centerRadio.label;" accesskey="&centerRadio.accessKey;"/>
       <radio id="rightAlign"  label="&rightRadio.label;"  accesskey="&rightRadio.accessKey;"/>
     </radiogroup>
   </groupbox>
   <spacer class="spacer"/>
--- a/editor/ui/dialogs/content/EdImageProps.xul
+++ b/editor/ui/dialogs/content/EdImageProps.xul
@@ -80,17 +80,17 @@
                   oncommand="onLinkAdvancedEdit();"/>
         </hbox>
       </vbox>
     </tabpanels>
   </tabbox>
 
   <hbox align="end">
     <groupbox id="imagePreview" orient="horizontal" flex="1">
-      <caption label="&previewBox.label;"/>
+      <caption>&previewBox.label;</caption>
       <hbox id="preview-image-box" align="center">
         <spacer flex="1"/>
         <description id="preview-image-holder"/>
         <spacer flex="1"/>
       </hbox>
       <vbox id="PreviewSize" collapsed="true">
         <spacer flex="1"/>
         <label value="&actualSize.label;"/>
--- a/editor/ui/dialogs/content/EdInputImage.xul
+++ b/editor/ui/dialogs/content/EdInputImage.xul
@@ -34,17 +34,17 @@
   <tabbox id="TabBox">
     <tabs flex="1">
       <tab id="imageInputTab" label="&imageInputTab.label;"/>
       <tab id="imageLocationTab" label="&imageLocationTab.label;"/>
       <tab id="imageDimensionsTab" label="&imageDimensionsTab.label;"/>
       <tab id="imageAppearanceTab" label="&imageAppearanceTab.label;"/>
     </tabs>
     <tabpanels>
-      <groupbox><caption label="&InputSettings.label;"/>
+      <groupbox><caption>&InputSettings.label;</caption>
         <grid><columns><column/><column/></columns>
           <rows>
             <row align="center">
               <label value="&InputName.label;"/>
               <textbox id="InputName"/>
             </row>
             <row>
               <spacer/>
@@ -60,17 +60,17 @@
         </grid>
       </groupbox>
 #include edImage.inc
     </tabpanels>
   </tabbox>
 
   <hbox align="end">
     <groupbox id="imagePreview" orient="horizontal" flex="1">
-      <caption label="&previewBox.label;"/>
+      <caption>&previewBox.label;</caption>
       <hbox id="preview-image-box" align="center">
         <spacer flex="1"/>
         <description id="preview-image-holder"/>
         <spacer flex="1"/>
       </hbox>
       <vbox id="PreviewSize" collapsed="true">
         <spacer flex="1"/>
         <label value="&actualSize.label;"/>
--- a/editor/ui/dialogs/content/EdInputProps.xul
+++ b/editor/ui/dialogs/content/EdInputProps.xul
@@ -40,17 +40,17 @@
         <menuitem label="&file.value;"/>
         <menuitem label="&hidden.value;"/>
         <menuitem label="&image.value;"/>
         <menuitem label="&button.value;"/>
       </menupopup>
     </menulist>
   </groupbox>
 
-  <groupbox><caption label="&InputSettings.label;"/>
+  <groupbox><caption>&InputSettings.label;</caption>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <deck id="InputNameDeck">
             <label control="InputName" value="&InputName.label;" accesskey="&InputName.accesskey;"/>
             <label control="InputName" value="&GroupName.label;" accesskey="&GroupName.accesskey;"/>
           </deck>
           <textbox id="InputName" oninput="onInput();"/>
--- a/editor/ui/dialogs/content/EdInsertChars.xul
+++ b/editor/ui/dialogs/content/EdInsertChars.xul
@@ -21,17 +21,17 @@
   <!-- Methods common to all editor dialogs -->
   <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdInsertChars.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
 
-  <groupbox><caption label="&category.label;"/>
+  <groupbox><caption>&category.label;</caption>
     <radiogroup id="CatGrp" persist="category letter_index char_index">
       <radio id="AccentUpper" label="&accentUpper.label;"   oncommand="ChangeCategory(this.id)"/>
       <radio id="AccentLower" label="&accentLower.label;"   oncommand="ChangeCategory(this.id)"/>
       <radio id="Upper"       label="&otherUpper.label;"    oncommand="ChangeCategory(this.id)"/>
       <radio id="Lower"       label="&otherLower.label;"    oncommand="ChangeCategory(this.id)"/>
       <radio id="Symbol"      label="&commonSymbols.label;" oncommand="ChangeCategory(this.id)"/>
     </radiogroup>
     <spacer class="spacer"/>
--- a/editor/ui/dialogs/content/EdInsertMath.xul
+++ b/editor/ui/dialogs/content/EdInsertMath.xul
@@ -35,17 +35,17 @@
     <description id="output"/>
   </vbox>
   <tabbox id="tabboxInsertLaTeXCommand">
     <tabs/>
     <tabpanels oncommand="insertLaTeXCommand(event.target);"/>
   </tabbox>
   <spacer class="spacer"/>
   <groupbox>
-    <caption label="&options.label;"/>
+    <caption>&options.label;</caption>
     <hbox>
       <radiogroup id="optionMode" oncommand="updateMode();">
         <radio label="&optionInline.label;"
                accesskey="&optionInline.accesskey;"/>
         <radio label="&optionDisplay.label;"
                accesskey="&optionDisplay.accesskey;"/>
       </radiogroup>
       <radiogroup id="optionDirection" oncommand="updateDirection();">
--- a/editor/ui/dialogs/content/EdInsertTOC.xul
+++ b/editor/ui/dialogs/content/EdInsertTOC.xul
@@ -21,17 +21,17 @@
 
   <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdInsertTOC.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <spacer id="dummy" style="display:none"/>
   <broadcaster id="args" value=""/>
   <vbox flex="1">
-    <groupbox><caption label="&buildToc.label;"/>
+    <groupbox><caption>&buildToc.label;</caption>
       <grid>
         <columns><column/><column style="min-width: 6em"/><column/></columns>
         <rows>
           <row align="center">
             <spacer/>
             <label value="&tag.label;"/>
             <label value="&class.label;"/>
           </row>
--- a/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/editor/ui/dialogs/content/EdInsertTable.xul
@@ -22,17 +22,17 @@
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdInsertTable.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
-  <groupbox><caption label="&size.label;"/>
+  <groupbox><caption>&size.label;</caption>
     <grid>
       <columns>
         <column flex="1"/>
         <column flex="1"/>
         <column flex="6"/>
       </columns>
       <rows>
         <row align="center">
--- a/editor/ui/dialogs/content/EdLabelProps.xul
+++ b/editor/ui/dialogs/content/EdLabelProps.xul
@@ -23,17 +23,17 @@
   <!-- Methods common to all editor dialogs -->
   <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdLabelProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
-  <groupbox><caption label="&Settings.label;" accesskey="&Settings.accesskey;"/>
+  <groupbox><caption accesskey="&Settings.accesskey;">&Settings.label;</caption>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <checkbox id="EditText" label="&EditLabelText.label;" accesskey="&EditLabelText.accesskey;" checked="true" disabled="true"
             oncommand="gDialog.labelText.disabled = !gDialog.editText.checked;"/>
           <textbox id="LabelText" accesskey="&Settings.accesskey;"/>
         </row>
         <row align="center">
--- a/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/editor/ui/dialogs/content/EdLinkProps.xul
@@ -33,17 +33,17 @@
   <vbox style="min-width: 20em">
     <groupbox><caption id="linkTextCaption"/>
       <vbox>
         <label id="linkTextMessage" control="linkTextInput"/>
         <textbox id="linkTextInput"/>
       </vbox>
     </groupbox>
 
-    <groupbox id="LinkURLBox"><caption label="&LinkURLBox.label;"/>
+    <groupbox id="LinkURLBox"><caption>&LinkURLBox.label;</caption>
       <vbox id="LinkLocationBox">
         <label control="hrefInput"
                accesskey="&LinkURLEditField2.accessKey;"
                width="1">&LinkURLEditField2.label;</label>
         <textbox id="hrefInput" type="autocomplete"
                  autocompletesearch="unifiedcomplete" timeout="50" maxrows="6"
                  class="uri-element padded" oninput="ChangeLinkLocation();">
           <menupopup class="autocomplete-history-popup"
--- a/editor/ui/dialogs/content/EdListProps.xul
+++ b/editor/ui/dialogs/content/EdListProps.xul
@@ -22,32 +22,32 @@
   <!-- Methods common to all editor dialogs -->
   <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdListProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
-  <groupbox flex="1"><caption label="&ListType.label;"/>
+  <groupbox flex="1"><caption>&ListType.label;</caption>
     <menulist id="ListType" oncommand="SelectListType()">
       <menupopup>
         <menuitem label="&none.value;"/>
         <menuitem value="ul" label="&bulletList.value;"/>
         <menuitem value="ol" label="&numberList.value;"/>
         <menuitem value="dl" label="&definitionList.value;"/>
       </menupopup>
     </menulist>
   </groupbox>
   <spacer class="spacer"/>
 
   <!-- message text and list items are set in JS
        text value should be identical to string with id=BulletStyle in editor.properties
   -->
-  <groupbox flex="1"><caption id="BulletStyleLabel" label="&bulletStyle.label;"/>
+  <groupbox flex="1"><caption id="BulletStyleLabel">&bulletStyle.label;</caption>
     <menulist class="MinWidth10em" id="BulletStyle" oncommand="SelectBulletStyle()">
       <menupopup/>
     </menulist>
     <spacer class="spacer"/>
     <hbox>
       <label id="StartingNumberLabel" control="StartingNumber"
              value="&startingNumber.label;" accesskey="&startingNumber.accessKey;"/>
       <textbox class="narrow" id="StartingNumber"/>
--- a/editor/ui/dialogs/content/EdSelectProps.xul
+++ b/editor/ui/dialogs/content/EdSelectProps.xul
@@ -38,17 +38,17 @@
         <treecol id="SelectSelCol" label="&SelectedHeader.label;" cycler="true"/>
       </treecols>
 
       <treechildren id="SelectTreeChildren"/>
     </tree>
 
     <hbox flex="1">
       <deck flex="1" id="SelectDeck" index="0">
-        <groupbox flex="1"><caption label="&Select.label;"/>
+        <groupbox flex="1"><caption>&Select.label;</caption>
           <grid flex="1"><columns><column flex="1"/><column/></columns>
             <rows>
               <row align="center">
                 <label control="SelectName" value="&SelectName.label;" accesskey="&SelectName.accesskey;"/>
                 <textbox id="SelectName" flex="1" oninput="onNameInput();"/>
               </row>
               <row align="center">
                 <label control="SelectSize" value="&SelectSize.label;" accesskey="&SelectSize.accesskey;"/>
@@ -69,32 +69,32 @@
                 <hbox>
                   <textbox id="SelectTabIndex" class="narrow" oninput="forceInteger(this.id);"/>
                 </hbox>
               </row>
             </rows>
           </grid>
         </groupbox>
 
-        <groupbox flex="1"><caption label="&OptGroup.label;"/>
+        <groupbox flex="1"><caption>&OptGroup.label;</caption>
           <grid flex="1"><columns><column flex="1"/><column/></columns>
             <rows>
               <row align="center">
                 <label control="OptGroupLabel" value="&OptGroupLabel.label;" accesskey="&OptGroupLabel.accesskey;"/>
                 <textbox id="OptGroupLabel" oninput="onLabelInput();"/>
               </row>
               <row>
                 <spacer/>
                 <checkbox id="OptGroupDisabled" label="&OptGroupDisabled.label;" accesskey="&OptGroupDisabled.accesskey;"/>
               </row>
             </rows>
           </grid>
         </groupbox>
 
-        <groupbox flex="1"><caption label="&Option.label;"/>
+        <groupbox flex="1"><caption>&Option.label;</caption>
           <grid flex="1"><columns><column flex="1"/><column/></columns>
             <rows>
               <row align="center">
                 <label control="OptionText" value="&OptionText.label;" accesskey="&OptionText.accesskey;"/>
                 <textbox id="OptionText" oninput="onTextInput();"/>
               </row>
               <row align="center">
                 <checkbox id="OptionHasValue" label="&OptionValue.label;" accesskey="&OptionValue.accesskey;" oncommand="onHasValueClick();"/>
--- a/editor/ui/dialogs/content/EdTableProps.xul
+++ b/editor/ui/dialogs/content/EdTableProps.xul
@@ -38,17 +38,17 @@
     <tabs flex="1">
       <tab id="TableTab" label="&tableTab.label;"/>
       <tab id="CellTab" label="&cellTab.label;"/>
     </tabs>
     <tabpanels>
 
       <!-- TABLE PANEL -->
       <vbox>
-        <groupbox orient="horizontal"><caption label="&size.label;"/>
+        <groupbox orient="horizontal"><caption>&size.label;</caption>
           <grid>
             <columns><column/><column/><column/><column/><column/></columns>
               <rows>
                 <row align="center">
                   <label value="&tableRows.label;" accesskey="&tableRows.accessKey;" control="TableRowsInput"/>
                   <textbox class="narrow" id="TableRowsInput" oninput="forceInteger(this.id);"/>
                   <spring class="bigspacer"/>
                   <label value="&tableHeight.label;" accesskey="&tableHeight.accessKey;"
@@ -63,17 +63,17 @@
                 <label value="&tableWidth.label;" accesskey="&tableWidth.accessKey;" control="TableWidthInput"/>
                 <textbox class="narrow" id="TableWidthInput" oninput="forceInteger(this.id);"/>
                 <menulist id="TableWidthUnits"/>
               </row>
             </rows>
             <!-- KEEP GRID LAYOUT here since we will be adding back support for table HEIGHT via CSS -->
           </grid>
         </groupbox>
-        <groupbox><caption label="&tableBorderSpacing.label;"/>
+        <groupbox><caption>&tableBorderSpacing.label;</caption>
         <grid>
           <columns><column/><column/><column/></columns>
           <rows>
             <row align="center">
               <label control="BorderWidthInput"
                      value="&tableBorderWidth.label;"
                      accesskey="&tableBorderWidth.accessKey;"/>
               <textbox class="narrow" id="BorderWidthInput" oninput="forceInteger(this.id);"/>
@@ -141,17 +141,17 @@
             tooltiptext="&AdvancedEditButton.tooltip;"/>
         </hbox>
         <spacer flex="1"/>
       </vbox><!-- Table Panel -->
 
       <!-- CELL PANEL -->
       <vbox>
         <groupbox orient="horizontal" align="center">
-          <caption label="&cellSelection.label;"/>
+          <caption>&cellSelection.label;</caption>
           <vbox>
             <menulist id="SelectionList" oncommand="ChangeSelection(event.target.value)" flex="1">
               <menupopup>
                 <!-- JS code assumes order is Cell, Row, Column -->
                 <menuitem label="&cellSelectCell.label;"   value="1"/>
                 <menuitem label="&cellSelectRow.label;"    value="2"/>
                 <menuitem label="&cellSelectColumn.label;" value="3"/>
               </menupopup>
@@ -178,17 +178,17 @@
               </button>
             </hbox>
           </vbox>
           <spacer class="bigspacer"/>
             <description class="wrap" flex="1">&applyBeforeChange.label;</description>
         </groupbox>
         <hbox align="center">
           <!-- cell size groupbox -->
-          <groupbox><caption label="&size.label;"/>
+          <groupbox><caption>&size.label;</caption>
             <grid>
               <columns><column/><column/><column flex="1"/></columns>
               <rows>
                 <row align="center">
                   <checkbox id="CellHeightCheckbox" label="&tableHeight.label;" accesskey="&tableHeight.accessKey;"/>
                   <textbox class="narrow" id="CellHeightInput"
                            oninput="ChangeIntTextbox(this.id,'CellHeightCheckbox');"/>
                   <menulist id="CellHeightUnits" oncommand="SetCheckbox('CellHeightCheckbox');"/>
@@ -199,17 +199,17 @@
                            oninput="ChangeIntTextbox(this.id,'CellWidthCheckbox');"/>
                   <menulist id="CellWidthUnits" oncommand="SetCheckbox('CellWidthCheckbox');"/>
                 </row>
               </rows>
             </grid>
             <spacer class="bigspacer"/>
           </groupbox>
           <!-- Alignment -->
-          <groupbox><caption label="&cellContentAlignment.label;"/>
+          <groupbox><caption>&cellContentAlignment.label;</caption>
             <grid>
               <columns><column/><column flex="1"/><column/></columns>
               <rows>
                 <row align="center">
                   <checkbox id="CellVAlignCheckbox" label="&cellVertical.label;" accesskey="&cellVertical.accessKey;"/>
                   <menulist id="CellVAlignList" oncommand="SetCheckbox('CellVAlignCheckbox');">
                     <menupopup>
                       <menuitem label="&cellAlignTop.label;"    value="top"/>
--- a/editor/ui/dialogs/content/EdTextAreaProps.xul
+++ b/editor/ui/dialogs/content/EdTextAreaProps.xul
@@ -23,17 +23,17 @@
   <!-- Methods common to all editor dialogs -->
   <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/javascript" src="chrome://editor/content/EdTextAreaProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
-  <groupbox><caption label="&Settings.label;"/>
+  <groupbox><caption>&Settings.label;</caption>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <label control="TextAreaName" value="&TextAreaName.label;" accesskey="&TextAreaName.accessKey;"/>
           <textbox id="TextAreaName" oninput="onInput();"/>
         </row>
         <row align="center">
           <label control="TextAreaRows" value="&TextAreaRows.label;" accesskey="&TextAreaRows.accessKey;"/>
--- a/editor/ui/dialogs/content/EditorPublishOverlay.xul
+++ b/editor/ui/dialogs/content/EditorPublishOverlay.xul
@@ -9,17 +9,17 @@
 
 <!DOCTYPE overlay SYSTEM "chrome://editor/locale/EditorPublish.dtd">
 
 <overlay id="EditorPublishOverlay"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <vbox id="PublishSettingsInputs">
   <groupbox id="ServerSettingsBox">
-    <caption label="&serverInfo.label;"/>
+    <caption>&serverInfo.label;</caption>
     <hbox align="center">
       <label value="&siteName.label;" accesskey="&siteName.accesskey;"
              control="SiteNameInput"/>
       <textbox id="SiteNameInput" class="MinWidth20em" flex="1"
                tooltiptext="&siteName.tooltip;" oninput="onInputSettings();"/>
     </hbox>
     <spacer class="spacer"/>
     <label value="&siteUrl.label;" accesskey="&siteUrl.accesskey;"
@@ -29,17 +29,17 @@
     <spacer class="spacer"/>
     <label value="&browseUrl.label;" accesskey="&browseUrl.accesskey;"
            control="BrowseUrlInput"/>
     <textbox id="BrowseUrlInput" class="MinWidth20em uri-element"
              tooltiptext="&browseUrl.tooltip;" oninput="onInputSettings();"/>
     <spacer class="spacer"/>
   </groupbox>
   <groupbox id="LoginSettingsBox">
-    <caption label="&loginInfo.label;"/>
+    <caption>&loginInfo.label;</caption>
     <grid>
       <columns><column flex="1"/><column flex="3"/></columns>
       <rows>
         <row align="center">
           <label value="&username.label;" accesskey="&username.accesskey;"
                  control="UsernameInput"/>
           <textbox id="UsernameInput" class="MinWidth10em" flex="1"
                    tooltiptext="&username.tooltip;" oninput="onInputSettings();"/>
--- a/editor/ui/dialogs/content/EditorPublishSettings.xul
+++ b/editor/ui/dialogs/content/EditorPublishSettings.xul
@@ -25,17 +25,17 @@
   <script type="application/javascript" src="chrome://editor/content/EditorPublishSettings.js"/>
   <script type="application/javascript" src="chrome://editor/content/publishprefs.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
 
   <hbox id="SettingsPanel">
     <groupbox align="center">
-      <caption label="&publishSites.label;"/>
+      <caption>&publishSites.label;</caption>
       <!-- XXX: If tree isn't wrapped in vbox, it appears BELOW next vbox -->
       <vbox flex="1">
         <listbox rows="4" id="SiteList" flex="1"  onselect="SelectSiteList();"/>
       </vbox>
       <hbox pack="center">
         <vbox>
           <button id="NewSiteButton" label="&newSiteButton.label;"
                   accesskey="&newSiteButton.accesskey;" oncommand="AddNewSite();"/>
--- a/editor/ui/dialogs/content/EditorSaveAsCharset.xul
+++ b/editor/ui/dialogs/content/EditorSaveAsCharset.xul
@@ -17,17 +17,18 @@
 
     <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
     <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
     <script type="application/javascript" src="chrome://editor/content/EditorSaveAsCharset.js"/>
 
     <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
     <broadcaster id="args" value=""/>
 
-    <groupbox><caption label="&documentTitleTitle.label;"/>
+    <groupbox>
+        <caption>&documentTitleTitle.label;</caption>
         <label id="EnterTitleLabel"/>
         <textbox id="TitleInput" oninput="TitleChanged();"/>
         <description id="TitleHelp" class="wrap" style="width:1em" />
     </groupbox>
 
     <groupbox flex="1"><caption label="&documentCharsetTitle2.label;"/>
         <label value="&documentCharsetDesc2.label;"/>
         <tree id="CharsetTree" rows="8" hidecolumnpicker="true" onselect="SelectCharset();">
--- a/editor/ui/dialogs/content/edImage.inc
+++ b/editor/ui/dialogs/content/edImage.inc
@@ -143,17 +143,17 @@
             </row>
           </rows>
         </grid>
         <spacer flex="1"/>
       </vbox>
 
       <hbox id="imageAppearance">
         <groupbox>
-          <caption id="spacingLabel" label="&spacingBox.label;"/>
+          <caption id="spacingLabel">&spacingBox.label;</caption>
           <grid>
             <columns><column/><column/><column/></columns>
             <rows>
               <row align="center">
                 <label
                   class = "align-right"
                   id    = "leftrightLabel"
                   control = "imageleftrightInput"
@@ -197,17 +197,17 @@
                        value="&pixelsPopup.value;" />
               </row>
             </rows>
           </grid>
         </groupbox>
 
         <vbox>
           <groupbox align="start">
-            <caption id="alignLabel" label="&alignment.label;"/>
+            <caption id="alignLabel">&alignment.label;</caption>
             <menulist id="alignTypeSelect" class="align-menu">
               <menupopup>
                 <menuitem class="align-menu menuitem-iconic"
                           value="top"
                           label="&topPopup.value;"/>
                 <menuitem class="align-menu menuitem-iconic"
                           value="middle"
                           label="&centerPopup.value;"/>
@@ -221,17 +221,17 @@
                 <menuitem class="align-menu menuitem-iconic"
                           value="left"
                           label="&wrapRightPopup.value;"/>
               </menupopup>
             </menulist>
           </groupbox>
 
           <groupbox>
-            <caption id="imagemapLabel" label="&imagemapBox.label;"/>
+            <caption id="imagemapLabel">&imagemapBox.label;</caption>
             <hbox equalsize="always">
             <button id="removeImageMap"
                     oncommand="removeImageMap()"
                     accesskey="&removeImageMapButton.accessKey;"
                     label="&removeImageMapButton.label;"
                     flex="1"/>
             <spacer flex="1"/><!-- remove when we restore Image Map Editor -->
             </hbox>
--- a/mail/components/preferences/advanced.inc.xul
+++ b/mail/components/preferences/advanced.inc.xul
@@ -138,17 +138,17 @@
             <button id="showReturnReceipts"
                     label="&showReturnReceipts.label;"
                     accesskey="&showReturnReceipts.accesskey;"
                     oncommand="gAdvancedPane.showReturnReceipts();"/>
           </hbox>
 
           <!-- Scrolling -->
           <groupbox id="scrollingGroup">
-            <caption label="&scrolling.label;"/>
+            <caption>&scrolling.label;</caption>
             <hbox>
               <checkbox id="useAutoScroll"
                         label="&useAutoScroll.label;"
                         accesskey="&useAutoScroll.accesskey;"
                         preference="general.autoScroll"/>
               <spacer flex="1"/>
             </hbox>
             <hbox>
@@ -157,17 +157,17 @@
                         accesskey="&useSmoothScrolling.accesskey;"
                         preference="general.smoothScroll"/>
               <spacer flex="1"/>
             </hbox>
           </groupbox>
 
           <!-- Date and time formatting -->
           <groupbox>
-            <caption label="&dateTimeFormatting.label;"/>
+            <caption>&dateTimeFormatting.label;</caption>
             <hbox>
             <radiogroup id="formatLocale"
                         preference="intl.regional_prefs.use_os_locales"
                         orient="vertical">
               <hbox>
                 <radio id="appLocale"
                        value="false"/>
                        <!-- label and accesskey will be set dynamically -->
@@ -179,17 +179,17 @@
                        <!-- label and accesskey will be set dynamically -->
                 <spacer flex="1"/>
               </hbox>
             </radiogroup>
             </hbox>
           </groupbox>
 
           <groupbox id="messengerLanguagesBox" hidden="true">
-            <caption label="&languageSelector.label;"/>
+            <caption>&languageSelector.label;</caption>
              <vbox align="start">
               <description flex="1"
                            controls="chooseMessengerLanguage"
                            data-l10n-id="choose-messenger-language-description"/>
               <hbox>
                 <menulist id="defaultMessengerLanguage"
                           oncommand="gAdvancedPane.onMessengerLanguageChange(event)">
                   <menupopup/>
@@ -210,17 +210,17 @@
                 <button class="message-bar-button"
                         oncommand="gAdvancedPane.confirmLanguageChange()"/>
               </hbox>
             </hbox>
           </groupbox>
 
 #ifdef HAVE_SHELL_SERVICE
           <groupbox id="systemDefaultsGroup" orient="vertical">
-            <caption label="&systemIntegration.label;"/>
+            <caption>&systemIntegration.label;</caption>
             <hbox id="checkDefaultBox" align="center">
               <checkbox id="alwaysCheckDefault"
                         preference="mail.shell.checkDefaultClient"
                         label="&alwaysCheckDefault.label;"
                         accesskey="&alwaysCheckDefault.accesskey;"/>
               <spacer flex="1"/>
               <button id="checkDefaultButton" label="&checkDefaultsNow.label;"
                       accesskey="&checkDefaultsNow.accesskey;"
@@ -231,17 +231,17 @@
               <checkbox id="searchIntegration"
                         preference="searchintegration.enable"
                         label="&searchIntegration.label;"
                         accesskey="&searchIntegration.accesskey;"/>
             </hbox>
           </groupbox>
 #endif
           <groupbox>
-            <caption label="&configEditDesc.label;"/>
+            <caption>&configEditDesc.label;</caption>
             <vbox>
               <hbox>
                 <checkbox id="enableGloda"
                           preference="mailnews.database.global.indexer.enabled"
                           label="&enableGlodaSearch.label;"
                           accesskey="&enableGlodaSearch.accesskey;"/>
               </hbox>
               <hbox align="center">
@@ -277,34 +277,34 @@
           </groupbox>
         </tabpanel>
 
 #ifdef MOZ_DATA_REPORTING
         <!-- Data Choices -->
         <tabpanel id="dataChoicesPanel" orient="vertical">
 #ifdef MOZ_TELEMETRY_REPORTING
           <groupbox>
-            <caption label="&telemetrySection.label;"/>
+            <caption>&telemetrySection.label;</caption>
             <description>&telemetryDesc.label;</description>
             <hbox>
               <checkbox id="submitTelemetryBox"
                         preference="toolkit.telemetry.enabled"
                         label="&enableTelemetry.label;"
                         accesskey="&enableTelemetry.accesskey;"/>
               <spacer flex="1"/>
               <label id="telemetryLearnMore"
                      class="text-link"
                      value="&telemetryLearnMore.label;"
                      onclick="gAdvancedPane.openTextLink(event)"/>
             </hbox>
           </groupbox>
 #endif
 #ifdef MOZ_CRASHREPORTER
           <groupbox>
-            <caption label="&crashReporterSection.label;"/>
+            <caption>&crashReporterSection.label;</caption>
             <description>&crashReporterDesc.label;</description>
             <hbox>
               <checkbox id="submitCrashesBox"
                         oncommand="gAdvancedPane.updateSubmitCrashes();"
                         label="&enableCrashReporter.label;"
                         accesskey="&enableCrashReporter.accesskey;"/>
 
               <spacer flex="1"/>
@@ -316,37 +316,37 @@
           </groupbox>
 #endif
         </tabpanel>
 #endif
 
         <tabpanel orient="vertical">
           <!-- Networking & Disk Space -->
           <groupbox>
-            <caption label="&connectionsInfo.caption;"/>
+            <caption>&connectionsInfo.caption;</caption>
             <hbox align="center">
               <description flex="1" control="catProxiesButton">&proxiesConfigure.label;</description>
               <button id="catProxiesButton" icon="network" label="&showSettings.label;"
                       accesskey="&showSettings.accesskey;"
                       oncommand="gAdvancedPane.showConnections();"/>
             </hbox>
           </groupbox>
 
           <groupbox>
-            <caption label="&offlineInfo.caption;"/>
+            <caption>&offlineInfo.caption;</caption>
             <hbox align="center">
               <description flex="1" control="offlineSettingsButton">&offlineInfo.label;</description>
               <button id="offlineSettingsButton" label="&showOffline.label;"
                       accesskey="&showOffline.accesskey;"
                       oncommand="gAdvancedPane.showOffline();"/>
             </hbox>
           </groupbox>
 
           <groupbox>
-            <caption label="&Diskspace;"/>
+            <caption>&Diskspace;</caption>
             <hbox align="center">
               <label id="actualDiskCacheSize" flex="1"/>
               <button id="clearCacheButton" icon="clear"
                       label="&clearCacheNow.label;" accesskey="&clearCacheNow.accesskey;"
                       oncommand="gAdvancedPane.clearCache();"/>
             </hbox>
             <hbox>
               <checkbox preference="browser.cache.disk.smart_size.enabled"
@@ -380,17 +380,17 @@
             </hbox>
           </groupbox>
         </tabpanel>
 
 #ifdef MOZ_UPDATER
         <!-- Update -->
         <tabpanel orient="vertical">
           <groupbox id="updateApp">
-            <caption label="&updateApp2.label;"/>
+            <caption>&updateApp2.label;</caption>
             <hbox align="center">
               <vbox>
                 <description>
                   &updateApp.version.pre;<label id="version"/>&updateApp.version.post;
                   <label id="releasenotes" class="text-link" hidden="true">&releaseNotes.link;</label>
                 </description>
                 <description id="distribution" class="text-blurb" hidden="true"/>
                 <description id="distributionId" class="text-blurb" hidden="true"/>
--- a/mail/components/preferences/chat.inc.xul
+++ b/mail/components/preferences/chat.inc.xul
@@ -87,17 +87,17 @@
           <hbox>
             <checkbox id="sendTyping"
                       label="&sendTyping.label;"
                       accesskey="&sendTyping.accesskey;"
                       preference="purple.conversations.im.send_typing"/>
             <spacer flex="1"/>
           </hbox>
           <groupbox>
-            <caption label="&chatNotifications.label;"/>
+            <caption>&chatNotifications.label;</caption>
             <hbox>
               <hbox>
                 <checkbox id="desktopChatNotifications"
                           label="&desktopChatNotifications.label;"
                           accesskey="&desktopChatNotifications.accesskey;"
                           preference="mail.chat.show_desktop_notifications"/>
                 <spacer flex="1"/>
               </hbox>
--- a/mail/components/preferences/colors.xul
+++ b/mail/components/preferences/colors.xul
@@ -44,17 +44,17 @@
       <preference id="browser.underline_anchors"            name="browser.underline_anchors"            type="bool"/>
       <preference id="browser.display.foreground_color"     name="browser.display.foreground_color"     type="string"/>
       <preference id="browser.display.background_color"     name="browser.display.background_color"     type="string"/>
       <preference id="browser.display.use_system_colors"    name="browser.display.use_system_colors"    type="bool"/>
     </preferences>
 
     <hbox>
       <groupbox flex="1">
-        <caption label="&color;"/>
+        <caption>&color;</caption>
         <hbox align="center">
           <label value="&textColor.label;" accesskey="&textColor.accesskey;" control="foregroundtextmenu"/>
           <spacer flex="1"/>
           <html:input type="color" id="foregroundtextmenu" preference="browser.display.foreground_color"/>
         </hbox>
         <hbox align="center" style="margin-top: 5px">
           <label value="&backgroundColor.label;" accesskey="&backgroundColor.accesskey;" control="backgroundmenu"/>
           <spacer flex="1"/>
@@ -63,17 +63,17 @@
         <separator class="thin"/>
         <hbox align="center">
           <checkbox id="browserUseSystemColors" label="&useSystemColors.label;" accesskey="&useSystemColors.accesskey;"
                     preference="browser.display.use_system_colors"/>
         </hbox>
       </groupbox>
 
       <groupbox flex="1">
-        <caption label="&links;"/>
+        <caption>&links;</caption>
         <hbox align="center">
           <label value="&linkColor.label;" accesskey="&linkColor.accesskey;" control="unvisitedlinkmenu"/>
           <spacer flex="1"/>
           <html:input type="color" id="unvisitedlinkmenu" preference="browser.anchor_color"/>
         </hbox>
         <hbox align="center" style="margin-top: 5px">
           <label value="&visitedLinkColor.label;" accesskey="&visitedLinkColor.accesskey;" control="visitedlinkmenu"/>
           <spacer flex="1"/>
--- a/mail/components/preferences/compose.inc.xul
+++ b/mail/components/preferences/compose.inc.xul
@@ -98,17 +98,17 @@
                       label="&attachmentReminderOptions.label;"
                       accesskey="&attachmentReminderOptions.accesskey;"
                       oncommand="gComposePane.attachmentReminderOptionsDialog();"/>
             </hbox>
 
           </groupbox>
 
           <groupbox>
-            <caption label="&htmlComposeHeader.label;"/>
+            <caption>&htmlComposeHeader.label;</caption>
             <hbox align="center">
               <label control="FontSelect" value="&font.label;" accesskey="&font.accesskey;"/>
               <menulist id="FontSelect" preference="msgcompose.font_face"
                         sizetopopup="pref" crop="center" flex="1">
                 <menupopup>
                   <menuitem value="" label="&fontVarWidth.label;"/>
                   <menuitem value="tt" label="&fontFixedWidth.label;"/>
                   <menuseparator/>
@@ -161,17 +161,17 @@
                     accesskey="&sendOptions.accesskey;"
                     oncommand="gComposePane.sendOptionsDialog();"/>
           </hbox>
          </tabpanel>
 
          <tabpanel orient="vertical">
            <groupbox>
               <!-- Address Autocomplete -->
-              <caption label="&addressingTitle.label;"/>
+              <caption>&addressingTitle.label;</caption>
 
               <description>&autocompleteText.label;</description>
 
               <hbox align="center">
                 <checkbox id="addressingAutocomplete" label="&addressingEnable.label;"
                           preference="mail.enable_autocomplete"
                           accesskey="&addressingEnable.accesskey;"/>
               </hbox>
--- a/mail/components/preferences/connection.xul
+++ b/mail/components/preferences/connection.xul
@@ -50,17 +50,17 @@
       <preference id="network.trr.mode"                  name="network.trr.mode"                  type="int"/>
       <preference id="network.trr.uri"                   name="network.trr.uri"                   type="string"/>
       <preference id="signon.autologin.proxy"            name="signon.autologin.proxy"            type="bool"/>
     </preferences>
 
     <script type="application/javascript" src="chrome://messenger/content/preferences/connection.js"/>
 
     <groupbox>
-      <caption label="&proxyTitle.label;"/>
+      <caption>&proxyTitle.label;</caption>
 
       <radiogroup id="networkProxyType" preference="network.proxy.type"
                   onsyncfrompreference="return gConnectionsDialog.readProxyType();">
         <radio value="0" label="&noProxyTypeRadio.label;" accesskey="&noProxyTypeRadio.accesskey;"/>
         <radio value="4" label="&WPADTypeRadio.label;" accesskey="&WPADTypeRadio.accesskey;"/>
         <radio value="5" label="&systemTypeRadio.label;" accesskey="&systemTypeRadio.accesskey;"
                id="systemPref" hidden="true"/>
         <radio value="1" label="&manualTypeRadio.label;" accesskey="&manualTypeRadio.accesskey;"/>
--- a/mail/components/preferences/display.inc.xul
+++ b/mail/components/preferences/display.inc.xul
@@ -50,17 +50,17 @@
         <tab id="displayTab" label="&itemAdvanced.label;"/>
       </tabs>
 
       <tabpanels id="displayPrefsPanels" flex="1">
 
         <tabpanel orient="vertical">
           <!-- Fonts and Colors -->
           <groupbox id="fontsGroup">
-            <caption label="&fontsAndColors1.label;"/>
+            <caption>&fontsAndColors1.label;</caption>
 
             <grid id="fontsGrid">
               <columns>
                 <column flex="1"/>
                 <column/>
               </columns>
               <rows id="fontsRows">
                 <row id="fontRow">
@@ -116,24 +116,24 @@
                           accesskey="&colorButton.accesskey;"
                           oncommand="gDisplayPane.configureColors();"/>
                 </row>
               </rows>
             </grid>
           </groupbox>
 
           <groupbox>
+            <caption>&displayWidth.label;</caption>
             <hbox>
               <checkbox id="displayGlyph"
                         label="&convertEmoticons.label;"
                         preference="mail.display_glyph"
                         accesskey="&convertEmoticons.accesskey;"/>
               <spacer flex="1"/>
             </hbox>
-            <caption label="&displayWidth.label;"/>
 
             <separator class="thin"/>
 
             <label control="displayText">&displayText.label;</label>
             <hbox id="displayText" class="indent" align="center" role="group">
               <label value="&style.label;" accesskey="&style.accesskey;" control="mailQuotedStyle"/>
               <menulist id="mailQuotedStyle" preference="mail.quoted_style">
                 <menupopup>
@@ -179,17 +179,17 @@
                       oncommand="gDisplayPane.removeTag();"/>
             </vbox>
           </hbox>
         </tabpanel>
 
         <!-- Advanced -->
         <tabpanel orient="vertical">
           <groupbox>
-            <caption label="&reading.caption;"/>
+            <caption>&reading.caption;</caption>
 
             <vbox>
               <hbox>
                 <checkbox id="automaticallyMarkAsRead"
                           preference="mailnews.mark_message_read.auto"
                           label="&autoMarkAsRead.label;"
                           accesskey="&autoMarkAsRead.accesskey;"
                           oncommand="gDisplayPane.updateMarkAsReadOptions(this.checked)"/>
@@ -241,17 +241,17 @@
                           accesskey="&closeMsgOnMoveOrDelete.accesskey;"
                           preference="mail.close_message_window.on_delete"/>
               </hbox>
             </vbox>
 
           </groupbox>
 
           <groupbox>
-            <caption label="&display.caption;"/>
+            <caption>&display.caption;</caption>
 
             <hbox>
               <checkbox id="showCondensedAddresses"
                         label="&showCondensedAddresses.label;"
                         accesskey="&showCondensedAddresses.accesskey;"
                         preference="mail.showCondensedAddresses"/>
             </hbox>
           </groupbox>
--- a/mail/components/preferences/dockoptions.xul
+++ b/mail/components/preferences/dockoptions.xul
@@ -25,17 +25,17 @@
 
     <hbox orient="vertical">
       <checkbox id="newMailNotificationBounce"
                 label="&bounceSystemDockIcon.label;"
                 preference="mail.biff.animate_dock_icon"
                 accesskey="&bounceSystemDockIcon.accesskey;"/>
       <separator class="thin"/>
       <groupbox flex="1">
-        <caption label="&dockIconBadge.label;"/>
+        <caption>&dockIconBadge.label;</caption>
         <separator class="thin"/>
         <label value="&dockIconShow.label;"/>
         <radiogroup id="dockCount"
                     preference="mail.biff.use_new_count_in_mac_dock"
                     class="indent" orient="vertical">
           <radio id="dockCountAll" value="false"
                  label="&showAllUnreadMessagesCount.label;"
                  accesskey="showAllUnreadMessagesCount.accesskey"/>
--- a/mail/components/preferences/fonts.xul
+++ b/mail/components/preferences/fonts.xul
@@ -241,17 +241,17 @@
               <menuitem value="72" label="72"/>
             </menupopup>
           </menulist>
         </hbox>
       </hbox>
     </groupbox>
 
     <groupbox>
-      <caption label="&fontControl.label;"/>
+      <caption>&fontControl.label;</caption>
 
       <hbox>
         <checkbox id="useDocumentFonts"
                   label="&useDocumentFonts.label;"
                   accesskey="&useDocumentFonts.accesskey;"
                   preference="browser.display.use_document_fonts"
                   onsyncfrompreference="return gFontsDialog.readUseDocumentFonts();"
                   onsynctopreference="return gFontsDialog.writeUseDocumentFonts();"/>
@@ -263,17 +263,17 @@
                   accesskey="&fixedWidth.accesskey;"
                   preference="mail.fixed_width_messages"
                   onsyncfrompreference="return gFontsDialog.readFixedWidthForPlainText();"
                   onsynctopreference="return gFontsDialog.writeFixedWidthForPlainText();"/>
       </hbox>
     </groupbox>
 
     <groupbox align="start">
-      <caption label="&languagesTitle2.label;"/>
+      <caption>&languagesTitle2.label;</caption>
 
       <label value="&composingDescription2.label;"/>
 
       <separator class="thin"/>
       <grid>
         <columns>
           <column/>
           <column flex="1"/>
--- a/mail/components/preferences/general.inc.xul
+++ b/mail/components/preferences/general.inc.xul
@@ -17,17 +17,17 @@
       <preference id="mail.biff.play_sound" name="mail.biff.play_sound" type="bool"/>
       <preference id="mail.biff.play_sound.type" name="mail.biff.play_sound.type" type="int"/>
       <preference id="mail.biff.play_sound.url" name="mail.biff.play_sound.url" type="string"/>
     </preferences>
 
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
 
     <groupbox>
-      <caption label="&messengerStartPage.label;"/>
+      <caption>&messengerStartPage.label;</caption>
         <hbox align="start">
           <checkbox id="mailnewsStartPageEnabled" label="&enableStartPage.label;"
                     preference="mailnews.start_page.enabled"
                     accesskey="&enableStartPage.accesskey;"
                     oncommand="gGeneralPane.updateStartPage();"/>
         </hbox>
         <hbox align="center">
           <label value="&location.label;" accesskey="&location1.accesskey;" control="mailnewsStartPageUrl"/>
@@ -38,26 +38,26 @@
           <button label="&useDefault.label;" accesskey="&useDefault.accesskey;"
                   oncommand="gGeneralPane.restoreDefaultStartPage();">
             <observes element="mailnewsStartPageUrl" attribute="disabled"/>
           </button>
         </hbox>
     </groupbox>
 
     <groupbox>
-      <caption label="&defaultSearchEngine.label;"/>
+      <caption>&defaultSearchEngine.label;</caption>
       <hbox>
         <menulist id="defaultWebSearch">
           <menupopup id="defaultWebSearchPopup"/>
         </menulist>
       </hbox>
     </groupbox>
 
     <groupbox>
-      <caption label="&newMessagesArrive.label;"/>
+      <caption>&newMessagesArrive.label;</caption>
 #ifdef XP_MACOSX
       <hbox align="center">
         <description flex="1">&changeDockIconOptions.label;</description>
         <button id="dockOptions" label="&dockOptions.label;"
                 accesskey="&dockOptions.accesskey;"
                 oncommand="gGeneralPane.configureDockOptions();"/>
       </hbox>
       <description class="bold">&notificationAlertSettings2.label;</description>
--- a/mail/components/preferences/privacy.inc.xul
+++ b/mail/components/preferences/privacy.inc.xul
@@ -41,17 +41,17 @@
       <!-- Tracking -->
       <preference id="privacy.donottrackheader.enabled"
                   name="privacy.donottrackheader.enabled"
                   type="bool"/>
     </preferences>
 
     <!-- Mail Content -->
     <groupbox id="mailContentGroup">
-      <caption label="&captionMailContent.label;"/>
+      <caption>&captionMailContent.label;</caption>
       <hbox id="remoteContentBox">
         <checkbox id="acceptRemoteContent"
                   preference="mailnews.message_display.disable_remote_image"
                   label="&acceptRemoteContent.label;"
                   accesskey="&acceptRemoteContent.accesskey;"/>
         <spacer flex="1"/>
         <button id="remoteContentExceptions"
                 oncommand="gPrivacyPane.showRemoteContentExceptions();"
@@ -64,17 +64,17 @@
                href="https://support.mozilla.org/kb/remote-content-in-messages"
                value="&acceptRemoteContentInfo.label;"/>
         <spacer flex="1"/>
       </hbox>
     </groupbox>
 
     <!-- Web Content -->
     <groupbox id="webContentGroup">
-      <caption label="&captionWebContent.label;"/>
+      <caption>&captionWebContent.label;</caption>
       <checkbox id="keepHistory"
                 preference="places.history.enabled"
                 label="&keepHistory.label;"
                 accesskey="&keepHistory.accesskey;"/>
       <hbox id="cookiesBox">
         <checkbox id="acceptCookies"
                   preference="network.cookie.cookieBehavior"
                   label="&acceptCookies.label;"
--- a/mail/components/preferences/sendoptions.xul
+++ b/mail/components/preferences/sendoptions.xul
@@ -28,17 +28,17 @@
     <preferences id="SendOptionsPreferences">
       <preference id="mailnews.sendformat.auto_downgrade" name="mailnews.sendformat.auto_downgrade" type="bool"/>
       <preference id="mail.default_html_action"      name="mail.default_html_action" type="int"/>
       <preference id="mailnews.html_domains"         name="mailnews.html_domains" type="string"/>
       <preference id="mailnews.plaintext_domains"    name="mailnews.plaintext_domains"    type="string"/>
     </preferences>
 
     <groupbox>
-      <caption label="&sendMail.title;"/>
+      <caption>&sendMail.title;</caption>
 
       <checkbox id="autoDowngrade"
                 label="&autoDowngrade.label;"
                 accesskey="&autoDowngrade.accesskey;"
                 preference="mailnews.sendformat.auto_downgrade"/>
 
       <label control="mailDefaultHTMLAction" width="1">&sendMaildesc.label;</label>
 
--- a/mail/themes/linux/editor/EditorDialog.css
+++ b/mail/themes/linux/editor/EditorDialog.css
@@ -306,8 +306,21 @@ tree.list {
 
 .progressitem[progress="done"] {
   list-style-image: url("chrome://editor/skin/icons/progress-done.gif");
 }
 
 .progressitem[progress="failed"] {
   list-style-image: url("chrome://editor/skin/icons/progress-failed.gif");
 }
+
+/* ::::: groupbox ::::: */
+
+groupbox {
+  -moz-appearance: groupbox;
+  margin: 5px;
+  padding: 5px;
+}
+
+caption {
+  margin-bottom: 2px;
+  font-weight: bold;
+}
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -781,8 +781,21 @@ button[type="menu-button"] {
   color: -moz-DialogText;
   text-shadow: none;
 }
 
 .contentTabInstance > findbar:-moz-lwtheme {
   background-color: var(--toolbar-bgcolor);
   color: var(--toolbar-color, -moz-DialogText);
 }
+
+/* ::::: groupbox ::::: */
+
+groupbox {
+  -moz-appearance: groupbox;
+  margin: 5px;
+  padding: 5px;
+}
+
+caption {
+  margin-bottom: 2px;
+  font-weight: bold;
+}
--- a/mail/themes/osx/editor/EditorDialog.css
+++ b/mail/themes/osx/editor/EditorDialog.css
@@ -305,8 +305,22 @@ tree.list {
 
 .progressitem[progress="done"] {
   list-style-image: url("chrome://editor/skin/icons/progress-done.gif");
 }
 
 .progressitem[progress="failed"] {
   list-style-image: url("chrome://editor/skin/icons/progress-failed.gif");
 }
+
+/* ::::: groupbox ::::: */
+
+groupbox {
+  -moz-appearance: groupbox;
+  padding: 0 8px 5px;
+  margin: 6px;
+}
+
+caption {
+  padding-bottom: 5px;
+  font: caption;
+  font-weight: bold;
+}
--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -731,8 +731,22 @@ statusbar:-moz-lwtheme-brighttext {
   background-color: var(--toolbar-bgcolor);
   background-image: none;
   color: var(--toolbar-color, -moz-DialogText);
 }
 
 .contentTabAddress * {
   text-shadow: none;
 }
+
+/* ::::: groupbox ::::: */
+
+groupbox {
+  -moz-appearance: groupbox;
+  padding: 0 8px 5px;
+  margin: 6px;
+}
+
+caption {
+  padding-bottom: 5px;
+  font: caption;
+  font-weight: bold;
+}
--- a/mail/themes/shared/mail/incontentprefs/aboutPreferences.css
+++ b/mail/themes/shared/mail/incontentprefs/aboutPreferences.css
@@ -20,19 +20,20 @@
   position: relative;
 }
 
 #category-box {
   background-color: #ebebef;
   width: 240px;
 }
 
-caption label {
+caption {
+  font-size: 1.14em;
   font-weight: 600;
-  margin: 0 !important;
+  margin: 4px 0 !important;
 }
 
 #preferencesContainer {
   padding: 40px 28px;
   overflow: auto;
 }
 
 #MailPreferences > prefpane {
@@ -359,38 +360,37 @@ tabs {
 #manageCertificatesButton {
   margin-inline-start: 0;
 }
 
 /**
  * Font dialog menulist fixes
  */
 
+#selectLangs {
+  font-weight: normal;
+  font-size: .877em;
+}
+
 #defaultFontType,
 #serif,
 #sans-serif,
 #monospace {
   min-width: 30ch;
 }
 
 /**
  * toolkit element overrides
  */
 
-groupbox {
-  -moz-appearance: none;
-  border: none;
-  margin: 0;
-  padding: 0;
-}
-
-caption,
-tabpanels caption {
-  -moz-appearance: none;
-  margin: 0;
+groupbox label:not(.menu-accel):not(.menu-iconic-accel):not(.menu-text):not(.menu-iconic-text):not(.menulist-label):not(.indent):not(.learnMore):not(.tail-with-learn-more),
+groupbox description {
+  /* !important needed to override toolkit !important rule */
+  margin-inline-start: 0 !important;
+  margin-inline-end: 0 !important;
 }
 
 richlistbox {
   -moz-appearance: none;
   background-color: var(--in-content-box-background);
   color: var(--in-content-text-color);
 }
 
--- a/mail/themes/windows/editor/EditorDialog.css
+++ b/mail/themes/windows/editor/EditorDialog.css
@@ -321,8 +321,23 @@ tree.list {
 #AddHTMLAttributeNameInput > menupopup > menuseparator {
   -moz-appearance: none;
   margin-top: 3px;
   margin-bottom: 3px;
   padding-top: 0;
   padding-bottom: 0;
   border-top-color: #d7d7d7;
 }
+
+/* ::::: groupbox ::::: */
+
+groupbox {
+  -moz-appearance: groupbox;
+  border: 2px groove ThreeDFace;
+  border-radius: 3px;
+  margin: 3px;
+  padding: 3px 3px 6px;
+}
+
+caption {
+  margin: -5px 6px 6px;
+  font-weight: bold;
+}
--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -840,8 +840,27 @@ statusbarpanel label {
   color: -moz-DialogText;
   text-shadow: none;
 }
 
 .contentTabInstance > findbar:-moz-lwtheme {
   background-color: var(--toolbar-bgcolor);
   color: var(--toolbar-color, -moz-DialogText);
 }
+
+/* ::::: groupbox ::::: */
+
+groupbox {
+  -moz-appearance: groupbox;
+  border: 2px groove ThreeDFace;
+  border-radius: 3px;
+  margin: 3px;
+  padding: 3px 3px 6px;
+}
+
+caption {
+  margin: -5px 6px 6px;
+  font-weight: bold;
+}
+
+tabpanels caption {
+  -moz-appearance: tabpanel;
+}
--- a/mailnews/base/prefs/content/SmtpServerEdit.xul
+++ b/mailnews/base/prefs/content/SmtpServerEdit.xul
@@ -23,17 +23,17 @@
   <stringbundle id="bundle_brand"
                 src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_messenger"
                 src="chrome://messenger/locale/messenger.properties"/>
   <script type="application/javascript"
           src="chrome://messenger/content/SmtpServerEdit.js"/>
   <vbox id="smtpServerEditor">
     <groupbox>
-      <caption label="&settings.caption;"/>
+      <caption>&settings.caption;</caption>
       <grid flex="1">
         <columns>
           <column/>
           <column flex="1"/>
         </columns>
         <rows>
           <row align="center">
              <label value="&serverDescription.label;"
@@ -72,17 +72,17 @@
           </row>
         </rows>
       </grid>
     </groupbox>
 
     <separator class="thin"/>
 
     <groupbox>
-      <caption label="&security.caption;"/>
+      <caption>&security.caption;</caption>
 
       <grid flex="1">
         <columns>
           <column/>
           <column flex="1"/>
         </columns>
         <rows>
           <row align="center">
--- a/mailnews/base/prefs/content/am-addressing.inc
+++ b/mailnews/base/prefs/content/am-addressing.inc
@@ -1,17 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
     <vbox flex="1" id="compositionAndAddressing">
       <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
       <groupbox>
-        <caption label="&compositionGroupTitle.label;"/>
+        <caption>&compositionGroupTitle.label;</caption>
         <hbox align="center">
           <checkbox wsm_persist="true" id="identity.composeHtml" label="&useHtml.label;"
                     accesskey="&useHtml.accesskey;"
                     prefattribute="value"
                     prefstring="mail.identity.%identitykey%.compose_html"/>
         </hbox>
 
         <separator class="thin"/>
@@ -66,17 +66,17 @@
                   accesskey="&globalComposingPrefs.accesskey;"
                   oncommand="showGlobalComposingPrefs();"/>
         </hbox>
       </groupbox>
 
       <separator class="thin"/>
 
       <groupbox>
-        <caption label="&addressingGroupTitle.label;"/>
+        <caption>&addressingGroupTitle.label;</caption>
 #ifndef MOZ_THUNDERBIRD
         <hbox align="center">
           <checkbox wsm_persist="true" id="identity.autocompleteToMyDomain"
                     label="&autocompleteToMyDomain.label;"
                     accesskey="&autocompleteToMyDomain.accesskey;"
                     prefattribute="value"
                     prefstring="mail.identity.%identitykey%.autocompleteToMyDomain"/>
         </hbox>
--- a/mailnews/base/prefs/content/am-archiveoptions.xul
+++ b/mailnews/base/prefs/content/am-archiveoptions.xul
@@ -29,17 +29,17 @@
       <radio label="&archiveMonthly.label;"
              accesskey="&archiveMonthly.accesskey;" class="indent"/>
     </radiogroup>
     <checkbox id="archiveKeepFolderStructure"
               label="&keepFolderStructure.label;"
               accesskey="&keepFolderStructure.accesskey;"/>
 
     <groupbox flex="1">
-      <caption label="&archiveExample.label;"/>
+      <caption>&archiveExample.label;</caption>
       <tree id="archiveTree" hidecolumnpicker="true" disabled="true" flex="1">
         <treecols>
           <treecol primary="true" hideheader="true" flex="1"
                    id="folderNameCol"/>
         </treecols>
         <treechildren>
           <treeitem class="root">
             <treerow>
--- a/mailnews/base/prefs/content/am-copies.inc
+++ b/mailnews/base/prefs/content/am-copies.inc
@@ -31,17 +31,17 @@
                   prefstring="mail.identity.%identitykey%.drafts_folder_picker_mode"/>
     <label hidden="true" wsm_persist="true" id="identity.archivesFolderPickerMode"
                   pref="true" preftype="int" prefattribute="value"
                   prefstring="mail.identity.%identitykey%.archives_folder_picker_mode"/>
     <label hidden="true" wsm_persist="true" id="identity.tmplFolderPickerMode"
                   pref="true" preftype="int" prefattribute="value"
                   prefstring="mail.identity.%identitykey%.tmpl_folder_picker_mode"/>
     <groupbox id="copiesGroup">
-      <caption label="&sendingPrefix.label;"/>
+      <caption>&sendingPrefix.label;</caption>
 
       <hbox align="center">
         <checkbox wsm_persist="true" id="identity.doFcc" label="&fccMailFolder.label;"
                   accesskey="&fccMailFolder.accesskey;"
                   prefattribute="value"
                   prefstring="mail.identity.%identitykey%.fcc"
                   oncommand="setupFccItems();"/>
       </hbox>
@@ -129,17 +129,17 @@
                   placeholder="&bccAddressList.placeholder;"/>
           </row>
         </rows>
       </grid>
 
     </groupbox>
 
     <groupbox id="archivesGroup">
-      <caption label="&archivesTitle.label;"/>
+      <caption>&archivesTitle.label;</caption>
 
       <hbox align="center">
         <checkbox wsm_persist="true" id="identity.archiveEnabled"
                   label="&keepArchives.label;"
                   accesskey="&keepArchives.accesskey;"
                   prefattribute="value"
                   prefstring="mail.identity.%identitykey%.archive_enabled"
                   oncommand="setupArchiveItems();"/>
@@ -191,17 +191,17 @@
               </menulist>
             </row>
           </rows>
         </grid>
       </radiogroup>
     </groupbox>
 
     <groupbox id="foldersGroup">
-      <caption label="&specialFolders.label;"/>
+      <caption>&specialFolders.label;</caption>
 
       <hbox align="center">
         <label value="&keepDrafts2.label;" control="messageDrafts"/>
       </hbox>
 
       <radiogroup id="messageDrafts">
         <grid class="specialFolderPickerGrid">
           <columns>
--- a/mailnews/base/prefs/content/am-identity-edit.xul
+++ b/mailnews/base/prefs/content/am-identity-edit.xul
@@ -64,17 +64,17 @@
       <tab label="&addressingTab.label;"/>
       <tab label="&securityTab.label;"/>
     </tabs>
 
     <tabpanels id="identityTabsPanels" flex="1">
       <!-- Identity Settings Tab -->
       <vbox flex="1" name="settings">
         <groupbox>
-          <caption label="&publicData.label;"/>
+          <caption>&publicData.label;</caption>
 
         <grid>
           <columns>
             <column/>
             <column flex="1"/>
           </columns>
           <rows>
             <row align="center">
@@ -128,17 +128,17 @@
           <button class="push" name="editVCard" label="&editVCard.label;"
                   accesskey="&editVCard.accesskey;"
                   oncommand="editVCard()"/>
           <label hidden="true" id="identity.escapedVCard"/>
         </hbox>
         </groupbox>
 
         <groupbox>
-          <caption label="&privateData.label;"/>
+          <caption>&privateData.label;</caption>
 
           <label value="&smtpName.label;"
                  control="identity.smtpServerKey"
                  accesskey="&smtpName.accesskey;"/>
           <hbox align="center">
             <menulist id="identity.smtpServerKey" flex="1">
               <menupopup id="smtpPopup">
                 <menuitem value=""
--- a/mailnews/base/prefs/content/am-junk.xul
+++ b/mailnews/base/prefs/content/am-junk.xul
@@ -29,17 +29,17 @@
     <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
     <hbox class="dialogheader">
       <label class="dialogheader-title" value="&junkSettings.label;"/>
     </hbox>
 
     <groupbox>
-      <caption label="&junkClassification.label;"/>
+      <caption>&junkClassification.label;</caption>
 
       <label hidden="true"
              id="server.spamLevel"
              wsm_persist="true"
              pref="true"
              preftype="int"
              prefattribute="value"
              genericattr="true"
@@ -125,17 +125,17 @@
 
       <separator class="thin"/>
 
       <description width="1">&ispHeadersWarning.label;</description>
 
     </groupbox>
 
     <groupbox>
-      <caption label="&junkActions.label;"/>
+      <caption>&junkActions.label;</caption>
 
       <checkbox id="server.moveOnSpam"
                 label="&move.label;"
                 accesskey="&move.accesskey;"
                 oncommand="updateJunkTargetsAndRetention();"
                 wsm_persist="true"
                 pref="true"
                 preftype="bool"
--- a/mailnews/base/prefs/content/am-main.xul
+++ b/mailnews/base/prefs/content/am-main.xul
@@ -33,17 +33,17 @@
       <textbox wsm_persist="true" size="30" id="server.prettyName"
                onblur="parent.setAccountLabel(gAccount.key, null, this.value);"
                prefstring="mail.server.%serverkey%.name"/>
     </hbox>
 
     <separator class="thin"/>
 
     <groupbox style="width: 20em !important;" flex="1">
-      <caption label="&identityTitle.label;"/>
+      <caption>&identityTitle.label;</caption>
       <description>&identityDesc.label;</description>
       <separator class="thin"/>
       <grid>
         <columns>
           <column/>
           <column flex="1"/>
         </columns>
         <rows>
--- a/mailnews/base/prefs/content/am-offline.xul
+++ b/mailnews/base/prefs/content/am-offline.xul
@@ -22,17 +22,17 @@
            wsm_persist="true" preftype="int"
            prefstring="mail.server.%serverkey%.autosync_max_age_days"/>
 
     <hbox id="headertitle" class="dialogheader">
       <label class="dialogheader-title"/>
     </hbox>
 
     <groupbox id="offline.titlebox" hidefor="movemail,pop3,none,rss">
-      <caption label="&syncGroupTitle.label;"/>
+      <caption>&syncGroupTitle.label;</caption>
 
     <checkbox hidefor="movemail,pop3,nntp,none"
               id="offline.folders" label="&allFoldersOffline2.label;"
               oncommand="toggleOffline()"
               accesskey="&allFoldersOffline2.accesskey;"/>
 
     <description hidefor="pop3,nntp,movemail,none,rss">&allFoldersOfflineNote.label;</description>
 
@@ -46,17 +46,17 @@
     <hbox hidefor="movemail,pop3,imap,none" align="right">
         <button label="&offlineSelectNntp.label;" accesskey="&offlineSelectNntp.accesskey;"
                 oncommand="onClickSelect()" id="selectNewsgroupsButton" class="selectForOfflineUseButton"/>
     </hbox>
 
     </groupbox>
 
     <groupbox id="diskspace.titlebox">
-      <caption label="&diskspaceGroupTitle.label;" hidefor="movemail,pop3,none,rss"/>
+      <caption hidefor="movemail,pop3,none,rss">&diskspaceGroupTitle.label;</caption>
 
     <description hidefor="pop3,nntp,movemail,none,rss">&doNotDownloadImap.label;</description>
     <description hidefor="pop3,imap,movemail,none,rss">&doNotDownloadNntp.label;</description>
     <description hidefor="imap,nntp,none,rss">&doNotDownloadPop3Movemail.label;</description>
 
     <!-- IMAP Autosync Preference -->
     <radiogroup hidefor="pop3,nntp,movemail,none,rss" id="autosyncSelect" class="indent">
       <radio id="useAutosync.AllMsg" value="0" accesskey="&allAutosync.accesskey;"
--- a/mailnews/base/prefs/content/am-server.xul
+++ b/mailnews/base/prefs/content/am-server.xul
@@ -94,17 +94,17 @@
           </hbox>
         </row>
       </rows>
     </grid>
 
     <separator class="thin"/>
 
     <groupbox hidefor="movemail">
-      <caption label="&securitySettings.label;"/>
+      <caption>&securitySettings.label;</caption>
 
       <grid flex="1">
         <columns>
           <column/>
           <column/>
         </columns>
         <rows>
           <row align="center">
@@ -147,17 +147,17 @@
               </menupopup>
             </menulist>
           </row>
         </rows>
       </grid>
     </groupbox>
 
     <groupbox>
-      <caption label="&serverSettings.label;"/>
+      <caption>&serverSettings.label;</caption>
       <vbox align="start">
       <checkbox wsm_persist="true"
                 id="server.loginAtStartUp"
                 label="&loginAtStartup.label;"
                 accesskey="&loginAtStartup.accesskey;"
                 prefattribute="value"
                 prefstring="mail.server.%serverkey%.login_at_startup"/>
       </vbox>
@@ -351,32 +351,32 @@
               label="&alwaysAuthenticate.label;"
               accesskey="&alwaysAuthenticate.accesskey;"
               prefattribute="value"
               prefstring="mail.server.%serverkey%.always_authenticate"/>
 
   <!-- take out for now - bug 45079
       <hbox flex="1" hidefor="pop3,imap,movemail">
         <groupbox>
-           <caption class="header" label="&abbreviate.label;"/>
+           <caption>&abbreviate.label;</caption>
 
            <radiogroup wsm_persist="true" id="nntp.abbreviate">
              <radio value="true"
                     label="&abbreviateOn.label;"/>
              <radio value="false"
                     label="&abbreviateOff.label;"/>
            </radiogroup>
         </groupbox>
       </hbox>
   -->
 
     </groupbox>
 
     <groupbox>
-      <caption label="&messageStorage.label;"/>
+      <caption>&messageStorage.label;</caption>
 
       <hbox align="end">
         <vbox align="start" flex="1" id="exitHandlingBox=">
           <checkbox hidefor="pop3,nntp,movemail"
                     wsm_persist="true"
                     id="imap.cleanupInboxOnExit"
                     label="&expungeOnExit.label;"
                     accesskey="&expungeOnExit.accesskey;"
--- a/mailnews/base/prefs/content/am-serverwithnoidentities.xul
+++ b/mailnews/base/prefs/content/am-serverwithnoidentities.xul
@@ -37,17 +37,17 @@
     <textbox wsm_persist="true" size="30" id="server.prettyName"
              onblur="parent.setAccountLabel(gAccount.key, null, this.value);"
              prefstring="mail.server.%serverkey%.name"/>
   </hbox>
 
   <separator class="thin"/>
 
   <groupbox>
-    <caption label="&messageStorage.label;"/>
+    <caption>&messageStorage.label;</caption>
 
     <vbox align="start">
       <checkbox wsm_persist="true" id="server.emptyTrashOnExit"
                 label="&emptyTrashOnExit.label;"
                 accesskey="&emptyTrashOnExit.accesskey;"
                 prefattribute="value"
                 prefstring="mail.server.%serverkey%.empty_trash_on_exit"/>
       <hbox align="center">
--- a/mailnews/base/search/content/FilterEditor.xul
+++ b/mailnews/base/search/content/FilterEditor.xul
@@ -58,17 +58,17 @@
       <spacer flex="1"/>
     </hbox>
   </vbox>
 
   <separator class="thin"/>
 
   <vbox flex="1">
     <groupbox>
-      <caption label="&contextDesc.label;"/>
+      <caption>&contextDesc.label;</caption>
       <grid>
         <columns>
           <column/>
           <column/>
         </columns>
         <rows>
           <row>
             <checkbox id="runManual"
--- a/mailnews/extensions/dsn/content/am-dsn.xul
+++ b/mailnews/extensions/dsn/content/am-dsn.xul
@@ -18,17 +18,17 @@
   <script type="application/javascript" src="chrome://messenger/content/am-dsn.js"/>
 
   <hbox class="dialogheader">
     <label class="dialogheader-title" value="&pane.title;"/>
   </hbox>
 
   <groupbox>
 
-    <caption label="&pane.title;"/>
+    <caption>&pane.title;</caption>
 
     <hbox id="prefChoices" align="center">
       <radiogroup id="identity.dsn_use_custom_prefs"
                   wsm_persist="true"
                   genericattr="true"
                   preftype="bool"
                   prefstring="mail.identity.%identitykey%.dsn_use_custom_prefs"
                   oncommand="EnableDisableCustomSettings();">
--- a/mailnews/extensions/mdn/content/am-mdn.xul
+++ b/mailnews/extensions/mdn/content/am-mdn.xul
@@ -21,17 +21,17 @@
     <script type="application/javascript" src="chrome://messenger/content/am-mdn.js"/>
 
     <hbox class="dialogheader">
       <label class="dialogheader-title" value="&pane.title;"/>
     </hbox>
 
     <groupbox>
 
-      <caption label="&pane.title;"/>
+      <caption>&pane.title;</caption>
 
       <hbox id="prefChoices" align="center" flex="1">
         <radiogroup id="identity.use_custom_prefs" wsm_persist="true" genericattr="true"
                     preftype="bool" prefstring="mail.identity.%identitykey%.use_custom_prefs"
                     oncommand="EnableDisableCustomSettings();" flex="1">
           <radio id="identity.select_global_prefs"
                  value="false"
                  label="&useGlobalPrefs.label;"
--- a/mailnews/extensions/newsblog/content/am-newsblog.xul
+++ b/mailnews/extensions/newsblog/content/am-newsblog.xul
@@ -50,27 +50,27 @@
                size="30"
                onblur="parent.setAccountLabel(gAccount.key, null, this.value);"
                prefstring="mail.server.%serverkey%.name"/>
     </hbox>
 
     <separator class="thin"/>
 
     <groupbox>
-      <caption label="&serverSettings.label;"/>
+      <caption>&serverSettings.label;</caption>
       <checkbox id="doBiff"
                 label="&biffAll.label;"
                 accesskey="&biffAll.accesskey;"
                 oncommand="setPrefs(this)"/>
     </groupbox>
 
     <separator class="thin"/>
 
     <groupbox>
-      <caption label="&newFeedSettings.label;"/>
+      <caption>&newFeedSettings.label;</caption>
 
       <hbox align="center">
         <checkbox id="updateEnabled"
                   label="&biffStart.label;"
                   accesskey="&biffStart.accesskey;"
                   oncommand="setPrefs(this)"/>
         <textbox id="updateValue"
                  type="number"
@@ -126,17 +126,17 @@
               accesskey="&manageSubscriptions.accesskey;"
               oncommand="openSubscriptionsDialog(gAccount.incomingServer.rootFolder);"/>
       <spacer flex="1"/>
     </hbox>
 
     <separator class="thin"/>
 
     <groupbox>
-      <caption label="&messageStorage.label;"/>
+      <caption>&messageStorage.label;</caption>
 
       <checkbox id="server.emptyTrashOnExit"
                 wsm_persist="true"
                 label="&emptyTrashOnExit.label;"
                 accesskey="&emptyTrashOnExit.accesskey;"
                 prefattribute="value"
                 prefstring="mail.server.%serverkey%.empty_trash_on_exit"/>
 
--- a/mailnews/extensions/smime/content/am-smime.inc
+++ b/mailnews/extensions/smime/content/am-smime.inc
@@ -9,17 +9,17 @@
         <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
       </stringbundleset>
 
       <label hidden="true" wsm_persist="true" id="identity.encryptionpolicy"/>
 
       <description>&securityHeading.label;</description>
 
       <groupbox id="signing.titlebox">
-        <caption label="&signingGroupTitle.label;"/>
+        <caption>&signingGroupTitle.label;</caption>
 
         <label value="&signingCert.message;" control="identity.signing_cert_name"
                prefstring="mail.identity.%identitykey%.encryptionpolicy"/>
 
         <hbox align="center">
           <textbox id="identity.signing_cert_name" wsm_persist="true" flex="1"
                    prefstring="mail.identity.%identitykey%.signing_cert_name"
                    readonly="true" disabled="true"/>
@@ -38,17 +38,17 @@
         <separator class="thin"/>
 
         <checkbox id="identity.sign_mail" wsm_persist="true"
                   prefstring="mail.identity.%identitykey%.sign_mail"
                   label="&signMessage.label;" accesskey="&signMessage.accesskey;"/>
       </groupbox>
 
       <groupbox id="encryption.titlebox">
-        <caption label="&encryptionGroupTitle.label;"/>
+        <caption>&encryptionGroupTitle.label;</caption>
 
         <label value="&encryptionCert.message;"
                control="identity.encryption_cert_name"/>
 
         <hbox align="center">
           <textbox id="identity.encryption_cert_name" wsm_persist="true" flex="1"
                    prefstring="mail.identity.%identitykey%.encryption_cert_name"
                    readonly="true" disabled="true"/>
@@ -76,17 +76,17 @@
           <radio id="encrypt_mail_always" wsm_persist="true" value="2"
                  label="&alwaysEncryptMessage.label;"
                  accesskey="&alwaysEncryptMessage.accesskey;"/>
         </radiogroup>
       </groupbox>
 
       <!-- Certificate manager -->
       <groupbox id="smimeCertificateManager" orient="horizontal">
-        <caption label="&certificates.label;"/>
+        <caption>&certificates.label;</caption>
         <button id="openCertManagerButton" oncommand="openCertManager();"
                 label="&manageCerts2.label;" accesskey="&manageCerts2.accesskey;"
                 prefstring="security.disable_button.openCertManager"/>
         <button id="openDeviceManagerButton" oncommand="openDeviceManager();"
                 label="&manageDevices.label;" accesskey="&manageDevices.accesskey;"
                 prefstring="security.disable_button.openDeviceManager"/>
       </groupbox>
     </vbox>
--- a/mailnews/import/content/importDialog.xul
+++ b/mailnews/import/content/importDialog.xul
@@ -108,17 +108,17 @@
             </hbox>
           </row>
         </rows>
       </grid>
     </vbox>
     <vbox class="wizard-box">
       <spacer flex="1"/>
       <groupbox>
-        <caption id="progressTitle" label="&title.label;"/>
+        <caption id="progressTitle">&title.label;</caption>
         <label class="indent" id="progressStatus" value="&processing.label;"/>
         <vbox class="box-padded">
           <html:progress id="progressMeter" value="5" max="100"/>
         </vbox>
       </groupbox>
     </vbox>
     <vbox class="wizard-box">
       <description id="status"/>