diff --git a/webui/model/search/message.php b/webui/model/search/message.php
index 6354568e..4c42bd5c 100644
--- a/webui/model/search/message.php
+++ b/webui/model/search/message.php
@@ -62,7 +62,7 @@ class ModelSearchMessage extends Model {
       $s = substr($data, 0, 4096);
       $s = preg_replace("/(\r|\n)/", "", $s);
 
-      if(!preg_replace("/\s/", $s)) {
+      if(!preg_match("/\s/", $s)) {
          return base64_decode(preg_replace("/\s/", "", $data));
       }
 
diff --git a/webui/view/theme/default/templates/common/layout-audit.tpl b/webui/view/theme/default/templates/common/layout-audit.tpl
index 6d9e1a91..7fe96426 100644
--- a/webui/view/theme/default/templates/common/layout-audit.tpl
+++ b/webui/view/theme/default/templates/common/layout-audit.tpl
@@ -37,7 +37,7 @@
          <input type="hidden" name="sort" id="sort" value="date" />
          <input type="hidden" name="order" id="order" value="0" />
 
-         <input type="text" id="_search" name="_search" class="advtextgrey" value="" placeholder="<?php print $text_enter_search_terms; ?>" />
+         <input type="text" id="_search" name="_search" class="advtextgrey" value="" placeholder="<?php print $text_enter_search_terms; ?>" onclick="Piler.toggle_search_class();" />
 
          <button id="button_search" class="active" onclick="Piler.auditexpert(this);"><?php print $text_search; ?></button>
          <input type="button" class="advsecondary" onclick="Piler.cancel();" value="<?php print $text_cancel; ?>" />
diff --git a/webui/view/theme/default/templates/common/layout-search.tpl b/webui/view/theme/default/templates/common/layout-search.tpl
index e0163f0e..29f1f373 100644
--- a/webui/view/theme/default/templates/common/layout-search.tpl
+++ b/webui/view/theme/default/templates/common/layout-search.tpl
@@ -39,7 +39,7 @@
          <input type="hidden" name="ref" id="ref" value="" />
          <input type="hidden" name="prefix" id="prefix" value="" />
 
-         <input type="text" id="_search" name="_search" class="advtextgrey" value="" placeholder="<?php print $text_enter_search_terms; ?>" />
+         <input type="text" id="_search" name="_search" class="advtextgrey" value="" placeholder="<?php print $text_enter_search_terms; ?>" onclick="Piler.toggle_search_class();" />
 
          <div class="aoo" onclick="$('#searchpopup1').show();">
             <div class="aoq"></div>