3 files changed, 10 insertions, 3 deletions
diff --git a/skins/default/common.css b/skins/default/common.css
index 2029bf794..1225862f1 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -328,7 +328,7 @@ table.records-table tr.unfocused td
 #quicksearchbar
 {
   position: absolute;
-  top: 60px;
+  top: 55px;
   right: 20px;
   width: 182px;
   height: 20px;
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 474a77fc3..5189f6d3f 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -4,7 +4,7 @@
 #messagetoolbar
 {
   position: absolute;
-  top: 45px;
+  top: 47px;
   left: 200px;
   right: 200px;
   height: 35px;
@@ -24,11 +24,17 @@
   color: #333333;
 }
 
+#messagetoolbar select.searchfilter
+{
+  position: relative;
+  bottom: 10px;
+}
+
 #messagetoolbar select.mboxlist
 {
   position: absolute;
   left: 375px;
-  top: 10px;
+  top: 8px;
 }
 
 #messagetoolbar select.mboxlist option
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 43ff43bb3..51e1b1f11 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -118,6 +118,7 @@
 <roundcube:button command="forward" imageSel="/images/buttons/forward_sel.png" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
 <roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
 <roundcube:button command="print" imageSel="/images/buttons/print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
+<roundcube:object name="searchfilter" id="searchfilter" class="searchfilter" />
 
 <div id="markmessagemenu">
   <ul class="toolbarmenu">