diff --git a/webui/model/search/message.php b/webui/model/search/message.php
index 6c802877..0cd5cd09 100644
--- a/webui/model/search/message.php
+++ b/webui/model/search/message.php
@@ -371,11 +371,15 @@ class ModelSearchMessage extends Model {
 
 
    private function highlight_search_terms($s = '', $terms = array()) {
+      $terms = preg_replace("/(\'|\")/", "", $terms);
+
       $terms = explode(" ", $terms);
 
       if(count($terms) <= 0) { return $s; }
 
       while(list($k, $v) = each($terms)) {
+         if($v == '') { continue; }
+
          $s = preg_replace("/$v/i", "<span class=\"message_highlight\">$v</span>", $s);
       }