diff --git a/mailnews/base/prefs/resources/content/AccountManager.xul b/mailnews/base/prefs/resources/content/AccountManager.xul
index 0594d675b66b..f3d83698af0b 100644
--- a/mailnews/base/prefs/resources/content/AccountManager.xul
+++ b/mailnews/base/prefs/resources/content/AccountManager.xul
@@ -20,7 +20,7 @@
-
+
-
-
+
diff --git a/mailnews/base/prefs/resources/content/SmtpServerEdit.xul b/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
index c0c9577054f6..4d69b627b858 100644
--- a/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
+++ b/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
@@ -41,7 +41,7 @@
-
-
+
+
diff --git a/mailnews/base/prefs/resources/content/SmtpServerList.xul b/mailnews/base/prefs/resources/content/SmtpServerList.xul
index fe06a829376b..ab776b88cddb 100644
--- a/mailnews/base/prefs/resources/content/SmtpServerList.xul
+++ b/mailnews/base/prefs/resources/content/SmtpServerList.xul
@@ -33,9 +33,9 @@
title="&smtpListTitle.label;"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- align="vertical"
+ orient="vertical"
onload="onLoad();"
- width="30em"
+ style="width: 30em;"
>
@@ -43,17 +43,18 @@
-
- &smtpListDesc.label;
-
-
-
+&smtpListDesc.label;
+
+
+
+
+
-
+
-
-
+
+
+
+
+
diff --git a/mailnews/base/prefs/resources/content/am-copies.xul b/mailnews/base/prefs/resources/content/am-copies.xul
index 64ad3ecb9d60..4352a8d555c3 100644
--- a/mailnews/base/prefs/resources/content/am-copies.xul
+++ b/mailnews/base/prefs/resources/content/am-copies.xul
@@ -8,7 +8,7 @@
@@ -23,7 +23,7 @@
- <text class="header label" value="&sendingPrefix.label;"/>
+
-<text class="header label" value="&specialFolderTitle.label;"/>
+
diff --git a/mailnews/base/prefs/resources/content/am-identity-advanced.xul b/mailnews/base/prefs/resources/content/am-identity-advanced.xul
index b5526e242408..7729d8de4788 100644
--- a/mailnews/base/prefs/resources/content/am-identity-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-identity-advanced.xul
@@ -61,7 +61,8 @@
-
-
+
+
+
diff --git a/mailnews/base/prefs/resources/content/am-main.xul b/mailnews/base/prefs/resources/content/am-main.xul
index aea1feac5dc5..dec7c79a25cb 100644
--- a/mailnews/base/prefs/resources/content/am-main.xul
+++ b/mailnews/base/prefs/resources/content/am-main.xul
@@ -7,90 +7,74 @@
+ orient="vertical">
+
+
+ &accountSettingsDesc.label;
+
+
+
+
+
+
+
+
+
+ &identityDesc.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- &accountSettingsDesc.label;
- &accountNameDesc.label;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <text class="header label" value="&identityTitle.label;"/>
-
- &identityDesc.label;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/mailnews/base/prefs/resources/content/am-server.xul b/mailnews/base/prefs/resources/content/am-server.xul
index 7a134f7f6407..8aa0b8607334 100644
--- a/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mailnews/base/prefs/resources/content/am-server.xul
@@ -6,7 +6,7 @@
@@ -44,9 +44,10 @@
+
- <text class="header label" value="&serverSettings.label;"/>
-
+
+
+
+
-
+
-
+
diff --git a/mailnews/base/prefs/resources/locale/en-US/am-main.dtd b/mailnews/base/prefs/resources/locale/en-US/am-main.dtd
index a5dc2e1832ac..25354f4d46d5 100644
--- a/mailnews/base/prefs/resources/locale/en-US/am-main.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/am-main.dtd
@@ -10,7 +10,7 @@
-
+
diff --git a/mailnews/base/resources/content/mailWidgets.xml b/mailnews/base/resources/content/mailWidgets.xml
index b96ed430b90c..a190324429c9 100644
--- a/mailnews/base/resources/content/mailWidgets.xml
+++ b/mailnews/base/resources/content/mailWidgets.xml
@@ -42,8 +42,8 @@
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
diff --git a/mailnews/base/resources/locale/en-US/subscribe.dtd b/mailnews/base/resources/locale/en-US/subscribe.dtd
index c6f56ba3c49f..bdf681a6262e 100644
--- a/mailnews/base/resources/locale/en-US/subscribe.dtd
+++ b/mailnews/base/resources/locale/en-US/subscribe.dtd
@@ -20,8 +20,8 @@ Rights Reserved.
-
-
-
+
+
+
-
+
diff --git a/mailnews/base/search/resources/content/FilterEditor.xul b/mailnews/base/search/resources/content/FilterEditor.xul
index c8f9897dc547..884dbbbd3e7a 100644
--- a/mailnews/base/search/resources/content/FilterEditor.xul
+++ b/mailnews/base/search/resources/content/FilterEditor.xul
@@ -31,17 +31,20 @@ Rights Reserved.
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&window.title;"
orient="vertical"
- persist="width heigh screenX screenY"
+ style="width: 40em;"
+ persist="width height screenX screenY"
onload="filterEditorOnLoad('msgFccFolderPicker');">
-
-
+
+
-
-
-
+
+
+
+
+
@@ -59,19 +62,40 @@ Rights Reserved.
<menulist id="actionTargetFolder" flex="1"
oncommand="onTargetFolderSelected(event);"/>
- <menulist id="actionValuePriority">
+ <titledbox id="searchTermListBox" flex="1"/>
+
+ <titledbox autostretch="never">
+ <title value="&filterAction.label;"/>
+
+ <menulist id="actionMenu" flex="1" oncommand="onActionChanged(event)">
<menupopup>
- <!-- see MailNewsTypes2.idl -->
- <menuitem data="6" value="&highestPriorityCmd.label;"/>
- <menuitem data="5" value="&highPriorityCmd.label;"/>
- <menuitem data="4" value="&normalPriorityCmd.label;"/>
- <menuitem data="3" value="&lowPriorityCmd.label;"/>
- <menuitem data="2" value="&lowestPriorityCmd.label;"/>
+ <menuitem data="1" actionvalueindex="0" value="&moveToFolder.label;"/>
+ <menuitem data="2" actionvalueindex="1" value="&changePriority.label;"/>
+ <menuitem data="3" actionvalueindex="2" value="&delete.label;"/>
+ <menuitem data="4" actionvalueindex="2" value="&markRead.label;"/>
+ <menuitem data="5" actionvalueindex="2" value="&ignoreThread.label;"/>
+ <menuitem data="6" actionvalueindex="2" value="&watchThread.label;"/>
</menupopup>
</menulist>
- <text id="actionValueNone"/>
- </deck>
+ <deck id="actionValueDeck" flex="1">
+ <menulist id="actionTargetFolder" flex="1"
+ oncommand="onTargetFolderSelected(event);"/>
+ <menulist id="actionValuePriority">
+ <menupopup>
+ <!-- see MailNewsTypes2.idl -->
+ <menuitem data="6" value="&highestPriorityCmd.label;"/>
+ <menuitem data="5" value="&highPriorityCmd.label;"/>
+ <menuitem data="4" value="&normalPriorityCmd.label;"/>
+ <menuitem data="3" value="&lowPriorityCmd.label;"/>
+ <menuitem data="2" value="&lowestPriorityCmd.label;"/>
+ </menupopup>
+ </menulist>
+ <text id="actionValueNone"/>
+ </deck>
</titledbox>
- <separator class="groove"/>
- <box id="okCancelButtons"/>
+
+ <separator/>
+
+ <box id="okCancelButtonsRight"/>
+
</window>
diff --git a/mailnews/base/search/resources/content/FilterListDialog.xul b/mailnews/base/search/resources/content/FilterListDialog.xul
index bd57473b0211..4ca965979918 100644
--- a/mailnews/base/search/resources/content/FilterListDialog.xul
+++ b/mailnews/base/search/resources/content/FilterListDialog.xul
@@ -28,92 +28,111 @@ Rights Reserved.
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
orient="vertical"
onload="onLoad();"
+ style="width: 34em;"
title="&window.title;">
-<script language="JavaScript" src="chrome://messenger/content/FilterListDialog.js"/>
-<script language="JavaScript" src="chrome://global/content/strres.js"/>
-<!-- <script src="resource:/res/samples/DumpDOM.js"/> -->
-<keyset id="keyset"/>
+ <script language="JavaScript" src="chrome://messenger/content/FilterListDialog.js"/>
+ <script language="JavaScript" src="chrome://global/content/strres.js"/>
- <box orient="horizontal">
- <text class="label" value="&filtersForPrefix.label;"/>
- <menulist oncommand="onServerClick(event);" id="serverMenu">
- <menupopup rdf:datasources="rdf:msgaccountmanager"
- rdf:containment="http://home.netscape.com/NC-rdf#child"
- ref="msgaccounts:/">
- <template>
- <menuitem uri="..." data="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
- </template>
- </menupopup>
- </menulist>
- <text class="label" value="&filtersForPostfix.label;"/>
- </box>
- <box orient="horizontal" >
- <box orient="vertical" style="width:100%;" >
- <text value="&filterHeader.label;"/>
- <box orient="horizontal" style="min-height: 200px; min-width: 200px">
- <tree id="filterTree" class="inset" flex="1"
- onselect="onFilterSelect(event);"
- rdf:datasources="rdf:msgfilters rdf:msgaccountmanager "
- rdf:containment="http://home.netscape.com/NC-rdf#child">
- <template>
- <rule>
- <treechildren flex="1">
- <treeitem uri="..." open="true"
- Enabled="rdf:http://home.netscape.com/NC-rdf#Enabled">
- <treerow >
- <treecell indent="true" value="rdf:http://home.netscape.com/NC-rdf#Name"/>
- <treecell allowevents="true"
- class="enabledcol treecell-image"
- value="rdf:http://home.netscape.com/NC-rdf#Enabled"
- onclick="onToggleEnabled(event);"/>
- </treerow>
- </treeitem>
- </treechildren>
- </rule>
- </template>
+ <!-- <script src="resource:/res/samples/DumpDOM.js"/> -->
- <treecolgroup>
- <treecol style="width: 0px" flex="85" rdf:resource="http://home.netscape.com/NC-rdf#Name" id="nameColumn"/>
- <treecol style="width: 0px" flex="15" id="activeColumn"/>
- </treecolgroup>
+ <keyset id="keyset"/>
- <treehead>
- <treerow>
- <treecell persist="hidden width" class="treecell-header treecell-inset-header" value="&nameColumn.label;"/>
- <treecell persist="hidden width" class="treecell-header treecell-inset-header" value="&activeColumn.label;"/>
- </treerow>
- </treehead>
- </tree>
+ <grid flex="1">
+ <columns>
+ <column flex="1"/>
+ <column/>
+ <column/>
+ </columns>
+ <rows>
+ <row>
+ <text class="label" value="&filtersForPrefix.label;"/>
+ <spring/>
+ <spring/>
+ </row>
+ <row>
+ <menulist oncommand="onServerClick(event);" id="serverMenu">
+ <menupopup rdf:datasources="rdf:msgaccountmanager"
+ rdf:containment="http://home.netscape.com/NC-rdf#child"
+ ref="msgaccounts:/">
+ <template>
+ <menuitem uri="..." data="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+ </template>
+ </menupopup>
+ </menulist>
+ <spring/>
+ <spring/>
+ </row>
+ <row>
+ <separator class="thin"/>
+ <spring/>
+ <spring/>
+ </row>
+ <row>
+ <box orient="vertical">
+ <html>&filterHeader.label;</html>
+ <tree id="filterTree" class="inset" flex="1"
+ onselect="onFilterSelect(event);"
+ rdf:datasources="rdf:msgfilters rdf:msgaccountmanager "
+ rdf:containment="http://home.netscape.com/NC-rdf#child">
->
- <box orient="vertical">
- <spring flex="3"/>
- <scrollbarbutton type="increment" oncommand="onUp(event)">
- <image src="chrome://global/skin/scroll-up.gif"/>
- </scrollbarbutton>
- <spring flex="1"/>
- <scrollbarbutton type="decrement" oncommand="onDown(event)">
- <image src="chrome://global/skin/scroll-down.gif"/>
- </scrollbarbutton>
- <spring flex="3"/>
- </box>
- </box>
- </box>
- <box orient="vertical">
- <button id="newButton" value="&newButton.label;" onclick="onNewFilter();"/>
- <button id="editButton" value="&editButton.label;" onclick="onEditFilter();"/>
- <button id="deleteButton" value="&deleteButton.label;" onclick="onDeleteFilter();"/>
- </box>
- </box>
-<!--
- take out for PR2
- <box orient="horizontal">
- <button value="&runFiltersNow.label;" width="0em"/>
- </box>
--->
-<!-- <button onclick="DumpDOM(document.getElementById('filterTree'));" value="dump"/> -->
- <separator class="groove"/>
- <box id="okCancelButtons"/>
+ <treehead>
+ <treerow>
+ <treecell class="treecell-header treecell-inset-header"
+ persist="hidden width" value="&nameColumn.label;"/>
+ <treecell class="treecell-header treecell-inset-header"
+ persist="hidden width" value="&activeColumn.label;"/>
+ </treerow>
+ </treehead>
+
+ <template>
+ <rule>
+ <treechildren>
+ <treeitem uri="..." open="true"
+ Enabled="rdf:http://home.netscape.com/NC-rdf#Enabled">
+ <treerow >
+ <treecell indent="true" value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+ <treecell allowevents="true"
+ class="enabledcol treecell-image"
+ value="rdf:http://home.netscape.com/NC-rdf#Enabled"
+ onclick="onToggleEnabled(event);"/>
+ </treerow>
+ </treeitem>
+ </treechildren>
+ </rule>
+ </template>
+
+ <treecolgroup>
+ <treecol style="width: 0px" flex="75" rdf:resource="http://home.netscape.com/NC-rdf#Name" id="nameColumn"/>
+ <treecol style="width: 0px" flex="25" id="activeColumn"/>
+ </treecolgroup>
+
+ <treechildren flex="1"/>
+
+ </tree>
+ </box>
+ <box orient="vertical">
+ <spring flex="1"/>
+ <button class="reorder-up top" oncommand="onUp(event);"/>
+ <button class="reorder-down top" oncommand="onDown(event);"/>
+ <spring flex="1"/>
+ </box>
+ <box orient="vertical">
+ <button id="newButton" value="&newButton.label;" onclick="onNewFilter();"/>
+ <button id="editButton" value="&editButton.label;" onclick="onEditFilter();"/>
+ <button id="deleteButton" value="&deleteButton.label;" onclick="onDeleteFilter();"/>
+ <spring flex="1"/>
+ <!-- take out for PR2
+ <button value="&runFiltersNow.label;" width="0em"/>
+ <button onclick="DumpDOM(document.getElementById('filterTree'));" value="dump"/>
+ -->
+ </box>
+ </row>
+ </rows>
+ </grid>
+
+ <separator/>
+
+ <box id="okCancelButtonsRight"/>
</window>
diff --git a/mailnews/base/search/resources/content/SearchDialog.xul b/mailnews/base/search/resources/content/SearchDialog.xul
index 50ef70724e4a..a04943b400f7 100644
--- a/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mailnews/base/search/resources/content/SearchDialog.xul
@@ -26,6 +26,7 @@ Rights Reserved.
<?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/SearchDialog.dtd" >
@@ -33,34 +34,46 @@ Rights Reserved.
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="searchOnLoad();"
title="&searchDialogTitle.label;"
- class="dialog"
+ width="620" height="470"
+ persist="screenX screenY width height"
orient="vertical">
+ <keyset id="keyset"/>
+
<script src="chrome://global/content/strres.js"/>
<script src="chrome://messenger/content/mailWindow.js"/>
<script src="chrome://messenger/content/SearchDialog.js"/>
- <box>
- <text class="label" value="&searchHeading.label;"/>
- <menulist id="searchableFolders" flex="2"
- oncommand="onChooseFolder(event)"/>
- <spring flex="1"/>
-<!--
- <checkbox value="&searchSubfolders.label;"/>
--->
- </box>
+
+ <box orient="vertical" class="dialog box-padded">
+ <box autostretch="never">
+ <text class="label" value="&searchHeading.label;"/>
+ <menulist id="searchableFolders" flex="2"
+ oncommand="onChooseFolder(event)"/>
+ <spring flex="1"/>
+ <!--
+ <checkbox value="&searchSubfolders.label;"/>
+ -->
+ </box>
- <box>
- <titledbox id="searchTermListBox" flex="1"/>
- <box orient="vertical">
- <button value="&searchButton.label;" oncommand="onSearch(event)"/>
- <button value="&resetButton.label;" oncommand="onReset(event)"/>
+ <box flex="1">
+ <titledbox id="searchTermListBox" flex="1"/>
+ <box orient="vertical">
+ <button value="&searchButton.label;" oncommand="onSearch(event)"/>
+ <button value="&resetButton.label;" oncommand="onReset(event)"/>
+ <spring flex="1"/>
+ <button value="&closeButton.label;" onclick="window.close()"/>
+ <separator class="thin"/>
+ </box>
</box>
</box>
+
+ <splitter id="searchfields-splitter" collapse="before" persist="state hidden"
+ autostretch="never" orient="vertical">
+ <grippy/>
+ </splitter>
+
+ <tree id="threadTree" flex="1" style="height: 0px" context="threadPaneContext"/>
- <tree id="threadTree" class="inset" flex="1" style="height: 50px" context="threadPaneContext"/>
- <box>
- <spring flex="100%"/>
- <button value="&closeButton.label;" onclick="window.close()"/>
- </box>
- <box id="status-bar"/>
+ <statusbar id="status-bar"/>
+
</window>
diff --git a/mailnews/base/search/resources/content/searchTermOverlay.xul b/mailnews/base/search/resources/content/searchTermOverlay.xul
index b9bd01010d6a..685141654c4f 100644
--- a/mailnews/base/search/resources/content/searchTermOverlay.xul
+++ b/mailnews/base/search/resources/content/searchTermOverlay.xul
@@ -25,67 +25,70 @@
<!DOCTYPE window SYSTEM "chrome://messenger/locale/searchTermOverlay.dtd" >
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script src="chrome://messenger/content/searchTermOverlay.js"/>
- <titledbox orient="vertical" id="searchTermListBox">
- <title>
- <text value="&conditions.label;"/>
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd b/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd
index 0cac33ff37a7..c71c90a42d1d 100644
--- a/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd
+++ b/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd
@@ -2,13 +2,13 @@
-
-
+
+
-
+