5 files changed, 27 insertions, 11 deletions
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index dd85154a1..e52f76afa 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -121,8 +121,9 @@ $labels['select'] = 'Auswählen';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
 $labels['unread'] = 'Ungelesene';
-$labels['flagged'] = 'Markiert';
-$labels['unanswered'] = 'Unbeantwortet';
+$labels['flagged'] = 'Markierte';
+$labels['unanswered'] = 'Unbeantwortete';
+$labels['filter'] = 'Filter';
 $labels['compact'] = 'Packen';
 $labels['empty'] = 'Leeren';
 $labels['purge'] = 'Aufräumen';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 9ec8670e8..528d0c3f5 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -120,8 +120,9 @@ $labels['select'] = 'Auswählen';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
 $labels['unread'] = 'Ungelesene';
-$labels['flagged'] = 'Markiert';
-$labels['unanswered'] = 'Unbeantwortet';
+$labels['flagged'] = 'Markierte';
+$labels['unanswered'] = 'Unbeantwortete';
+$labels['filter'] = 'Filter';
 $labels['compact'] = 'Packen';
 $labels['empty'] = 'Leeren';
 $labels['purge'] = 'Bereinigen';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 8cff8a52b..7614b9af7 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -149,6 +149,7 @@ $labels['none'] = 'None';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['filter'] = 'Filter';
 
 $labels['compact'] = 'Compact';
 $labels['empty'] = 'Empty';
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 2f98c8b81..4dfc86479 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -24,12 +24,6 @@
   color: #333333;
 }
 
-#messagetoolbar select.searchfilter
-{
-  position: relative;
-  bottom: 10px;
-}
-
 #messagetoolbar select.mboxlist
 {
   position: absolute;
@@ -91,6 +85,20 @@ ul.toolbarmenu li a.active:hover
   background-color: #ddd;
 }
 
+#searchfilter
+{
+  position: absolute;
+  right: 18px;
+  bottom: 7px;
+  width: 240px;
+  text-align: right;
+}
+
+#searchfilter label
+{
+  font-size: 11px;
+}
+
 #listcontrols a,
 #listcontrols a:active,
 #listcontrols a:visited,
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 34f4254b7..eed853a92 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -119,7 +119,6 @@
 <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">
@@ -129,6 +128,12 @@
     <li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="active" /></li>
   </ul>
 </div>
+
+<div id="searchfilter">
+  <label for="rcmcomposepriority"><roundcube:label name="filter" />:
+  <roundcube:object name="searchfilter" class="searchfilter" />
+  </label>
+</div>
 </div>
 
 <div id="quicksearchbar">