diff --git a/mozilla/editor/ui/composer/content/editorOverlay.xul b/mozilla/editor/ui/composer/content/editorOverlay.xul
index 08e278294b6..acd1bbc8841 100644
--- a/mozilla/editor/ui/composer/content/editorOverlay.xul
+++ b/mozilla/editor/ui/composer/content/editorOverlay.xul
@@ -377,6 +377,15 @@
       <menuitem value="&styleSuperscriptCmd.label;" accesskey="&stylesuperscript.accesskey;" oncommand="EditorApplyStyle('sup')"/>
       <menuitem value="&styleSubscriptCmd.label;"   accesskey="&stylesubscript.accesskey;"   oncommand="EditorApplyStyle('sub')"/>
       <menuitem value="&styleNonbreakingCmd.label;" accesskey="&stylenonbreaking.accesskey;" oncommand="EditorApplyStyle('nobr')"/>
+      <menuseparator/>
+      <menuitem value="&styleEm.label;"      accesskey="&styleEm.accesskey;"      oncommand="EditorApplyStyle('em')"/>
+      <menuitem value="&styleStrong.label;"  accesskey="&styleStrong.accesskey;"  oncommand="EditorApplyStyle('strong')"/>
+      <menuitem value="&styleCite.label;"    accesskey="&styleCite.accesskey;"    oncommand="EditorApplyStyle('cite')"/>
+      <menuitem value="&styleAbbr.label;"    accesskey="&styleAbbr.accesskey;"    oncommand="EditorApplyStyle('abbr')"/>
+      <menuitem value="&styleAcronym.label;" accesskey="&styleAcronym.accesskey;" oncommand="EditorApplyStyle('acronym')"/>
+      <menuitem value="&styleCode.label;"    accesskey="&styleCode.accesskey;"    oncommand="EditorApplyStyle('code')"/>
+      <menuitem value="&styleSamp.label;"    accesskey="&styleSamp.accesskey;"    oncommand="EditorApplyStyle('samp')"/>
+      <menuitem value="&styleVar.label;"     accesskey="&styleVar.accesskey;"     oncommand="EditorApplyStyle('var')"/>
     </menupopup>
     </menu>
     
@@ -592,224 +601,224 @@ function EditorApplyStyleSheet(styleSheetURL)
   </menupopup>
   </menu>
 
-    <popup id="TextColorPopup"  popupanchor="bottomleft">
-      <text id="TextColorCaption" class="color-caption" value="&textColorCaption.label;" flex="1"/>
-        <!-- TODO: Add "Last color picked" button and text -->
+  <popup id="TextColorPopup"  popupanchor="bottomleft">
+    <text id="TextColorCaption" class="color-caption" value="&textColorCaption.label;" flex="1"/>
+      <!-- TODO: Add "Last color picked" button and text -->
 <!--      <colorpicker id="TextColorPicker" palettename="standard" oncommand="EditorSelectTextColor('TextColorPicker','TextColorPopupButton');"/> -->
-      <titledbutton class="push" value="&colorPicker.default.label;" oncommand="EditorRemoveTextColor('TextColorPopupButton');"/>
-    </popup>
+    <titledbutton class="push" value="&colorPicker.default.label;" oncommand="EditorRemoveTextColor('TextColorPopupButton');"/>
+  </popup>
 
-    <popup id="BackColorPopup" popupanchor="bottomleft" oncreate="InitBackColorPopup()">
-      <!-- Text is filled in at runtime according to what background element will be set -->
-      <text id="BackColorCaption" class="color-caption" value="Background Color" flex="1"/>
-        <!-- TODO: Add "Last color picked" button and text -->
+  <popup id="BackColorPopup" popupanchor="bottomleft" oncreate="InitBackColorPopup()">
+    <!-- Text is filled in at runtime according to what background element will be set -->
+    <text id="BackColorCaption" class="color-caption" value="Background Color" flex="1"/>
+      <!-- TODO: Add "Last color picked" button and text -->
 <!--        <colorpicker id="BackColorPicker" palettename="standard" oncommand="EditorSelectBackColor('BackColorPicker','BackColorPopupButton');"/> -->
-      <titledbutton class="push" value="&colorPicker.default.label;" oncommand="EditorRemoveBackColor('BackColorPopupButton');"/>
-    </popup>
+    <titledbutton class="push" value="&colorPicker.default.label;" oncommand="EditorRemoveBackColor('BackColorPopupButton');"/>
+  </popup>
 
-    <menupopup id="AlignmentPopup">
-      <menuitem oncommand="EditorAlign('left')">
-       <titledbutton id="text-align-left" align="left" value="&alignLeft.label;"/>
-      </menuitem>
-      <menuitem oncommand="EditorAlign('center')">
-       <titledbutton id="text-align-center" align="left" value="&alignCenter.label;"/>
-      </menuitem>
-      <menuitem oncommand="EditorAlign('right')">
-       <titledbutton id="text-align-right" align="left" value="&alignRight.label;"/>
-      </menuitem>
-      <menuitem oncommand="EditorAlign('justify')">
-       <titledbutton id="text-align-justify" align="left" value="&alignJustify.label;"/>
-      </menuitem>
-    </menupopup>
-    
-    <!-- InsertPopup is used by messengercompose.xul -->
-    <menupopup id="InsertPopup">
-      <menuitem oncommand="EditorInsertOrEditLink()">
-       <titledbutton id="linkButton-dark" darkcolor="true" align="left" value="&linkToolbarCmd.label;"/>
-      </menuitem>
-      <menuitem oncommand="EditorInsertOrEditNamedAnchor()">
-       <titledbutton id="namedAnchorButton-dark" align="left" value="&anchorToolbarCmd.label;"/>
-      </menuitem>
-      <menuitem oncommand="EditorInsertOrEditImage()">
-       <titledbutton id="imageButton-dark" align="left" value="&imageToolbarCmd.label;"/>
-      </menuitem>
-      <menuitem oncommand="EditorInsertOrEditHLine()">
-       <titledbutton id="hlineButton-dark" align="left" value="&hruleToolbarCmd.label;"/>
-      </menuitem>
-      <menuitem oncommand="EditorInsertOrEditTable(true)">
-       <titledbutton id="tableButton-dark" align="left" value="&tableToolbarCmd.label;"/>
-      </menuitem>
-    </menupopup>
+  <menupopup id="AlignmentPopup">
+    <menuitem oncommand="EditorAlign('left')">
+     <titledbutton id="text-align-left" align="left" value="&alignLeft.label;"/>
+    </menuitem>
+    <menuitem oncommand="EditorAlign('center')">
+     <titledbutton id="text-align-center" align="left" value="&alignCenter.label;"/>
+    </menuitem>
+    <menuitem oncommand="EditorAlign('right')">
+     <titledbutton id="text-align-right" align="left" value="&alignRight.label;"/>
+    </menuitem>
+    <menuitem oncommand="EditorAlign('justify')">
+     <titledbutton id="text-align-justify" align="left" value="&alignJustify.label;"/>
+    </menuitem>
+  </menupopup>
+  
+  <!-- InsertPopup is used by messengercompose.xul -->
+  <menupopup id="InsertPopup">
+    <menuitem oncommand="EditorInsertOrEditLink()">
+     <titledbutton id="linkButton-dark" darkcolor="true" align="left" value="&linkToolbarCmd.label;"/>
+    </menuitem>
+    <menuitem oncommand="EditorInsertOrEditNamedAnchor()">
+     <titledbutton id="namedAnchorButton-dark" align="left" value="&anchorToolbarCmd.label;"/>
+    </menuitem>
+    <menuitem oncommand="EditorInsertOrEditImage()">
+     <titledbutton id="imageButton-dark" align="left" value="&imageToolbarCmd.label;"/>
+    </menuitem>
+    <menuitem oncommand="EditorInsertOrEditHLine()">
+     <titledbutton id="hlineButton-dark" align="left" value="&hruleToolbarCmd.label;"/>
+    </menuitem>
+    <menuitem oncommand="EditorInsertOrEditTable(true)">
+     <titledbutton id="tableButton-dark" align="left" value="&tableToolbarCmd.label;"/>
+    </menuitem>
+  </menupopup>
 
