From 872d209bcdd80d379d575824cc1764e422fac219 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 14 Aug 2012 08:31:37 +0200
Subject: Fixed issue with DBMail bug
 [http://pear.php.net/bugs/bug.php?id=19077] (#1488594)

Conflicts:

	plugins/managesieve/Changelog
---
 plugins/managesieve/Changelog         | 2 ++
 plugins/managesieve/lib/Net/Sieve.php | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 855e80cea..c0ecc32de 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,3 +1,5 @@
+- Fixed issue with DBMail bug [http://pear.php.net/bugs/bug.php?id=19077] (#1488594)
+
 * version 5.0 [2012-01-05]
 -----------------------------------------------------------
 - Fixed setting test type to :is when none is specified
diff --git a/plugins/managesieve/lib/Net/Sieve.php b/plugins/managesieve/lib/Net/Sieve.php
index a8e36d8d7..8a0a9b0e1 100644
--- a/plugins/managesieve/lib/Net/Sieve.php
+++ b/plugins/managesieve/lib/Net/Sieve.php
@@ -1098,7 +1098,9 @@ class Net_Sieve
                     return PEAR::raiseError(trim($response . $line), 6);
                 }
 
-                if (preg_match('/^{([0-9]+)}/i', $line, $matches)) {
+                // "\+?" is added in the regexp to workaround DBMail bug
+                // http://dbmail.org/mantis/view.php?id=963
+                if (preg_match('/^{([0-9]+)\+?}/i', $line, $matches)) {
                     // Matches literal string responses.
                     $line = $this->_recvBytes($matches[1] + 2);
 
-- 
cgit v1.2.3