summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcube_message.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-10-07 08:52:05 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-10-07 08:52:05 +0000
commit203ab3071d1f7fbbd7a75934e0d588395916affc (patch)
treefc864cd114ec93687f2c7e8e1cd259f7a92e5f29 /roundcubemail/program/include/rcube_message.php
parentaa1cc39566e4737963083587ac0b262a1a08c11c (diff)
- Support SMTP Delivery Status Notifications - RFC3461 (#1486142)
git-svn-id: https://svn.roundcube.net/trunk@4059 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcube_message.php')
-rw-r--r--roundcubemail/program/include/rcube_message.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php
index dfccb36e9..fd42e4ad4 100644
--- a/roundcubemail/program/include/rcube_message.php
+++ b/roundcubemail/program/include/rcube_message.php
@@ -399,9 +399,9 @@ class rcube_message
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',