Index: kmail/kmmainwidget.cpp
===================================================================
--- kmail/kmmainwidget.cpp
+++ kmail/kmmainwidget.cpp
@@ -3307,7 +3307,7 @@
     }
 
     {
-        mHideShowSearchBarAction = new QAction(i18n("Search button"), this);
+        mHideShowSearchBarAction = new QAction(i18n("Search"), this);
         actionCollection()->addAction(QStringLiteral("search_button"), mHideShowSearchBarAction);
         mHideShowSearchBarAction->setIcon(QIcon::fromTheme(QStringLiteral("go-search")));
         mHideShowSearchBarAction->setCheckable(true);
Index: kmail/kmmainwin.rc
===================================================================
--- kmail/kmmainwin.rc
+++ kmail/kmmainwin.rc
@@ -2,7 +2,7 @@
      the same menu entries at the same place in KMail and Kontact  -->
 
 <!DOCTYPE kpartgui>
-<kpartgui version="510" name="kmmainwin" translationDomain="kmail">
+<kpartgui version="511" name="kmmainwin" translationDomain="kmail">
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -311,6 +311,7 @@
   <Separator/>
   <ActionList name="toolbar_messagetag_actions" />
   <Action name="create_todo"/>
+  <Separator/>
   <Action name="search_button"/>
  </ToolBar>
 </kpartgui>