diff --git a/include/class.filter.php b/include/class.filter.php
index 993b7971213aaaa509b577e7b49633e9aba1e20e..f70a64d30fcd4b0c35a8fff4bcd71f3cb0387e44 100644
--- a/include/class.filter.php
+++ b/include/class.filter.php
@@ -26,6 +26,7 @@ class Filter {
         'Email Meta-Data' => array(
             'reply-to'  => 'Reply-To Email',
             'reply-to-name' => 'Reply-To Name',
+            'addressee' => 'Addressee (To and Cc)',
         ),
     );
 
@@ -693,6 +694,13 @@ class TicketFilter {
             if (in_array($k, $interest))
                 $this->vars[$k] = trim($v);
         }
+        if (isset($vars['recipients'])) {
+            foreach ($vars['recipients'] as $r) {
+                $this->vars['addressee'][] = $r['name'];
+                $this->vars['addressee'][] = $r['email'];
+            }
+            $this->vars['addressee'] = implode(' ', $this->vars['addressee']);
+        }
 
          //Init filters.
         $this->build();
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 9c4afe9b4005e4a3844c6b536473ff9718a5eb69..36996e950d569b7ad48bfa8ebfadf20cf7979cec 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -306,7 +306,6 @@ class MailFetcher {
 
         //BCCed?
         if(!$header['emailId']) {
-            unset($header['recipients']); //Nuke the recipients - we were bcced
             if ($headerinfo->bcc) {
                 foreach($headerinfo->bcc as $addr)
                     if (($header['emailId'] = Email::getIdByEmail(strtolower($addr->mailbox).'@'.$addr->host)))
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index e9f83de4d8d1427d68a00365909cd0af07c67e46..3a49a66b5dd3398142458a229781d75f50505b0f 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -466,7 +466,6 @@ class EmailDataParser {
 
         //maybe we got BCC'ed??
         if(!$data['emailId']) {
-            unset($data['recipients']);
             $emailId =  0;
             if($bcc = $parser->getBccAddressList()) {
                 foreach ($bcc as $addr)