From 3e48b941ec02597733af08bc3617dc7bfaa35d81 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 21 May 2011 10:29:47 +0000
Subject: Removed kolab plugins; they will be maintaied and published in the
 Kolab project

---
 CHANGELOG        | 1 +
 bin/msgimport.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4958bf8ef..bab451de2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ CHANGELOG Roundcube Webmail
 - Added general rcube_cache class with Memcache and APC support
 - Improved caching performance by skipping writes of unchanged data
 - Option enable_caching replaced by imap_cache and messages_cache options
+- Fix WORKFAX saving in address book (#1487910)
 - Add forward-as-attachment feature
 - jQuery-1.6.1 (#1487913, #1487144)
 - Improve display name composition when saving contacts (#1487143)
diff --git a/bin/msgimport.sh b/bin/msgimport.sh
index 74dc81617..845c585e1 100755
--- a/bin/msgimport.sh
+++ b/bin/msgimport.sh
@@ -79,7 +79,7 @@ if ($IMAP->connect($host, $args['user'], $args['pass'], $imap_port, $imap_ssl))
 	$fp = fopen($args['file'], 'r');
 	while (($line = fgets($fp)) !== false)
 	{
-		if (preg_match('/^From\s+/', $line) && $lastline == '')
+		if (preg_match('/^From\s+-/', $line) && $lastline == '')
 		{
 			if (!empty($message))
 			{
-- 
cgit v1.2.3