Fix invalid X-Draft-Info on forwarded message draft (#1489587)

1 files changed, 4 insertions, 1 deletions

diff --git a/program/lib/Roundcube/rcube_storage.php b/program/lib/Roundcube/rcube_storage.php
index ca65af1cb..c09f05328 100644
--- a/program/lib/Roundcube/rcube_storage.php
+++ b/program/lib/Roundcube/rcube_storage.php
@@ -613,7 +613,7 @@ abstract class rcube_storage
     /**
      * Parse message UIDs input
      *
-     * @param mixed  $uids  UIDs array or comma-separated list or '*' or '1:*'
+     * @param mixed $uids UIDs array or comma-separated list or '*' or '1:*'
      *
      * @return array Two elements array with UIDs converted to list and ALL flag
      */
@@ -633,6 +633,9 @@ abstract class rcube_storage
             if (is_array($uids)) {
                 $uids = join(',', $uids);
             }
+            else if (strpos($uids, ':')) {
+                $uids = join(',', rcube_imap_generic::uncompressMessageSet($uids));
+            }
 
             if (preg_match('/[^0-9,]/', $uids)) {
                 $uids = '';