fetch: Consider all delivered-to headers

include/class.mailfetch.php

@@ -292,7 +292,8 @@ class MailFetcher {
 
         //Add delivered-to address to list.
         if (stripos($header['header'], 'delivered-to:') !==false
-                && ($dt = Mail_Parse::findHeaderEntry($header['header'], 'delivered-to'))) {
+                && ($dt = Mail_Parse::findHeaderEntry($header['header'],
+                     'delivered-to', true))) {
             if (($delivered_to = Mail_Parse::parseAddressList($dt)))
                 $tolist['delivered-to'] = $delivered_to;
         }

include/class.mailparse.php

@@ -140,9 +140,9 @@ class Mail_Parse {
     }
 
     /* static */
-    function findHeaderEntry($headers, $name) {
+    function findHeaderEntry($headers, $name, $allEntries=false) {
         if (!is_array($headers))
-            $headers = self::splitHeaders($headers);
+            $headers = self::splitHeaders($headers, $allEntries);
         foreach ($headers as $key=>$val)
             if (strcasecmp($key, $name) === 0)
                 return $val;