3 files changed, 32 insertions, 1 deletions
diff --git a/skins/default/images/icons/reset.gif b/skins/default/images/icons/reset.gif
new file mode 100644
index 000000000..1bdbc5b2a
--- /dev/null
+++ b/skins/default/images/icons/reset.gif
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 9a604b472..1f781ba5e 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -82,7 +82,7 @@
 #messagecountbar
 {
   position: absolute;
-  top: 60px;
+  bottom: 16px;
   right: 40px;
   width: 300px;
   height: 20px;
@@ -457,6 +457,33 @@ body.messagelist
   color: #CCCCCC;
 }
 
+#quicksearchbar
+{
+  position: absolute;
+  top: 60px;
+  right: 40px;
+  width: 200px;
+  height: 20px;
+  text-align: right;
+}
+
+#quicksearchbar a
+{
+  text-decoration: none;
+  padding-left: 5px;
+}
+
+#quicksearchbar img
+{
+  vertical-align: middle;
+}
+
+#quicksearchbox
+{
+  width: 150px;
+  border: 1px solid #999999;
+}
+
 
 /** message view styles */
 
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 224668e66..7e5d4474d 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -19,6 +19,10 @@
 <roundcube:button command="print" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
 </div>
 
+<div id="quicksearchbar">
+<roundcube:object name="searchform" id="quicksearchbox" /><roundcube:button command="reset-search" image="/images/icons/reset.gif" title="resetsearch" />
+</div>
+
 <div id="messagecountbar">
 <roundcube:button command="previouspage" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
 &nbsp;<roundcube:object name="messageCountDisplay" />&nbsp;