diff --git a/mozilla/mail/components/addrbook/content/abContactsPanel.xul b/mozilla/mail/components/addrbook/content/abContactsPanel.xul
index 51b21e1cf2a..94c0da953fd 100644
--- a/mozilla/mail/components/addrbook/content/abContactsPanel.xul
+++ b/mozilla/mail/components/addrbook/content/abContactsPanel.xul
@@ -93,7 +93,15 @@
 
     <vbox>      
 	    <label value="&searchInput.label;"/> 
-	    <textbox id="searchInput" flex="1"  oninput="onAbSearchInput(false);"  onkeypress="onAbSearchKeyPress(event);"/>
+      <textbox id="searchInput" flex="1" onfocus="onSearchInputFocus(event);" onblur="onSearchInputBlur(event);" 
+               onclick="this.select();" oninput="onAbSearchInput(false);"
+               onkeypress="onAbSearchKeyPress(event);">
+        <button id="quick-search-button" type="menu">
+          <menupopup id="quick-search-menupopup" value="0" persist="value" popupalign="topleft" popupanchor="bottomleft">
+            <menuitem value="0" label="&SearchNameOrEmail.label;" type="radio"/>
+          </menupopup>
+        </button>
+      </textbox>
 	  </vbox>
 
     <separator class="thin"/> 
diff --git a/mozilla/mail/locales/en-US/chrome/messenger/addressbook/abContactsPanel.dtd b/mozilla/mail/locales/en-US/chrome/messenger/addressbook/abContactsPanel.dtd
index defdaf88eb6..cde910b07fd 100644
--- a/mozilla/mail/locales/en-US/chrome/messenger/addressbook/abContactsPanel.dtd
+++ b/mozilla/mail/locales/en-US/chrome/messenger/addressbook/abContactsPanel.dtd
@@ -1,6 +1,7 @@
 
 <!ENTITY addressbookPicker.label            "Address Book:">
 <!ENTITY searchInput.label                  "Search For:">
+<!ENTITY SearchNameOrEmail.label            "Name or Email">
 
 <!ENTITY addtoToFieldMenu.label             "Add to To field">
 <!ENTITY addtoCcFieldMenu.label             "Add to Cc field">