-    <!-- Editor toolbar items -->
-    <!-- note that we override the submenu item label "Blank Window" with "New" used for the menu -->
-    <button class="key-toolbar left" orient="vertical" id="newButton" observes="cmd_newEditor" value="&newMenu.label;" />
-    <button class="key-toolbar left" orient="vertical" id="openButton" observes="Editor:Open" value="&openToolbarCmd.label;"/>
-    <button class="key-toolbar left" orient="vertical" id="saveButton" observes="Editor:Save"/>
-    <button class="key-toolbar left" orient="vertical" id="previewButton" observes="Editor:Preview" value="&previewToolbarCmd.label;"/>
-    <button class="toolbar left" orient="vertical" id="printButton" observes="Editor:Print" value="&printToolbarCmd.label;"/>
-    <button class="toolbar left" orient="vertical" id="findButton" observes="cmd_find" value="&findToolbarCmd.label;"/>
-    <button class="toolbar left" orient="vertical" id="spellingButton" value="&spellToolbarCmd.label;" oncommand="CheckSpelling()"/>
+  <!-- Editor toolbar items -->
+  <!-- note that we override the submenu item label "Blank Window" with "New" used for the menu -->
+  <button class="key-toolbar left" orient="vertical" id="newButton" observes="cmd_newEditor" value="&newMenu.label;" />
+  <button class="key-toolbar left" orient="vertical" id="openButton" observes="Editor:Open" value="&openToolbarCmd.label;"/>
+  <button class="key-toolbar left" orient="vertical" id="saveButton" observes="Editor:Save"/>
+  <button class="key-toolbar left" orient="vertical" id="previewButton" observes="Editor:Preview" value="&previewToolbarCmd.label;"/>
+  <button class="toolbar left" orient="vertical" id="printButton" observes="Editor:Print" value="&printToolbarCmd.label;"/>
+  <button class="toolbar left" orient="vertical" id="findButton" observes="cmd_find" value="&findToolbarCmd.label;"/>
+  <button class="toolbar left" orient="vertical" id="spellingButton" value="&spellToolbarCmd.label;" oncommand="CheckSpelling()"/>
 
-    <button class="toolbar left" orient="vertical" id="imageButton" value="&imageToolbarCmd.label;" oncommand="EditorInsertOrEditImage()"/>
-    <button class="toolbar left" orient="vertical" id="hlineButton" value="&hruleToolbarCmd.label;" oncommand="EditorInsertOrEditHLine()"/>
-    <button class="toolbar left" orient="vertical" id="tableButton" value="&tableToolbarCmd.label;" oncommand="EditorInsertOrEditTable(true)"/>
-    <button class="toolbar left" orient="vertical" id="linkButton" value="&linkToolbarCmd.label;" oncommand="EditorInsertOrEditLink()"/>
-    <button class="toolbar left" orient="vertical" id="namedAnchorButton" value="&anchorToolbarCmd.label;" oncommand="EditorInsertOrEditNamedAnchor()"/>
+  <button class="toolbar left" orient="vertical" id="imageButton" value="&imageToolbarCmd.label;" oncommand="EditorInsertOrEditImage()"/>
+  <button class="toolbar left" orient="vertical" id="hlineButton" value="&hruleToolbarCmd.label;" oncommand="EditorInsertOrEditHLine()"/>
+  <button class="toolbar left" orient="vertical" id="tableButton" value="&tableToolbarCmd.label;" oncommand="EditorInsertOrEditTable(true)"/>
+  <button class="toolbar left" orient="vertical" id="linkButton" value="&linkToolbarCmd.label;" oncommand="EditorInsertOrEditLink()"/>
+  <button class="toolbar left" orient="vertical" id="namedAnchorButton" value="&anchorToolbarCmd.label;" oncommand="EditorInsertOrEditNamedAnchor()"/>
 
-    <!-- Formatting toolbar items -->
-    <html:select class="toolbar" id="ParagraphSelect" size="1" onchange="EditorSelectParagraphFormat()">
-      <observes element="Editor:Paragraph:Format" attribute="format" onbroadcast="onParagraphFormatChange()"/>
-      <html:option>&headingNormalCmd.label;</html:option>
-      <html:option>&paragraphParagraphCmd.label;</html:option>
-      <html:option>&heading1Cmd.label;</html:option>
-      <html:option>&heading2Cmd.label;</html:option>
-      <html:option>&heading3Cmd.label;</html:option>
-      <html:option>&heading4Cmd.label;</html:option>
-      <html:option>&heading5Cmd.label;</html:option>
-      <html:option>&heading6Cmd.label;</html:option>
-      <html:option>&paragraphBlockquoteCmd.label;</html:option>
-      <html:option>&paragraphAddressCmd.label;</html:option>
-      <html:option>&paragraphPreformatCmd.label;</html:option>
-      <html:option>&paragraphDfnTermCmd.label;</html:option>
-      <html:option>&paragraphDfnDescCmd.label;</html:option>
-    </html:select>
+  <!-- Formatting toolbar items -->
+  <html:select class="toolbar" id="ParagraphSelect" size="1" onchange="EditorSelectParagraphFormat()">
+    <observes element="Editor:Paragraph:Format" attribute="format" onbroadcast="onParagraphFormatChange()"/>
+    <html:option>&headingNormalCmd.label;</html:option>
+    <html:option>&paragraphParagraphCmd.label;</html:option>
+    <html:option>&heading1Cmd.label;</html:option>
+    <html:option>&heading2Cmd.label;</html:option>
+    <html:option>&heading3Cmd.label;</html:option>
+    <html:option>&heading4Cmd.label;</html:option>
+    <html:option>&heading5Cmd.label;</html:option>
+    <html:option>&heading6Cmd.label;</html:option>
+    <html:option>&paragraphBlockquoteCmd.label;</html:option>
+    <html:option>&paragraphAddressCmd.label;</html:option>
+    <html:option>&paragraphPreformatCmd.label;</html:option>
+    <html:option>&paragraphDfnTermCmd.label;</html:option>
+    <html:option>&paragraphDfnDescCmd.label;</html:option>
+  </html:select>
 
