From f22ea7ba1875863890b486db3e5f448f99c1debc Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 07 Oct 2010 04:52:05 -0400
Subject: [PATCH] - Support SMTP Delivery Status Notifications - RFC3461 (#1486142)

---
 program/include/rcube_message.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index dfccb36..fd42e4a 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -399,9 +399,9 @@
                     if ($part_orig_mimetype == 'message/rfc822' && !empty($mail_part->filename))
                         $this->attachments[] = $mail_part;
                 }
-                // part text/[plain|html] OR message/delivery-status
+                // part text/[plain|html] or delivery status
                 else if ((($part_mimetype == 'text/plain' || $part_mimetype == 'text/html') && $mail_part->disposition != 'attachment') ||
-                    $part_mimetype == 'message/delivery-status' || $part_mimetype == 'message/disposition-notification'
+                    in_array($part_mimetype, array('message/delivery-status', 'text/rfc822-headers', 'message/disposition-notification'))
                 ) {
                     // Allow plugins to handle also this part
                     $plugin = $this->app->plugins->exec_hook('message_part_structure',

--
Gitblit v1.9.1