Index: /trunk/roundcubemail/program/lib/imap.inc
===================================================================
--- /trunk/roundcubemail/program/lib/imap.inc	(revision 1645)
+++ /trunk/roundcubemail/program/lib/imap.inc	(revision 1646)
@@ -2576,6 +2576,6 @@
 				$line = iil_ReadLine($fp, 5000);
 				$line = iil_MultLine($fp, $line);
-				list(, $index, $rest) = explode(' ', $line);
-				if ($index == $id || preg_match("/^$key/", $line))
+				list(, $index, $cmd, $rest) = explode(' ', $line);
+				if ($cmd != 'FETCH' || $index == $id)
 					$result .= $line;
 			} while (!preg_match("/^$key/", $line));