diff --git a/include/api.tickets.php b/include/api.tickets.php
index 81211387a0ae501c6e8d586a536bf44c3c9c99d4..e2ee066aefff68921a26dc4bfbd28b62008b7a8e 100644
--- a/include/api.tickets.php
+++ b/include/api.tickets.php
@@ -41,7 +41,7 @@ class TicketApiController extends ApiController {
             $supported = array_merge($supported, array('header', 'mid',
                 'emailId', 'to-email-id', 'ticketId', 'reply-to', 'reply-to-name',
                 'in-reply-to', 'references', 'thread-type',
-                'flags' => array('bounce', 'auto-reply', 'spam', 'viral'),
+                'mailflags' => array('bounce', 'auto-reply', 'spam', 'viral'),
                 'recipients' => array('*' => array('name', 'email', 'source'))
                 ));
 
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 0d608cdde7283bad4fdeec31a9bd102fa0636907..0887ec7c9ce059cd7b3d71256a4c50323575ce05 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -660,7 +660,7 @@ class MailFetcher {
         $vars['subject'] = $mailinfo['subject'] ?: '[No Subject]';
         $vars['emailId'] = $mailinfo['emailId'] ?: $this->getEmailId();
         $vars['to-email-id'] = $mailinfo['emailId'] ?: 0;
-        $vars['flags'] = new ArrayObject();
+        $vars['mailflags'] = new ArrayObject();
 
         if ($this->isBounceNotice($mid)) {
             // Fetch the original References and assign to 'references'
@@ -671,11 +671,11 @@ class MailFetcher {
             // Fetch deliver status report
             $vars['message'] = $this->getDeliveryStatusMessage($mid) ?: $this->getBody($mid);
             $vars['thread-type'] = 'N';
-            $vars['flags']['bounce'] = true;
+            $vars['mailflags']['bounce'] = true;
         }
         else {
             $vars['message'] = $this->getBody($mid);
-            $vars['flags']['bounce'] = TicketFilter::isBounce($info);
+            $vars['mailflags']['bounce'] = TicketFilter::isBounce($info);
         }
 
 
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index 8d0f237fd4127fc8210fb3432d935a1ed1b0b44d..ab69f8ce2f10a97aed0bcdb2d821ddc662691dfe 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -608,7 +608,7 @@ class EmailDataParser {
         $data['header'] = $parser->getHeader();
         $data['mid'] = $parser->getMessageId();
         $data['priorityId'] = $parser->getPriority();
-        $data['flags'] = new ArrayObject();
+        $data['mailflags'] = new ArrayObject();
 
         //FROM address: who sent the email.
         if(($fromlist = $parser->getFromAddressList())) {
@@ -699,14 +699,14 @@ class EmailDataParser {
             // Fetch deliver status report
             $data['message'] = $parser->getDeliveryStatusMessage() ?: $parser->getBody();
             $data['thread-type'] = 'N';
-            $data['flags']['bounce'] = true;
+            $data['mailflags']['bounce'] = true;
         }
         else {
             // Typical email
             $data['message'] = $parser->getBody();
             $data['in-reply-to'] = @$parser->struct->headers['in-reply-to'];
             $data['references'] = @$parser->struct->headers['references'];
-            $data['flags']['bounce'] = TicketFilter::isBounce($data['header']);
+            $data['mailflags']['bounce'] = TicketFilter::isBounce($data['header']);
         }
 
         $data['to-email-id'] = $data['emailId'];
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 9e9b50fce29ec73ea383be9099d9036c421246ca..6a36a70ffe73807430c17ecd7d84453acc5db7f5 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -2136,8 +2136,8 @@ implements RestrictedAccess, Threadable {
             return $message; //Our work is done...
 
         // Do not auto-respond to bounces and other auto-replies
-        $autorespond = isset($vars['flags'])
-            ? !$vars['flags']['bounce'] && !$vars['flags']['auto-reply']
+        $autorespond = isset($vars['mailflags'])
+            ? !$vars['mailflags']['bounce'] && !$vars['mailflags']['auto-reply']
             : true;
         if ($autorespond && $message->isAutoReply())
             $autorespond = false;
@@ -2406,9 +2406,9 @@ implements RestrictedAccess, Threadable {
             return null;
 
         $alert = $alert && (
-            isset($vars['flags'])
+            isset($vars['mailflags'])
             // No alerts for bounce and auto-reply emails
-            ? !$vars['flags']['bounce'] && !$vars['flags']['auto-reply']
+            ? !$vars['mailflags']['bounce'] && !$vars['mailflags']['auto-reply']
             : true
         );
 
@@ -3241,7 +3241,7 @@ implements RestrictedAccess, Threadable {
 
         # Messages that are clearly auto-responses from email systems should
         # not have a return 'ping' message
-        if (isset($vars['flags']) && $vars['flags']['bounce'])
+        if (isset($vars['mailflags']) && $vars['mailflags']['bounce'])
             $autorespond = false;
         if ($autorespond && $message instanceof ThreadEntry && $message->isAutoReply())
             $autorespond = false;