diff options
author | Thomas Bruederli <thomas@roundcube.net> | 2013-01-18 21:49:51 +0100 |
---|---|---|
committer | Thomas Bruederli <thomas@roundcube.net> | 2013-01-18 21:49:51 +0100 |
commit | 7ae7cdf195f4a8b0449c9ab0d5f43f68a60efa76 (patch) | |
tree | 88ac7e81a50ec7f5479a825de4d08d70bd5a78d3 | |
parent | 6d41d8fd4bbd3f8854669fbf2fc5a4910803125a (diff) |
Don't rely on Subject header only
-rw-r--r-- | program/lib/Roundcube/rcube_message.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php index b52b79b25..e0c3e3475 100644 --- a/program/lib/Roundcube/rcube_message.php +++ b/program/lib/Roundcube/rcube_message.php @@ -321,7 +321,7 @@ class rcube_message $mimetype = $structure->real_mimetype; // parse headers from message/rfc822 part - if (!isset($structure->headers['subject'])) { + if (!isset($structure->headers['subject']) && !isset($structure->headers['from'])) { list($headers, $dump) = explode("\r\n\r\n", $this->get_part_content($structure->mime_id, null, true, 8192)); $structure->headers = rcube_mime::parse_headers($headers); } @@ -330,7 +330,7 @@ class rcube_message $mimetype = $structure->mimetype; // show message headers - if ($recursive && is_array($structure->headers) && isset($structure->headers['subject'])) { + if ($recursive && is_array($structure->headers) && (isset($structure->headers['subject']) || isset($structure->headers['from']))) { $c = new stdClass; $c->type = 'headers'; $c->headers = $structure->headers; |