diff --git a/src/config.h b/src/config.h
index 769d3cd5..4cad217d 100644
--- a/src/config.h
+++ b/src/config.h
@@ -13,7 +13,7 @@
 
 #define VERSION "0.1.22"
 
-#define BUILD 729
+#define BUILD 731
 
 #define HOSTID "mailarchiver"
 
diff --git a/src/parser_utils.c b/src/parser_utils.c
index 35c52f7b..56cd2f28 100644
--- a/src/parser_utils.c
+++ b/src/parser_utils.c
@@ -512,6 +512,8 @@ void translateLine(unsigned char *p, struct _state *state){
 
       if( (state->message_state == MSG_RECEIVED || state->message_state == MSG_FROM || state->message_state == MSG_TO || state->message_state == MSG_CC || state->message_state == MSG_RECIPIENT) && *p == '@'){ continue; }
 
+      if( (state->message_state == MSG_FROM || state->message_state == MSG_TO || state->message_state == MSG_CC || state->message_state == MSG_RECIPIENT) && *p == '_'){ continue; }
+
       if(state->message_state == MSG_SUBJECT && (*p == '%' || *p == '_' || *p == '&') ){ continue; }
 
       if(state->message_state == MSG_CONTENT_TYPE && *p == '_' ){ continue; }
diff --git a/webui/model/search/search.php b/webui/model/search/search.php
index 220472d6..a716299d 100644
--- a/webui/model/search/search.php
+++ b/webui/model/search/search.php
@@ -646,7 +646,7 @@ class ModelSearchSearch extends Model {
 
    private function fix_email_address_for_sphinx($email = '') {
       $email = preg_replace("/\|@/", "|", $email);
-      return preg_replace("/[\@\.\+\-]/", "X", $email);
+      return preg_replace("/[\@\.\+\-\_]/", "X", $email);
    }