Improve mbox format import: don't expect empty lines after each message

11 years ago · a8a50de4e3
parent e435d3b120
commit a8a50de4e3
1 changed files with 1 additions and 1 deletions
--- a/program/steps/mail/import.inc
+++ b/program/steps/mail/import.inc
@ -52,7 +52,7 @@ if (is_array($_FILES['_file'])) {
            fseek($fp, 0);
            while (($line = fgets($fp)) !== false) {
                // importing mbox file, split by From - lines
-                if (preg_match('/^From\s+-/', $line) && $lastline == '') {
+                if (preg_match('/^From\s+-/', $line) && ($lastline == '' || substr($lastline, -2) == '--')) {
                    if (!empty($message)) {
                        if ($RCMAIL->storage->save_message(null, rtrim($message))) {
                            $imported++;