From 03de1329efbcff2a4052ba6289bde1befb1ef0df Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 11 Feb 2014 09:06:53 +0100
Subject: Fix invalid X-Draft-Info on forwarded message draft (#1489587)

---
 program/steps/mail/compose.inc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'program/steps/mail/compose.inc')

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 6e478c656..8504d026c 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1250,6 +1250,9 @@ function rcmail_write_forward_attachments()
         $index = $storage->index(null, rcmail_sort_column(), rcmail_sort_order());
         $COMPOSE['forward_uid'] = $index->get();
     }
+    else if (strpos($COMPOSE['forward_uid'], ':')) {
+        $COMPOSE['forward_uid'] = rcube_imap_generic::uncompressMessageSet($COMPOSE['forward_uid']);
+    }
     else {
         $COMPOSE['forward_uid'] = explode(',', $COMPOSE['forward_uid']);
     }
-- 
cgit v1.2.3