diff --git a/CHANGELOG b/CHANGELOG
index a23a22115..a0cab461d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2006/05/01
+----------
+- Pimped search function
 - Applied prev/next patch by Leonard Bouchet
 - Applied patches by Mark Bucciarelli
 - Applied patch for requesting receipts by Salvatore Ansani
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index 5450f07e7..30e6eb8d2 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -55,7 +55,7 @@ class rcube_imap
   var $default_folders = array('inbox', 'drafts', 'sent', 'junk', 'trash');
   var $cache = array();
   var $cache_keys = array();  
-  var $cache_changes = array();  
+  var $cache_changes = array();
   var $uid_id_map = array();
   var $msg_headers = array();
   var $capabilities = array();
@@ -856,7 +856,7 @@ class rcube_imap
     $mailbox = $mbox ? $this->_mod_mailbox($mbox) : $this->mailbox;
     if ($str && $criteria)
       {
-      $criteria .= " \"$str\"";
+      $criteria .= ' CHARSET UTF-8 "'.UTF7EncodeString($str).'"';
       return $this->_search_index($mailbox, $criteria);
       }
     else
diff --git a/skins/default/images/icons/reset.gif b/skins/default/images/icons/reset.gif
index 1bdbc5b2a..a9a53d569 100644
Binary files a/skins/default/images/icons/reset.gif and b/skins/default/images/icons/reset.gif differ
diff --git a/skins/default/images/searchfield.gif b/skins/default/images/searchfield.gif
new file mode 100644
index 000000000..b1dc9389e
Binary files /dev/null and b/skins/default/images/searchfield.gif differ
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 8cfb954b1..6d1d221ee 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -468,15 +468,18 @@ body.messagelist
   position: absolute;
   top: 60px;
   right: 40px;
-  width: 200px;
+  width: 182px;
   height: 20px;
   text-align: right;
+  background: url('images/searchfield.gif') top left no-repeat;
 }
 
 #quicksearchbar a
 {
+  position: absolute;
+  top: 3px;
+  right: 4px;
   text-decoration: none;
-  padding-left: 5px;
 }
 
 #quicksearchbar img
@@ -486,11 +489,23 @@ body.messagelist
 
 #quicksearchbox
 {
-  width: 150px;
-  border: 1px solid #999999;
+  position: absolute;
+  top: 2px;
+  left: 20px;
+  width: 140px;
+  font-size: 11px;
+  padding: 0px;
+  border: none;
 }
 
 
+/*\*/
+html>body*#quicksearchbar { background-image: none; }
+html>body*#quicksearchbar a { top: 5px; }
+html>body*#quicksearchbar #quicksearchbox { width: 180px; top:0px; right: 1px; left: auto; }
+/**/
+
+
 #rcversion
 {
   position: absolute;
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 7cb7efc12..e866baa07 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -20,7 +20,7 @@
 </div>
 
 <div id="quicksearchbar">
-<roundcube:object name="searchform" id="quicksearchbox" /><roundcube:button command="reset-search" image="/images/icons/reset.gif" title="resetsearch" />
+<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
 </div>
 
 <div id="messagecountbar">