-    <!-- TODO: Use actual "face" value when combobox can display arbitrary HTML -->
-    <html:select class="toolbar" id="FontFaceSelect" size="1" onchange="EditorSelectFontFace()">
-      <observes element="Editor:Font:Face" attribute="face" onbroadcast="onFontFaceChange()"/>
-      <html:option>&defaultVariableWidthCmd.label;</html:option>
-      <html:option>&defaultFixedWidthCmd.label;</html:option>
-      <html:option>&arialHelveticaFont.label;</html:option>
-      <html:option>&timesFont.label;</html:option>
-      <html:option>&courierFont.label;</html:option>
-    </html:select>
+  <!-- TODO: Use actual "face" value when combobox can display arbitrary HTML -->
+  <html:select class="toolbar" id="FontFaceSelect" size="1" onchange="EditorSelectFontFace()">
+    <observes element="Editor:Font:Face" attribute="face" onbroadcast="onFontFaceChange()"/>
+    <html:option>&defaultVariableWidthCmd.label;</html:option>
+    <html:option>&defaultFixedWidthCmd.label;</html:option>
+    <html:option>&arialHelveticaFont.label;</html:option>
+    <html:option>&timesFont.label;</html:option>
+    <html:option>&courierFont.label;</html:option>
+  </html:select>
 
-    <html:select class="toolbar" id="FontSizeSelect" size="1" onchange="EditorSelectFontSize()">
-      <observes element="Editor:Font:Size" attribute="fontsize" onbroadcast="onFontSizeChange()"/>
-      <html:option>&size-xx-smallCmd.label;</html:option>
-      <html:option>&size-x-smallCmd.label;</html:option>
-      <html:option>&size-smallCmd.label;</html:option>
-      <html:option>&size-mediumCmd.label;</html:option>
-      <html:option>&size-largeCmd.label;</html:option>
-      <html:option>&size-x-largeCmd.label;</html:option>
-      <html:option>&size-xx-largeCmd.label;</html:option>
-    </html:select>
+  <html:select class="toolbar" id="FontSizeSelect" size="1" onchange="EditorSelectFontSize()">
+    <observes element="Editor:Font:Size" attribute="fontsize" onbroadcast="onFontSizeChange()"/>
+    <html:option>&size-xx-smallCmd.label;</html:option>
+    <html:option>&size-x-smallCmd.label;</html:option>
+    <html:option>&size-smallCmd.label;</html:option>
+    <html:option>&size-mediumCmd.label;</html:option>
+    <html:option>&size-largeCmd.label;</html:option>
+    <html:option>&size-x-largeCmd.label;</html:option>
+    <html:option>&size-xx-largeCmd.label;</html:option>
+  </html:select>
 
-    <!-- The new Color Picker UI
-    <html:div id="ColorButtons">
-      <titledbutton id="BackColorPopupButton" popup="BackColorPopup"
-       tooltiptext="Set text color"/>
-      <titledbutton id="TextColorPopupButton" popup="TextColorPopup"
-       tooltiptext="Set page, table, or cell background color"/>
-    </html:div>
+  <!-- The new Color Picker UI
+  <html:div id="ColorButtons">
+    <titledbutton id="BackColorPopupButton" popup="BackColorPopup"
+     tooltiptext="Set text color"/>
+    <titledbutton id="TextColorPopupButton" popup="TextColorPopup"
+     tooltiptext="Set page, table, or cell background color"/>
+  </html:div>
 -->
-    <stack style="width: 20px; height: 20px;">
-      <box autostretch="never">
-        <spring style="margin-left: 5px;"/>
-        <box orient="vertical">
-          <spring style="margin-top: 5px;"/>
-          <titledbutton value="T" style="width: 14px; height: 14px;" id="BackColorPopupButton" popup="BackColorPopup"/>
-        </box>
+  <stack style="width: 20px; height: 20px;">
+    <box autostretch="never">
+      <spring style="margin-left: 5px;"/>
+      <box orient="vertical">
+        <spring style="margin-top: 5px;"/>
+        <titledbutton value="T" style="width: 14px; height: 14px;" id="BackColorPopupButton" popup="BackColorPopup"/>
       </box>
-      <box autostretch="never">
-        <titledbutton value="B" style="width: 14px; height: 14px;" id="TextColorPopupButton" popup="BackColorPopup"/>
+    </box>
+    <box autostretch="never">
+      <titledbutton value="B" style="width: 14px; height: 14px;" id="TextColorPopupButton" popup="BackColorPopup"/>
+    </box>
+  </stack>
+
+  <titledbutton id="DecreaseFontSizeButton" oncommand="EditorDecreaseFontSize()"/>
+  <titledbutton id="IncreaseFontSizeButton" oncommand="EditorIncreaseFontSize()"/>
+
+  <titledbutton id="boldButton" class="format" align="center" oncommand="EditorToggleStyle('bold')">
+    <observes element="Editor:Bold" attribute="bold" onbroadcast="onStyleChange('bold')"/>
+  </titledbutton>
+  <titledbutton id="italicButton" class="format" align="center" oncommand="EditorToggleStyle('italic')">
+    <observes element="Editor:Italic" attribute="italic" onbroadcast="onStyleChange('italic')"/>
+  </titledbutton>
+  <titledbutton id="underlineButton" class="format" align="center" oncommand="EditorToggleStyle('underline')">
+    <observes element="Editor:Underline" attribute="underline" onbroadcast="onStyleChange('underline')"/>
+  </titledbutton>
+
+  <titledbutton id="ulButton" class="format" oncommand="EditorMakeOrChangeList('ul')">
+      <observes element="Editor:Paragraph:ListType" attribute="format" onbroadcast="onListFormatChange('ul')"/>
+  </titledbutton>
+
+  <titledbutton id="olButton" class="format" oncommand="EditorMakeOrChangeList('ol')">
+      <observes element="Editor:Paragraph:ListType" attribute="format" onbroadcast="onListFormatChange('ol')"/>
+  </titledbutton>
+
+  <titledbutton id="outdentButton"    class="format"        oncommand="EditorIndent('outdent')"/>
+  <titledbutton id="indentButton"     class="format"        oncommand="EditorIndent('indent')"/>
+  <titledbutton id="AlignPopupButton" class="format popup"/>
+  
+  <!-- InsertPopupButton is used by messengercompose.xul -->
+  <titledbutton id="InsertPopupButton" class="format popup"/>
+
+  <!-- Paste as quotation is used by mail compose,
+       but in composer it has to go in the debug menu
+   -->
+  <menuitem id="menu_pasteQuote" value="&pasteAsQuotationCmd.label;" accesskey="&editpastequotation.accesskey;" oncommand="EditorPasteAsQuotation()"/>
+
+  <!-- DEBUG only -->
+  <menu id="debugMenu" value="&debugMenu.label;">
+  <menupopup>
+    <menuitem value="&newEditorTestPage.label;" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
+    <menuitem value="&textEditorCmd.label;"     oncommand="EditorNewPlaintext();" />
+    <menuitem value="&outputTextCmd.label;"
+           oncommand="EditorGetText()"/>
+    <menuitem value="&outputHTMLCmd.label;"
+           oncommand="EditorGetHTML()"/>
+    <menuitem value="&outputXIFCmd.label;"
+           oncommand="EditorGetXIF()"/>
+    <menuseparator />
+    <menuitem value="&pasteAsQuotationCmd.label;" accesskey="&editpastequotation.accesskey;" oncommand="EditorPasteAsQuotation()"/>
+    <menuitem value="&insertTextCmd.label;"
+           oncommand="EditorInsertText('All good things come to those who wait. ')"/>
+    <menuseparator />
+    <menuitem value="&testSelectionCmd.label;"
+           oncommand="EditorTestSelection()"/>
+    <menuitem value="&testTableLayoutCmd.label;"
+           oncommand="EditorTestTableLayout()"/>
+    <menuitem value="&showEmbeddedCmd.label;"
+           oncommand="EditorShowEmbeddedObjects()"/>
+    <menuitem value="&dumpContentCmd.label;"
+           oncommand="EditorDumpContent()"/>
+    <menuitem value="&testDocumentCmd.label;"
+           oncommand="EditorTestDocument()"/>
+    <menuitem value="&runUnitTestsCmd.label;"
+           oncommand="EditorUnitTests()"/>
+    <menuseparator />
+    <menuitem value="&startLogCmd.label;"
+           oncommand="EditorStartLog()"/>
+    <menuitem value="&stopLogCmd.label;"
+           oncommand="EditorStopLog()"/>
+    <menuitem value="&runLogCmd.label;"
+           oncommand="EditorRunLog()"/>
+    <menuseparator />
+    <menuitem value="&setFocusCmd.label;"
+            accesskey="&toolsetfocus.accesskey;"
+            oncommand="window.focus()"/>
+  </menupopup>
+  </menu>
+  <!-- end DEBUG only -->
+
+  <!-- Window bottom -->
+  <box id="status-bar" chromeclass="status">
+    <box id="state-box" align="horizontal" flex="100%" style="min-width: 1px">
+      <box align="vertical" style="width:100px">
+        <spring flex="100%"/>
+        <progressmeter id="statusbar-icon" mode="normal" align="horizontal" value="0">
+            <observes element="Editor:Throbber" attribute="busy"/>
+        </progressmeter>
+        <spring flex="100%"/>
       </box>
