summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-03-25 19:28:43 +0100
committerThomas Bruederli <thomas@roundcube.net>2014-03-31 11:10:21 +0200
commit3138879ddb3603c8aa60ad2e772de4addfe54cad (patch)
treed1f7a98996bd553dbb61337d97adf3088a980ca6
parent677fb747c122d84a35654873b00b4a87670dcd33 (diff)
Improve mbox format import: don't expect empty lines after each message
-rw-r--r--program/steps/mail/import.inc2
1 files changed, 1 insertions, 1 deletions
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++;