diff --git a/src/ui/searchwindow.ui b/src/ui/searchwindow.ui
index 2f95f6fd4..b58b994e8 100644
--- a/src/ui/searchwindow.ui
+++ b/src/ui/searchwindow.ui
@@ -1,262 +1,262 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SearchWindow</class>
  <widget class="QWidget" name="SearchWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>774</width>
     <height>637</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QRadioButton" name="mChkbxAllFolders">
      <property name="text">
       <string>Search in &amp;all folders</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QRadioButton" name="mChkbxSpecificFolders">
        <property name="text">
         <string>Search &amp;only in:</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="MailCommon::FolderRequester" name="mCbxFolders" native="true"/>
      </item>
      <item>
       <widget class="QCheckBox" name="mChkSubFolders">
        <property name="text">
         <string>&amp;Include sub-folders</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="2" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
       <widget class="QRadioButton" name="mChkMultiFolders">
        <property name="text">
         <string>Select specific folders:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="selectMultipleFolders">
        <property name="text">
-        <string>Select folders...</string>
+        <string>Select Folders...</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item row="3" column="0">
     <widget class="Line" name="line_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="KMail::KMailSearchPatternEdit" name="mPatternEdit" native="true"/>
    </item>
    <item row="5" column="0">
     <widget class="Akonadi::EntityTreeView" name="mLbxMatches">
      <property name="contextMenuPolicy">
       <enum>Qt::CustomContextMenu</enum>
      </property>
      <property name="alternatingRowColors">
       <bool>true</bool>
      </property>
      <property name="selectionMode">
       <enum>QAbstractItemView::ExtendedSelection</enum>
      </property>
      <property name="rootIsDecorated">
       <bool>false</bool>
      </property>
      <property name="allColumnsShowFocus">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="6" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QLabel" name="mSearchFolderLbl">
        <property name="text">
         <string>Search folder &amp;name:</string>
        </property>
        <property name="buddy">
         <cstring>mSearchFolderEdt</cstring>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KLineEdit" name="mSearchFolderEdt">
        <property name="showClearButton" stdset="0">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="mSearchFolderOpenBtn">
        <property name="enabled">
         <bool>false</bool>
        </property>
        <property name="text">
         <string>Open &amp;Search Folder</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="mSearchResultOpenBtn">
        <property name="enabled">
         <bool>false</bool>
        </property>
        <property name="text">
         <string>Open &amp;Message</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="7" column="0">
     <widget class="Line" name="line">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item row="8" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <widget class="KPIM::ProgressIndicatorWidget" name="mProgressIndicator"/>
      </item>
      <item>
       <widget class="QLabel" name="mStatusLbl">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QDialogButtonBox" name="mButtonBox">
        <property name="standardButtons">
         <set>QDialogButtonBox::Close</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
    <class>Akonadi::EntityTreeView</class>
    <extends>QTreeView</extends>
    <header>AkonadiWidgets/entitytreeview.h</header>
   </customwidget>
   <customwidget>
    <class>MailCommon::FolderRequester</class>
    <extends>QWidget</extends>
    <header location="global">MailCommon/FolderRequester</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KPIM::ProgressIndicatorWidget</class>
    <extends>QLabel</extends>
    <header>Libkdepim/ProgressIndicatorWidget</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KMail::KMailSearchPatternEdit</class>
    <extends>QWidget</extends>
    <header>searchdialog/kmailsearchpatternedit.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>mChkbxAllFolders</tabstop>
   <tabstop>mChkbxSpecificFolders</tabstop>
   <tabstop>mChkSubFolders</tabstop>
   <tabstop>mChkMultiFolders</tabstop>
   <tabstop>selectMultipleFolders</tabstop>
   <tabstop>mLbxMatches</tabstop>
   <tabstop>mSearchFolderEdt</tabstop>
   <tabstop>mSearchFolderOpenBtn</tabstop>
   <tabstop>mSearchResultOpenBtn</tabstop>
   <tabstop>mButtonBox</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
    <sender>mChkbxSpecificFolders</sender>
    <signal>toggled(bool)</signal>
    <receiver>mCbxFolders</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>101</x>
      <y>40</y>
     </hint>
     <hint type="destinationlabel">
      <x>329</x>
      <y>42</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>mChkbxSpecificFolders</sender>
    <signal>toggled(bool)</signal>
    <receiver>mChkSubFolders</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>78</x>
      <y>43</y>
     </hint>
     <hint type="destinationlabel">
      <x>544</x>
      <y>47</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>