-    </stack>
+      <spring style="width: 1em"/>
+      <titledbutton id="statusText" class="status-bar" align="left" flex="100%" 
+        value="&tempDoneLoading.label;"  style="min-width: 1px">
+      </titledbutton>
 
-    <titledbutton id="DecreaseFontSizeButton" oncommand="EditorDecreaseFontSize()"/>
-    <titledbutton id="IncreaseFontSizeButton" oncommand="EditorIncreaseFontSize()"/>
-
-    <titledbutton id="boldButton" class="format" align="center" oncommand="EditorToggleStyle('bold')">
-      <observes element="Editor:Bold" attribute="bold" onbroadcast="onStyleChange('bold')"/>
-    </titledbutton>
-    <titledbutton id="italicButton" class="format" align="center" oncommand="EditorToggleStyle('italic')">
-      <observes element="Editor:Italic" attribute="italic" onbroadcast="onStyleChange('italic')"/>
-    </titledbutton>
-    <titledbutton id="underlineButton" class="format" align="center" oncommand="EditorToggleStyle('underline')">
-      <observes element="Editor:Underline" attribute="underline" onbroadcast="onStyleChange('underline')"/>
-    </titledbutton>
-
-    <titledbutton id="ulButton" class="format" oncommand="EditorMakeOrChangeList('ul')">
-        <observes element="Editor:Paragraph:ListType" attribute="format" onbroadcast="onListFormatChange('ul')"/>
-    </titledbutton>
-
-    <titledbutton id="olButton" class="format" oncommand="EditorMakeOrChangeList('ol')">
-        <observes element="Editor:Paragraph:ListType" attribute="format" onbroadcast="onListFormatChange('ol')"/>
-    </titledbutton>
-
-    <titledbutton id="outdentButton"    class="format"        oncommand="EditorIndent('outdent')"/>
-    <titledbutton id="indentButton"     class="format"        oncommand="EditorIndent('indent')"/>
-    <titledbutton id="AlignPopupButton" class="format popup"/>
-    
-    <!-- InsertPopupButton is used by messengercompose.xul -->
-    <titledbutton id="InsertPopupButton" class="format popup"/>
-
-    <!-- Paste as quotation is used by mail compose,
-         but in composer it has to go in the debug menu
-     -->
-    <menuitem id="menu_pasteQuote" value="&pasteAsQuotationCmd.label;" accesskey="&editpastequotation.accesskey;" oncommand="EditorPasteAsQuotation()"/>
-
-    <!-- DEBUG only -->
-    <menu id="debugMenu" value="&debugMenu.label;">
-    <menupopup>
-      <menuitem value="&newEditorTestPage.label;" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
-      <menuitem value="&textEditorCmd.label;"     oncommand="EditorNewPlaintext();" />
-      <menuitem value="&outputTextCmd.label;"
-             oncommand="EditorGetText()"/>
-      <menuitem value="&outputHTMLCmd.label;"
-             oncommand="EditorGetHTML()"/>
-      <menuitem value="&outputXIFCmd.label;"
-             oncommand="EditorGetXIF()"/>
-      <menuseparator />
-      <menuitem value="&pasteAsQuotationCmd.label;" accesskey="&editpastequotation.accesskey;" oncommand="EditorPasteAsQuotation()"/>
-      <menuitem value="&insertTextCmd.label;"
-             oncommand="EditorInsertText('All good things come to those who wait. ')"/>
-      <menuseparator />
-      <menuitem value="&testSelectionCmd.label;"
-             oncommand="EditorTestSelection()"/>
-      <menuitem value="&testTableLayoutCmd.label;"
-             oncommand="EditorTestTableLayout()"/>
-      <menuitem value="&showEmbeddedCmd.label;"
-             oncommand="EditorShowEmbeddedObjects()"/>
-      <menuitem value="&dumpContentCmd.label;"
-             oncommand="EditorDumpContent()"/>
-      <menuitem value="&testDocumentCmd.label;"
-             oncommand="EditorTestDocument()"/>
-      <menuitem value="&runUnitTestsCmd.label;"
-             oncommand="EditorUnitTests()"/>
-      <menuseparator />
-      <menuitem value="&startLogCmd.label;"
-             oncommand="EditorStartLog()"/>
-      <menuitem value="&stopLogCmd.label;"
-             oncommand="EditorStopLog()"/>
-      <menuitem value="&runLogCmd.label;"
-             oncommand="EditorRunLog()"/>
-      <menuseparator />
-      <menuitem value="&setFocusCmd.label;"
-              accesskey="&toolsetfocus.accesskey;"
-              oncommand="window.focus()"/>
-    </menupopup>
-    </menu>
-    <!-- end DEBUG only -->
-
-    <!-- Window bottom -->
-      <box id="status-bar" chromeclass="status">
-        <box id="state-box" align="horizontal" flex="100%" style="min-width: 1px">
-          <box align="vertical" style="width:100px">
-          <spring flex="100%"/>
-          <progressmeter id="statusbar-icon" mode="normal" align="horizontal" value="0">
-              <observes element="Editor:Throbber" attribute="busy"/>
-          </progressmeter>
-          <spring flex="100%"/>
-        </box>
-        <spring style="width: 1em"/>
-        <titledbutton id="statusText" class="status-bar" align="left" flex="100%" 
-          value="&tempDoneLoading.label;"  style="min-width: 1px">
-        </titledbutton>
-    
-        <titledbutton class="status-bar" align="left" value=""/>
-      </box>
-     </box>
+      <titledbutton class="status-bar" align="left" value=""/>
+    </box>
+  </box>
      
 </overlay>
