Use Delivered-To header as a last resort for identity selection (#1488840)

Aleksander Machniak

2012-11-28 30cc01f89daea932d15a1a505d25b543913664ac

 program/lib/Roundcube/rcube_imap_generic.php

@@ -2206,10 +2206,13 @@
                            }
                            break;
                        default:
                            if (strlen($field) > 2) {
                                $result[$id]->others[$field] = $string;
                            }
                            if (strlen($field) < 3) {
                            break;
                            }
                            if ($result[$id]->others[$field]) {
                                $string = array_merge((array)$result[$id]->others[$field], (array)$string);
                            }
                            $result[$id]->others[$field] = $string;
                        }
                    }
                }
@@ -2217,7 +2220,6 @@

            // VANISHED response (QRESYNC RFC5162)
            // Sample: * VANISHED (EARLIER) 300:310,405,411

            else if (preg_match('/^\* VANISHED [()EARLIER]*/i', $line, $match)) {
                $line   = substr($line, strlen($match[0]));
                $v_data = $this->tokenizeResponse($line, 1);