diff --git a/webui/config.php b/webui/config.php
index 00b84764..8ad096a7 100644
--- a/webui/config.php
+++ b/webui/config.php
@@ -212,6 +212,7 @@ $config['DN_MAX_LEN'] = 255;
 $config['USE_EMAIL_AS_USERNAME'] = 1;
 $config['LDAP_IMPORT_MINIMUM_NUMBER_OF_USERS_TO_HEALTH_OK'] = 100;
 
+$config['HEADER_LINE_TO_HIDE'] = 'X-Envelope-To:';
 
 $config['PILER_LOGIN_HELPER_PLACEHOLDER'] = 'PILER_COMMENT_FOR_PROPER_LOGIN_SO_THIS_CAN_BE_ANYTHING_JUST_BE_IT_SOMETHING_LIKE_A_UNIQUE_VALUE';
 
diff --git a/webui/model/search/message.php b/webui/model/search/message.php
index 5660870f..f825a751 100644
--- a/webui/model/search/message.php
+++ b/webui/model/search/message.php
@@ -189,6 +189,10 @@ class ModelSearchMessage extends Model {
 
       $has_journal = $this->remove_journal($msg);
 
+      if(Registry::get('auditor_user') == 0 && HEADER_LINE_TO_HIDE) {
+         $msg = preg_replace("/" . HEADER_LINE_TO_HIDE . ".{1,}\n/i", "", $msg);
+      }
+
       $pos = strpos($msg, "\n\r\n");
       if($pos == false) {
          $pos = strpos($msg, "\n\n");