diff --git a/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd b/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd
index 345a02d3270..7bcacc9f16b 100644
--- a/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd
+++ b/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd
@@ -307,6 +307,22 @@
 <!ENTITY stylesubscript.accesskey "s">
 <!ENTITY styleNonbreakingCmd.label "Nonbreaking">
 <!ENTITY stylenonbreaking.accesskey "n">
+<!ENTITY styleEm.label "Emphasis">
+<!ENTITY styleEm.accesskey "e">
+<!ENTITY styleStrong.label "Stronger Emphasis">
+<!ENTITY styleStrong.accesskey "t">
+<!ENTITY styleCite.label "Citation">
+<!ENTITY styleCite.accesskey "c">
+<!ENTITY styleAbbr.label "Abbreviation">
+<!ENTITY styleAbbr.accesskey "a">
+<!ENTITY styleAcronym.label "Acronym">
+<!ENTITY styleAcronym.accesskey "r">
+<!ENTITY styleCode.label "Code">
+<!ENTITY styleCode.accesskey "o">
+<!ENTITY styleSamp.label "Sample Output">
+<!ENTITY styleSamp.accesskey "m">
+<!ENTITY styleVar.label "Variable">
+<!ENTITY styleVar.accesskey "v">
 
 <!ENTITY fontColorMenu.label "Text Color">
 <!ENTITY formatcolormenu.accesskey "c">
diff --git a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
index da358ff3bb4..0cc4955d296 100644
--- a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
+++ b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
@@ -103,7 +103,7 @@
                 <spring class="spacer"/>
                 <html:label for="AddHTMLAttributeValueInput"> &AttValue.label;</html:label>
           	    <html:input type="text" flex="100%" id="AddHTMLAttributeValueInput" onkeyup="doHTMLEnabling(event.which)"/>
-                <titledbutton class="push" id="AddHTMLAttribute" onclick="onAddHTMLAttribute(this)" value="&AddAttributeButton.label;" disabled="true"/>
+                <button class="dialog" id="AddHTMLAttribute" oncommand="onAddHTMLAttribute(this)" value="&AddAttributeButton.label;" disabled="true"/>
               </box>
             </titledbox>
           </box>
@@ -133,7 +133,7 @@
                 <spring class="spacer"/>
                 <html:label for="AddCSSAttributeValueInput"> &AttValue.label;</html:label>
           	    <html:input type="text" flex="100%" id="AddCSSAttributeValueInput" onkeyup="doCSSEnabling(event.which)"/>
-                <titledbutton class="push" id="AddCSSAttribute" onclick="onAddCSSAttribute(this)" value="&AddAttributeButton.label;" disabled="true"/>
+                <button class="dialog" id="AddCSSAttribute" oncommand="onAddCSSAttribute(this)" value="&AddAttributeButton.label;" disabled="true"/>
               </box>
             </titledbox>
           </box>
@@ -163,7 +163,7 @@
                 <spring class="spacer"/>
                 <html:label for="AddJSEAttributeValueInput"> &AttValue.label;</html:label>
           	    <html:input type="text" flex="100%" id="AddJSEAttributeValueInput" onkeyup="doJSEEnabling(event.which)"/>
-                <titledbutton class="push" id="AddJSEAttribute" onclick="onAddJSEAttribute(this)" value="&AddAttributeButton.label;" disabled="true"/>
+                <button class="dialog" id="AddJSEAttribute" oncommand="onAddJSEAttribute(this)" value="&AddAttributeButton.label;" disabled="true"/>
               </box>
             </titledbox>
           </box>
@@ -173,7 +173,7 @@
   </tabcontrol>
 
   <box align="horizontal">
-    <html:div style="margin-top: 0.5em"><titledbutton class="push" value="&HTMLReference.label;"/></html:div>
+    <html:div style="margin-top: 0.5em"><button class="dialog" value="&HTMLReference.label;"/></html:div>
     <spring flex="100%"/>
     <!-- from global dialogOverlay -->
     <html:div style="margin-top: 0.5em">
diff --git a/mozilla/editor/ui/dialogs/content/EdDialogCommon.js b/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
index 0f2b4349cff..afc90a7abf2 100644
--- a/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
+++ b/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
@@ -142,7 +142,7 @@ function ValidateNumberString(value, minValue, maxValue)
 
 function ShowInputErrorMessage(message)
 {
-  editorShell.Alert(GetString("InputError"), message);
+  editorShell.AlertWithTitle(GetString("InputError"), message);
 }
 
 function GetString(name)
diff --git a/mozilla/editor/ui/dialogs/content/EdDialogOverlay.xul b/mozilla/editor/ui/dialogs/content/EdDialogOverlay.xul
index 44539294141..f2971337c5d 100644
--- a/mozilla/editor/ui/dialogs/content/EdDialogOverlay.xul
+++ b/mozilla/editor/ui/dialogs/content/EdDialogOverlay.xul
@@ -32,7 +32,7 @@
   <box flex="1" style="margin-top: 0.2em" autostretch="never">
     <!-- This will right-align the button -->
     <spring flex="1"/>
-    <button id="AdvancedEditButton" class="dialog" onclick="onAdvancedEdit()" value="&AdvancedEditButton.label;"/>
+    <button id="AdvancedEditButton" class="dialog" oncommand="onAdvancedEdit()" value="&AdvancedEditButton.label;"/>
   </box>
   <separator class="groove"/>
 </box>
diff --git a/mozilla/editor/ui/dialogs/content/EdDictionary.xul b/mozilla/editor/ui/dialogs/content/EdDictionary.xul
index 7727a38c0b0..eea3bf7732d 100644
--- a/mozilla/editor/ui/dialogs/content/EdDictionary.xul
+++ b/mozilla/editor/ui/dialogs/content/EdDictionary.xul
@@ -41,7 +41,7 @@
   <box align="horizontal">
     <html:input type="text" class="SpellCheckWord" id="WordInput"/>
     <spring class="bigspacer"/>
-    <titledbutton class="push SizeToParent" flex="100%" id="AddWord" onclick="AddWord()" value="&AddButton.label;"/>
+    <button class="dialog" flex="100%" id="AddWord" oncommand="AddWord()" value="&AddButton.label;"/>
   </box>
   <spring class="bigspacer"/>
   <html:label for="WordInput">&DictionaryList.label;</html:label>
@@ -50,11 +50,11 @@
     <html:select class="SpellCheckList" id="DictionaryList" size="10"/>
     <spring class="bigspacer"/>
     <box align="vertical">
-      <titledbutton class="push SizeToParent"  id="ReplaceWord" onclick="ReplaceWord()" value="&ReplaceButton.label;"/>
+      <button class="dialog"  id="ReplaceWord" oncommand="ReplaceWord()" value="&ReplaceButton.label;"/>
       <spring class="spacer"/>
-      <titledbutton class="push SizeToParent"  id="RemoveWord" onclick="RemoveWord()" value="&RemoveButton.label;"/>
+      <button class="dialog"  id="RemoveWord" oncommand="RemoveWord()" value="&RemoveButton.label;"/>
       <spring flex="100%"/>
-      <titledbutton class="push CloseButton"  id="Close" onclick="onCancel()" value="&CloseButton.label;"/>
+      <button class="dialog CloseButton"  id="Close" oncommand="onCancel()" value="&CloseButton.label;"/>
     </box>
   </box>
 </box>
