From 52e0cbbde43afcee683d43b4e7a5c2af71ef9c25 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 31 May 2016 12:52:15 +0200
Subject: [PATCH] Fix bug where email tags got lost on move (#5434)

With disabled messages_cache and disabled kolab_notes plugin
Message-Id header is not FETCHed from the IMAP server.
So, in such a case member URI in the tag object will contain
message-id=mid:XXX, which causes problem when the message
is moved to another folder, because it cannot be found by this invalid message-id.
---
 plugins/libkolab/libkolab.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/libkolab/libkolab.php b/plugins/libkolab/libkolab.php
index 47445198..35be31d7 100644
--- a/plugins/libkolab/libkolab.php
+++ b/plugins/libkolab/libkolab.php
@@ -87,7 +87,7 @@ class libkolab extends rcube_plugin
      */
     function storage_init($p)
     {
-        $p['fetch_headers'] = trim($p['fetch_headers'] .' X-KOLAB-TYPE X-KOLAB-MIME-VERSION');
+        $p['fetch_headers'] = trim($p['fetch_headers'] .' X-KOLAB-TYPE X-KOLAB-MIME-VERSION MESSAGE-ID');
         return $p;
     }