diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul
index aeb46a7d41e..8ba23fb8697 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.xul
+++ b/mozilla/mail/base/content/mailWindowOverlay.xul
@@ -1809,7 +1809,7 @@
   <spring flex="4"/>
 
   <textbox id="searchInput" flex="1" onfocus="onSearchInputFocus(event);" onblur="onSearchInputBlur(event);" onclick="this.select();" oninput="onSearchInput(false);" onkeypress="onSearchKeyPress(event);">
-    <button id="search-button" type="menu">
+    <button id="quick-search-button" type="menu">
       <menupopup id="quick-search-menupopup" value="2" persist="value" popupalign="topleft" popupanchor="bottomleft">
         <menuitem value="0" label="&searchSubjectMenu.label;" type="radio"  
                   oncommand="changeQuickSearchMode(this)"/>
diff --git a/mozilla/mail/base/content/messenger.css b/mozilla/mail/base/content/messenger.css
index 7594515a495..9b968dd11a3 100644
--- a/mozilla/mail/base/content/messenger.css
+++ b/mozilla/mail/base/content/messenger.css
@@ -86,7 +86,7 @@ dummy.usesMailWidgets {
   -moz-binding: url("chrome://messenger/content/search.xml#searchbar");
 }
 
-#search-button {
+#quick-search-button {
   -moz-binding: url("chrome://messenger/content/search.xml#searchBarDropMarker");
   cursor: default;
 }
diff --git a/mozilla/mail/base/content/search.xml b/mozilla/mail/base/content/search.xml
index 1bd0dec4a15..d9b02608e50 100644
--- a/mozilla/mail/base/content/search.xml
+++ b/mozilla/mail/base/content/search.xml
@@ -87,9 +87,9 @@
       <children/>
       <xul:stack flex="1">
         <xul:hbox align="center">
-          <xul:image class="search-button-image" xbl:inherits="src"/>
+          <xul:image class="quick-search-button-image" xbl:inherits="src"/>
         </xul:hbox>
-        <xul:image class="search-button-dropmarker"/>
+        <xul:image class="quick-search-button-dropmarker"/>
       </xul:stack>
     </content>  
   </binding>
diff --git a/mozilla/mail/base/skin/mac/mailWindow1.css b/mozilla/mail/base/skin/mac/mailWindow1.css
index 4778fd26c57..3916e0cceec 100644
--- a/mozilla/mail/base/skin/mac/mailWindow1.css
+++ b/mozilla/mail/base/skin/mac/mailWindow1.css
@@ -970,17 +970,17 @@ splitter {
   color: grey;
 }
 
-#search-button {
+#quick-search-button {
   min-width: 22px;
   margin: 0px 3px 0px 5px; 
 }
 
-.search-button-image {
+.quick-search-button-image {
   padding: 0px;
   list-style-image: url("chrome://messenger/skin/icons/Search-bar.png");
 }
 
-.search-button-dropmarker {
+.quick-search-button-dropmarker {
   padding: 6px 0px 5px 17px;
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
 }
diff --git a/mozilla/mail/base/skin/mailWindow1.css b/mozilla/mail/base/skin/mailWindow1.css
index 1713c0882bf..177e2ee2f98 100644
--- a/mozilla/mail/base/skin/mailWindow1.css
+++ b/mozilla/mail/base/skin/mailWindow1.css
@@ -991,18 +991,18 @@ treechildren::-moz-tree-cell-text(lc-black, selected) {
   color: grey;
 }
 
-#search-button {
+#quick-search-button  {
   margin-top: 1px;
   margin-bottom: 1px;
   margin-right: 2px;
 }
 
-.search-button-image {
+.quick-search-button-image {
   margin: 0px;
   list-style-image: url("chrome://messenger/skin/icons/Search-bar.png");
 }
 
-.search-button-dropmarker {
+.quick-search-button-dropmarker {
   margin-left: 12px;
   margin-top: 8px;
   list-style-image: url("chrome://messenger/skin/icons/search-arrow.gif");