diff --git a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
index 62fd4c6ed74..b9b2d71ce40 100644
--- a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
@@ -55,7 +55,7 @@
         <row vertical-align="baseline" autostretch="never">
           <text value="&widthEditField.label;"/>
           <textfield id="width" flex="1" onkeyup="forceInteger('width')"/>
-          <menulist id="pixelOrPercentMenulist"><menupopup/></menulist>
+          <menulist id="pixelOrPercentMenulist"/>
           <!-- menupopup and menuitems added by JS -->
         </row>
       </rows>
diff --git a/mozilla/editor/ui/dialogs/content/EdImageMap.xul b/mozilla/editor/ui/dialogs/content/EdImageMap.xul
index dc2d40bc491..4200bff9193 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageMap.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageMap.xul
@@ -142,7 +142,7 @@
   <titledbutton id="pasteButton" class="button28" observes="Map:Paste"/>
   <titledbutton id="zoomInButton" class="button28" observes="Map:ZoomIn"/>
   <titledbutton id="zoomOutButton" class="button28" observes="Map:ZoomOut"/>
-  <titledbutton id="contrastButton" class="button28" toggled="0" onclick="highContrast()"/>
+  <titledbutton id="contrastButton" class="button28" toggled="0" oncommand="highContrast()"/>
   <spring flex="100%"/>
 </toolbar> 
 
@@ -150,10 +150,10 @@
 <box align="horizontal" flex="100">
 
   <toolbar id="toolbox" align="vertical">
-    <titledbutton id="pointerButton" class="tool" toggled="1" onclick="changeTool(event, 'pointer')"/>
-    <titledbutton id="rectButton" class="tool" onclick="changeTool(event, 'rect')"/>
-    <titledbutton id="cirButton" class="tool" onclick="changeTool(event, 'cir')"/>
-    <titledbutton id="polyButton" class="tool" onclick="changeTool(event, 'poly')"/>
+    <titledbutton id="pointerButton" class="tool" toggled="1" oncommand="changeTool(event, 'pointer')"/>
+    <titledbutton id="rectButton" class="tool" oncommand="changeTool(event, 'rect')"/>
+    <titledbutton id="cirButton" class="tool" oncommand="changeTool(event, 'cir')"/>
+    <titledbutton id="polyButton" class="tool" oncommand="changeTool(event, 'poly')"/>
     <spring flex="100%"/>
   </toolbar>
 
@@ -169,11 +169,11 @@
   <box align="horizontal">
 
     <!-- Cheap hack until I get key events hooked up
-    <titledbutton 
-    class   = "push dialog"
+    <button 
+    class   = "dialog"
     id	    = "DelButton"
     value="&delSpotCmd.label;" 
-    onclick="deleteElement(currentElement)"/> -->
+    oncommand="deleteElement(currentElement)"/> -->
     
     <spring flex="100%"/>
 
diff --git a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
index 1d26d0f7da8..f58b0c1334f 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
@@ -53,7 +53,7 @@
         <input type="text" id="urlInput" value="http://" size="30"/>
       </td>
       <td valign="bottom">
-        <xul:titledbutton class="push dialog" id="Browse" onclick = "chooseFile()" value="&browseButton.label;"/>
+        <xul:button class="dialog dialog" id="Browse" oncommand = "chooseFile()" value="&browseButton.label;"/>
       </td>
     </tr>
     <tr>
@@ -75,7 +75,7 @@
       <td>
         <fieldset style="height:100%; padding:5">
           <legend class="dialog" id="commonLabel" align="center">&commonFieldset.label;</legend>
