From a8a50de4e3a3f83180c32815a965732fd8171088 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 25 Mar 2014 19:28:43 +0100
Subject: [PATCH] Improve mbox format import: don't expect empty lines after
 each message

---
 program/steps/mail/import.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/program/steps/mail/import.inc b/program/steps/mail/import.inc
index 5a74feb9f..217927537 100644
--- 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++;