diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index d8791453749..893e1ad2086 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -1555,10 +1555,13 @@ Rights Reserved.
 </toolbox>
 
 <hbox id="searchBox" persist="collapsed" align="center">
-  <label id="searchCriteria" value="&SearchSubjectOrSender.label;"/>
+  <label id="searchCriteria" value="&SearchSubjectOrSender.label;" control="searchInput" 
+         accesskey="&SearchSubjectOrSender.accesskey;"/>
   <textbox id="searchInput" flex="1" onfocus="this.select();" oninput="onSearchInput(false);" onkeypress="onSearchKeyPress(event);"/>
-  <button id="clearButton" label="&clearButton.label;" disabled="true" tooltiptext="&clearButton.tooltip;" oncommand="onClearSearch();" accesskey="&clearButton.accesskey;"/>
-  <button id="advancedButton" label="&advancedButton.label;" tooltiptext="&advancedButton.tooltip;" oncommand="onAdvancedSearch();"/>
+  <button id="clearButton" label="&clearButton.label;" disabled="true" tooltiptext="&clearButton.tooltip;" oncommand="onClearSearch();" 
+          accesskey="&clearButton.accesskey;"/>
+  <button id="advancedButton" label="&advancedButton.label;" tooltiptext="&advancedButton.tooltip;" oncommand="onAdvancedSearch();"
+          accesskey="&advancedButton.accesskey;"/>
 </hbox>
 
 <statusbar class="chromeclass-status" id="status-bar"> 
diff --git a/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd b/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd
index b4fca60a6be..d6dc9bfad0a 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd
+++ b/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd
@@ -485,8 +485,11 @@ Rights Reserved.
 <!---SearchBar-->
 <!-- also used by addressbook -->
 <!ENTITY SearchSubjectOrSender.label "Subject or Sender contains:">
+<!ENTITY SearchSubjectOrSender.accesskey "S">
 <!ENTITY SearchNameOrEmail.label "Name or Email contains:">
 <!ENTITY advancedButton.label "Advanced...">
+<!ENTITY advancedButton.accesskey "A">
+
 <!ENTITY clearButton.label "Clear">
 <!ENTITY clearButton.accesskey "C">