-          <select name="common_targets" id="commonInput" size="4" onclick="changeTarget()" onchange="changeTarget()">
+          <select name="common_targets" id="commonInput" size="4" oncommand="changeTarget()" onchange="changeTarget()">
             <option value="_self">Same Frame</option>
             <option value="_top">Whole Page</option>
             <option value="_blank">New Window</option>
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.js b/mozilla/editor/ui/dialogs/content/EdImageProps.js
index cd22560d7e9..466b9db2425 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.js
@@ -123,8 +123,8 @@ function InitDialog()
   if ( SeeMore )
   {
 	  // setup the height and width widgets
-	  dialog.widthInput.value = InitPixelOrPercentPopup(globalElement, imageElement, "width", "widthUnitsMenulist");
-	  dialog.heightInput.value = InitPixelOrPercentPopup(globalElement, imageElement, "height", "heightUnitsMenulist");
+	  dialog.widthInput.value = InitPixelOrPercentMenulist(globalElement, imageElement, "width", "widthUnitsMenulist");
+	  dialog.heightInput.value = InitPixelOrPercentMenulist(globalElement, imageElement, "height", "heightUnitsMenulist");
 	  
 	  // TODO: We need to get the actual image dimensions.
 	  //       If different from attribute dimensions, then "custom" is checked.
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
index 20fdae3153f..a61f01a0d74 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
@@ -58,13 +58,13 @@
         <spring class="spacer"/>
         <!-- from EdDialogOverlay.xul -->
         <!-- The style: width setting is need to cover a bug in button width resizing when text changes -->
-        <titledbutton id="ChooseFile" style="width: 7em"/>
+        <button class="dialog" id="ChooseFile" style="width: 7em"/>
       </box>
       <spring class="spacer"/>
       <box>
-        <titledbutton class="push" id="MoreFewerButton" align="left" onclick="onMoreFewer()" persist="more"/>
+        <button class="dialog" id="MoreFewerButton" align="left" oncommand="onMoreFewer()" persist="more"/>
         <spring flex="1"/>
-        <titledbutton class="push" id="RemoveLink" onclick="RemoveLink()" value="&RemoveLinkButton.label;" style="width: 7em"/>
+        <button class="dialog" id="RemoveLink" oncommand="RemoveLink()" value="&RemoveLinkButton.label;" style="width: 7em"/>
       </box>
       <box id="MoreSection" align="vertical">
         <spring class="bigspacer"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdMessage.js b/mozilla/editor/ui/dialogs/content/EdMessage.js
deleted file mode 100644
index 2fd5303141a..00000000000
--- a/mozilla/editor/ui/dialogs/content/EdMessage.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/* 
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- */
-
-// dialog initialization code
-
-function Startup()
-{
-  if (!InitEditorShell())
-    return;
-  dump("EditorShell found for Message dialog\n");
-
-  window.opener.msgResult = 0;
-
-  // Message is wrapped in a <div>
-  // We will add child text node(s)
-  var messageParent = (document.getElementById("message"));
-  var messageText = "";
-  if(window.arguments[1])
-    messageText = String(window.arguments[1]);
-
-  if (messageText != "") {
-    var messageFragment;
-
-    // Let the caller use '\n' character or strings "\n" or "<br>" 
-    // to cause line breaks so first convert all to '\n'
-    // Note: Stringbundle's get string turns "\n" into "n", so use "\\n" or "<br>"
-    messageText = messageText.replace(/\\n/g,'\n').replace(/<br>/g,'\n');
-    // Then translate these into <br> tags
-
-    done = false;
-    while (!done) {
-      breakIndex =   messageText.indexOf("\n");
-      if (breakIndex == 0) {
-        // Ignore break at the first character
-        messageText = messageText.slice(1);
-        dump("Found break at begining\n");
-        messageFragment = "";
-      } else if (breakIndex > 0) {
-        // The fragment up to the break
-        messageFragment = messageText.slice(0, breakIndex);
-
-        // Chop off fragment we just found from remaining string
-        messageText = messageText.slice(breakIndex+1);
-      } else {
-        // "\n" not found. We're done
-        done = true;
-        messageFragment = messageText;
-      }
-      messageNode = document.createTextNode(messageFragment);
-      if (messageNode)
-        messageParent.appendChild(messageNode);
-
-      // This is needed when the default namespace of the document is XUL
-      breakNode = document.createElementWithNameSpace("BR", "http://www.w3.org/TR/REC-html40");
-      if (breakNode)
-        messageParent.appendChild(breakNode);
-    }
-  } else {
-    // We must have a message
-    window.close();
-  }
-
-  titleText = String(window.arguments[2]);
-  if (titleText) {
-    dump(titleText+" is the message dialog title\n");
-    window.title = titleText;
-  }
-  // Set the button text from dialog arguments  
-  //  if first button doesn't have text, use "OK"
-  InitButton(3,"button1", true);
-  InitButton(4,"button2", false);
-  InitButton(5,"button3", false);
-  InitButton(6,"button4", false);
-  
-  // Resize content to adjust for added message
-  window.sizeToContent();
-}
-
-function InitButton(argIndex, buttonID, useOK)
-{
-  var button = document.getElementById(buttonID);
-  var text = "";
-  if(window.arguments[argIndex])
-    text = String(window.arguments[argIndex]);
-  if (text == "" && useOK) {
-    text = "OK";
-  }
-
-  if (text != "")
-  {
-    dump(text+"\n");
-    button.setAttribute("value", text);
-  } else {
-    var buttonParent = document.getElementById(buttonID).parentNode;
-    buttonParent.removeChild(button);
-  }
-}
-
-function onButton(buttonNumber)
-{
-  window.opener.msgResult = buttonNumber;
-  window.close();
-}
diff --git a/mozilla/editor/ui/dialogs/content/EdMessage.xul b/mozilla/editor/ui/dialogs/content/EdMessage.xul
deleted file mode 100644
index c6a2e614558..00000000000
--- a/mozilla/editor/ui/dialogs/content/EdMessage.xul
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-   - The contents of this file are subject to the Netscape Public
-   - License Version 1.1 (the "License"); you may not use this file
-   - except in compliance with the License. You may obtain a copy of
-   - the License at http://www.mozilla.org/NPL/
-   -  
-   - Software distributed under the License is distributed on an "AS
-   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-   - implied. See the License for the specific language governing
-   - rights and limitations under the License.
-   -  
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corporation. Portions created by Netscape are
-   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
-   - Rights Reserved.
-   - 
-   - Contributor(s): 
-  -->
-
-<?xml-stylesheet href="chrome://editor/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
-<!DOCTYPE window>
-<!-- dialog containing a control requiring initial setup -->
-<window title="Netscape" class="dialog"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/TR/REC-html40"
-    onload = "Startup()"
-    align="vertical">
-                                  
-  <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdMessage.js"/>
-
-  <broadcaster id="args" value=""/>
-  <box align="horizontal" style="margin: 10px">
-    <html:img src="chrome://global/skin/alert-icon.gif"/>
-    <!-- text node(s) with message text will be appended as children to this -->
-    <html:div id="message" flex="100%"/>
-  </box>
-  <!-- spring style="height: 15px"/ -->
-  <box align="horizontal" style="margin: 10px">
-    <spring flex="100%"/>
-    <titledbutton class="push MsgButton" id="button1" onclick="onButton(1)"/> 
-    <titledbutton class="push MsgButton" id="button2" onclick="onButton(2)"/>
-    <titledbutton class="push MsgButton" id="button3" onclick="onButton(3)"/>
-    <titledbutton class="push MsgButton" id="button4" onclick="onButton(4)"/>
-    <spring flex="100%"/>
-  </box>
-</window>
diff --git a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js
index 71069dc713b..bf57fefe48b 100644
--- a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js
@@ -82,7 +82,6 @@ function Startup()
 
 function InitDialog()
 {
-  //nameInput.setAttribute("value",globalElement.getAttribute("name"));
   nameInput.value = globalElement.getAttribute("name");
 }
 
@@ -102,7 +101,7 @@ function AnchorNameExists(name)
 // Set attributes on globalElement so they can be accessed by AdvancedEdit()
 function ValidateData()
 {
-  var name = TrimString(nameInput.getAttribute("value"));
+  var name = TrimString(nameInput.value);
   if (name.length == 0) {
       ShowInputErrorMessage(GetString("MissingAnchorNameError"));
       nameInput.focus();
diff --git a/mozilla/editor/ui/dialogs/content/EdPageProps.xul b/mozilla/editor/ui/dialogs/content/EdPageProps.xul
index 02b5bcb8e1f..026f4132804 100644
--- a/mozilla/editor/ui/dialogs/content/EdPageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdPageProps.xul
@@ -82,7 +82,7 @@
       class   = "push dialog" 
       id      = "MoreFewerButton"
       align   = "left" 
-      onclick = "onMoreFewer()" 
+      oncommand = "onMoreFewer()" 
       persist = "more"/>
     <spring flex="1"/>
   </box>
diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
index dcb9cf54ded..031bcd0635d 100644
--- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
+++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
@@ -49,7 +49,7 @@
   <box align="horizontal">
     <html:input type="text" class="SpellCheckWord" id="ReplaceWord" size="24" onkeyup="ChangeReplaceWord()"/>
     <spring class="bigspacer"/>
-    <titledbutton class="push SizeToParent" id="CheckWord" onclick="CheckWord()" value="&checkwordButton.label;"/>
+    <button class="dialog" id="CheckWord" oncommand="CheckWord()" value="&checkwordButton.label;"/>
     <spring flex="100%"/>
   </box>
   <spring class="spacer"/>
@@ -59,16 +59,16 @@
     <box align="vertical">
       <box align="horizontal"> 
         <spring class="bigspacer"/>
-        <titledbutton class="push SizeToParent" flex="100%" id="Ignore" onclick="Ignore()" value="&ignoreButton.label;"/>
+        <button class="dialog" flex="100%" id="Ignore" oncommand="Ignore()" value="&ignoreButton.label;"/>
         <spring class="bigspacer"/>
-        <titledbutton class="push SizeToParent" flex="100%" id="IgnoreAll" onclick="IgnoreAll()" value="&ignoreallButton.label;"/>
+        <button class="dialog" flex="100%" id="IgnoreAll" oncommand="IgnoreAll()" value="&ignoreallButton.label;"/>
       </box>
       <spring class="bigspacer"/>
       <box align="horizontal"> 
         <spring class="bigspacer"/>
-        <titledbutton class="push SizeToParent" flex="100%" id="Replace" onclick="Replace()" value="&changeButton.label;"/>
+        <button class="dialog" flex="100%" id="Replace" oncommand="Replace()" value="&changeButton.label;"/>
         <spring class="bigspacer"/>
-        <titledbutton class="push SizeToParent" flex="100%" id="ReplaceAll" onclick="ReplaceAll()" value="&changeallButton.label;"/>
+        <button class="dialog" flex="100%" id="ReplaceAll" oncommand="ReplaceAll()" value="&changeallButton.label;"/>
       </box>
       <spring class="bigspacer"/>
       <box align="horizontal"> 
@@ -77,9 +77,9 @@
       </box> 
       <box align="horizontal"> 
         <spring class="bigspacer"/>
-        <titledbutton class="push SizeToParent" flex="100%" id="AddToDictionary" onclick="AddToDictionary()" value="&addtouserdictionaryButton.label;"/>
+        <button class="dialog" flex="100%" id="AddToDictionary" oncommand="AddToDictionary()" value="&addtouserdictionaryButton.label;"/>
         <spring class="bigspacer"/>
-        <titledbutton class="push SizeToParent" flex="100%" id="EditDictionary" onclick="EditDictionary()" value="&edituserdictionaryButton.label;"/>
+        <button class="dialog" flex="100%" id="EditDictionary" oncommand="EditDictionary()" value="&edituserdictionaryButton.label;"/>
       </box>
     </box>
   </box>
@@ -89,9 +89,9 @@
       <option> &englishLanguagePopup.value; </option>
     </html:select>
     <spring class="bigspacer"/>
-    <titledbutton class="push SizeToParent"  id="Recheck" onclick="Recheck()" value="&recheckButton.label;"/>
+    <button class="dialog"  id="Recheck" oncommand="Recheck()" value="&recheckButton.label;"/>
     <spring class="bigspacer"/>
-    <titledbutton class="push SizeToParent"  id="Close" onclick="Close()" value="&closeButton.label;"/>
+    <button class="dialog"  id="Close" oncommand="Close()" value="&closeButton.label;"/>
     <spring class="bigspacer"/>
   </box> 
 </box>
diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.xul b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
index 2e9ef7ff8af..74aa47d5731 100644
--- a/mozilla/editor/ui/dialogs/content/EdTableProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
@@ -47,8 +47,8 @@
 
   <tabcontrol align="vertical">
 	  <tabbox align="horizontal" flex="100%">
-		  <tab id="TableTab" selected="true" onclick="SelectTableTab()" value="&tableTab.label;"/>
-		  <tab id="CellTab" onclick="SelectCellTab()" value="&cellTab.label;"/>
+		  <tab id="TableTab" selected="true" oncommand="SelectTableTab()" value="&tableTab.label;"/>
+		  <tab id="CellTab" oncommand="SelectCellTab()" value="&cellTab.label;"/>
 	  	<spring flex="1"/>
 	  </tabbox>
     <tabpanel class="Padding5" orient="vertical" id="TabPanel">
@@ -139,8 +139,8 @@
                 <image class="popup-trigger"/>
               </box>
     	        <menupopup>
-                <colorpicker id="tableBackgroundCP" palettename="standard" onclick="GetColorAndUpdate('tableBackgroundCP','tableBackgroundCW',this);"/>
-                <button class="dialog" value="&defaultColor.label;" onclick="GetColorAndUpdate('tableBackgroundCP','tableBackgroundCW',this)"/>
+                <colorpicker id="tableBackgroundCP" palettename="standard" oncommand="GetColorAndUpdate('tableBackgroundCP','tableBackgroundCW',this);"/>
+                <button class="dialog" value="&defaultColor.label;" oncommand="GetColorAndUpdate('tableBackgroundCP','tableBackgroundCW',this)"/>
     	        </menupopup>
             </menu>
             <spring class="spacer"/>
@@ -182,9 +182,9 @@
             </menupopup>
           </menulist>
           <spring class="bigspacer"/>
-          <button class="dialog MinWidth50" value="&cellSelectionPrevious.label;" onclick="SelectPrevious()" disabled="true"/>
+          <button class="dialog MinWidth50" value="&cellSelectionPrevious.label;" oncommand="SelectPrevious()" disabled="true"/>
           <spring class="bigspacer"/>
-          <button class="dialog MinWidth50" value="&cellSelectionNext.label;" onclick="SelectNext()" disabled="true"/>
+          <button class="dialog MinWidth50" value="&cellSelectionNext.label;" oncommand="SelectNext()" disabled="true"/>
         </titledbox>
         <!-- cell size titledbox -->
         <titledbox class="NoBottomPad"><title><text align="left" value="&size.label;"/></title>
@@ -266,9 +266,9 @@
               </box>
     	        <menupopup>
                 <colorpicker id="cellBackgroundCP" palettename="standard"
-                    onclick="GetColorAndUpdate('cellBackgroundCP','cellBackgroundCW',this)"/>
+                    oncommand="GetColorAndUpdate('cellBackgroundCP','cellBackgroundCW',this)"/>
                 <button class="dialog" value="&defaultColor.label;"
-                    onclick="GetColorAndUpdate('cellBackgroundCP','cellBackgroundCW',this)"/>
+                    oncommand="GetColorAndUpdate('cellBackgroundCP','cellBackgroundCW',this)"/>
     	        </menupopup>
             </menu>
             <spring class="spacer"/>
diff --git a/mozilla/editor/ui/dialogs/skin/EditorDialog.css b/mozilla/editor/ui/dialogs/skin/EditorDialog.css
index 7fd92c63db8..4315a5e4735 100644
--- a/mozilla/editor/ui/dialogs/skin/EditorDialog.css
+++ b/mozilla/editor/ui/dialogs/skin/EditorDialog.css
@@ -112,14 +112,15 @@ select#alignTypeSelect,label#alignLabel {
   margin-left: 5px;
 }
 
-titledbutton#MoreFewerButton[more="0"] {
+button#MoreFewerButton[more="0"] {
   margin-left: 6px;
   list-style-image: url(chrome://global/skin/scroll-down.gif);
   /* bug 9459 - changing button text doesn't resize width.
      This covers that problem, but we want this size anyway */
   width: 10em;
 }
-titledbutton#MoreFewerButton[more="1"] {
+
+button#MoreFewerButton[more="1"] {
   margin-left: 6px;
   list-style-image: url(chrome://global/skin/scroll-up.gif);
   width: 10em;
@@ -158,12 +159,6 @@ label.dialog[disabled],legend.dialog[disabled] {
     color: gray;
 }
 
-titledbutton.SizeToParent {
-  width: 100%;
-  /* A hack to get buttons to be the same width */
-  min-width: 5em;
-}
-
 spring.smallspacer {
   width:  3px;
   height: 3px;
@@ -191,19 +186,19 @@ img.AlignIcon {
   /*vertical-align: middle;*/
 }
 
-titledbutton#img-align-top {
+button#img-align-top {
 	list-style-image:url("chrome://editor/skin/images/img-align-top.gif");
 }
-titledbutton#img-align-middle {
+button#img-align-middle {
 	list-style-image:url("chrome://editor/skin/images/img-align-middle.gif");
 }
-titledbutton#img-align-bottom {
+button#img-align-bottom {
 	list-style-image:url("chrome://editor/skin/images/img-align-bottom.gif");
 }
-titledbutton#img-align-left {
+button#img-align-left {
 	list-style-image:url("chrome://editor/skin/images/img-align-left.gif");
 }
-titledbutton#img-align-right {
+button#img-align-right {
 	list-style-image:url("chrome://editor/skin/images/img-align-right.gif");
 }