Sanity checking for servers that might send back the wrong (but equiv…

…alent) FETCH response data item

Gmail has an issue with the reverse - it will return BODY responses for
RFC822 requests, but that doesn't affect us.  But doesn't hurt to be as
thorough as possible.

framework/Imap_Client/lib/Horde/Imap/Client/Socket.php

@@ -3013,6 +3013,22 @@ protected function _parseFetch(
         while (($tag = $data->next()) !== false) {
             $tag = strtoupper($tag);
 
+            /* Catch equivalent RFC822 tags, in case server returns them
+             * (in error, since we only use BODY in FETCH requests). */
+            switch ($tag) {
+            case 'RFC822':
+                $tag = 'BODY[]';
+                break;
+
+            case 'RFC822.HEADER':
+                $tag = 'BODY[HEADER]';
+                break;
+
+            case 'RFC822.TEXT':
+                $tag = 'BODY[TEXT]';
+                break;
+            }
+
             switch ($tag) {
             case 'BODYSTRUCTURE':
                 $data->next();