From 28fb2f7adaf5b390cf0c16107d93cbb3e0291f42 Mon Sep 17 00:00:00 2001
From: "andreww%netscape.com" <andreww%netscape.com>
Date: Wed, 11 Apr 2001 00:21:51 +0000
Subject: [PATCH] bugzilla - 68247 r=doronr sr=sspitzer  cleaning up mail
 search dialog some.

---
 .../base/search/resources/content/SearchDialog.xul   | 12 ++++++++----
 .../search/resources/locale/en-US/SearchDialog.dtd   |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mailnews/base/search/resources/content/SearchDialog.xul b/mailnews/base/search/resources/content/SearchDialog.xul
index d62b21675b8..5f12058b352 100644
--- a/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mailnews/base/search/resources/content/SearchDialog.xul
@@ -84,7 +84,6 @@ Rights Reserved.
 
       <box flex="1">
         <box id="searchTermListBox" flex="1"/>
-        
         <box orient="vertical">
            <spring flex="1"/>
            <button label="&searchButton.label;" id="search-button" oncommand="onSearchButton(event);"/>
@@ -96,11 +95,17 @@ Rights Reserved.
     
     <splitter id="gray_horizontal_splitter" collapse="after"  persist="state"/>
     
-    <titledbox orient="vertical" class="dialog box-padded" flex="1">
+    <titledbox orient="horizontal" class="dialog box-padded" flex="1">
        <label value="&results.label;"/>
        <box id="searchTermListBox" orient="vertical" flex="1">
             <outliner id="threadOutliner" flex="1" context="threadPaneContext"/>
        </box>
+       <box orient="vertical">
+            <spring flex="1" />
+            <button label="&openButton.label;" id="openButton" observes="cmd_open"/>
+            <button label="&deleteButton.label;" id="deleteButton" observes="cmd_delete"/>
+            <spring flex="1" />
+       </box>      
     </titledbox>
 
     <box align="left">
@@ -167,8 +172,7 @@ Rights Reserved.
     </box>
         
     <box autostretch="never" align="right">
-      <button label="&openButton.label;" id="openButton" observes="cmd_open"/>
-      <button label="Delete" id="deleteButton" observes="cmd_delete"/>
+
       <button label="&closeButton.label;" oncommand="window.close();"/>
     </box>
   
diff --git a/mailnews/base/search/resources/locale/en-US/SearchDialog.dtd b/mailnews/base/search/resources/locale/en-US/SearchDialog.dtd
index 66a504650db..7082c2e0828 100644
--- a/mailnews/base/search/resources/locale/en-US/SearchDialog.dtd
+++ b/mailnews/base/search/resources/locale/en-US/SearchDialog.dtd
@@ -7,6 +7,7 @@
 <!ENTITY optionsButton.label         "Options">
 <!ENTITY closeButton.label           "Close">
 <!ENTITY openButton.label            "Open">
+<!ENTITY deleteButton.label          "Delete">
 <!ENTITY searchDialogTitle.label     "Search Messages">
 <!ENTITY conditionDesc.label         "Search for messages which:">
 <!ENTITY conditions.label            "Criteria">