diff --git a/skins/default/mail.css b/skins/default/mail.css
index 6bbbd1022..d19de3ebe 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -8,6 +8,7 @@
   left: 200px;
   right: 200px;
   height: 35px;
+  min-width: 650px;
   white-space: nowrap;
 /*  border: 1px solid #cccccc; */
 }
@@ -300,10 +301,10 @@ ul.toolbarmenu li.separator_above
 
 #searchfilter
 {
+  white-space: nowrap;
   position: absolute;
-  right: 18px;
-  top: 8px;
-  text-align: right;
+  right: 190px;
+  vertical-align: middle;
 }
 
 #searchfilter label
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 9d24f4cec..ebdf9f8d2 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -129,10 +129,6 @@
 
 <roundcube:include file="/includes/messagemenu.html" />
 
-<div id="searchfilter">
-  <label for="rcmlistfilter"><roundcube:label name="filter" /></label>:
-  <roundcube:object name="searchfilter" class="searchfilter" />
-</div>
 </div>
 
 <div id="searchmenu">
@@ -147,6 +143,10 @@
 </div>
 
 <div id="quicksearchbar">
+<div id="searchfilter">
+  <label for="rcmlistfilter"><roundcube:label name="filter" /></label>:
+  <roundcube:object name="searchfilter" class="searchfilter" />
+</div>
 <roundcube:button name="searchmod" id="searchmod" image="/images/icons/glass_roll.png" onclick="rcmail_ui.show_searchmenu();return false" title="searchmod" />
 <roundcube:object name="searchform" id="quicksearchbox" />
 <roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />