diff --git a/webui/config.php b/webui/config.php
index 4267cb7d..5a0a42ae 100644
--- a/webui/config.php
+++ b/webui/config.php
@@ -47,6 +47,8 @@ $config['DEMO_MODE'] = 0;
 
 $config['SHOW_MENU_FOR_OUTLOOK'] = 0;
 
+$config['SEARCH_QUERY_QUOTING'] = 0;
+
 $config['TIMEZONE'] = 'Europe/Budapest';
 
 $config['PROVIDED_BY'] = 'www.mailpiler.org';
@@ -164,7 +166,7 @@ $config['MAX_SEARCH_HITS'] = 1000;
 $config['DEFAULT_RETENTION'] = 0;
 
 $config['LOCALHOST'] = '127.0.0.1';
-$config['PILER_HOST'] = '1.2.3.4';
+$config['PILER_HOST'] = '127.0.0.1';
 $config['PILER_PORT'] = 25;
 $config['SMARTHOST'] = '127.0.0.1';
 $config['SMARTHOST_PORT'] = 10026;
diff --git a/webui/model/search/search.php b/webui/model/search/search.php
index 74f90ed8..f4d15621 100644
--- a/webui/model/search/search.php
+++ b/webui/model/search/search.php
@@ -166,6 +166,24 @@ class ModelSearchSearch extends Model {
          $i++; 
       }
 
+      if(SEARCH_QUERY_QUOTING == 1) {
+         $quoting = 0;
+
+         for($i=2; $i<count($data['match']); $i++) {
+            if(preg_match("/^\"/", $data['match'][$i])) {
+               $quoting = 1;
+            }
+
+            if($quoting == 0) {
+               $data['match'][$i] = '"' . $data['match'][$i] . '"';
+            }
+
+            if(preg_match("/\"$/", $data['match'][$i])) {
+               $quoting = 0;
+            }
+         }
+      }
+
       $match = implode(" ", $data['match']);
 
       if($emailfilter) {