From 36638ec0c2275c4b55e3f5857111ba8fdd063bd1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 20 Nov 2017 18:05:07 +0100
Subject: [PATCH] Fix untagged COPYUID responses handling - again (#5982)

---
 CHANGELOG                                    | 1 +
 program/lib/Roundcube/rcube_imap_generic.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index d5c946306..93cb23637 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -56,6 +56,7 @@ CHANGELOG Roundcube Webmail
 - Fix various issues when downloading files with names containing non-ascii chars, use RFC 2231 (#5772)
 - Fix broken long filenames when using imap4d server - workaround server bug (#6048)
 - Fix so temp_dir misconfiguration prints an error to the log (#6045)
+- Fix untagged COPYUID responses handling - again (#5982)
 
 RELEASE 1.3.3
 -------------
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index f1c87d562..ec73094a4 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -3715,7 +3715,7 @@ class rcube_imap_generic
             }
 
             // parse untagged response for [COPYUID 1204196876 3456:3457 123:124] (RFC6851)
-            if ($line && $command == 'UID MOVE' && substr_compare($line, '* OK', 0, 4, true)) {
+            if ($line && $command == 'UID MOVE') {
                 if (preg_match("/^\* OK \[COPYUID [0-9]+ ([0-9,:]+) ([0-9,:]+)\]/i", $line, $m)) {
                     $this->data['COPYUID'] = array($m[1], $m[2]);
                 }