Merge pull request #508 in ZP/z-push from...

Merge pull request #508 in ZP/z-push from bugfix/ZP-1155-ios-mail-with-z-push-preview-show to develop

* commit 'e2107b9b':
  Revert "Merge pull request #465 in ZP/z-push from bugfix/ZP-1155-ios-mail-with-z-push-preview-show to develop"

src/backend/imap/imap.php

@@ -1052,16 +1052,16 @@ class BackendIMAP extends BackendDiff implements ISearchProvider {
 
             // We need the text body even though MIME is used, for the preview
             $textBody = "";
-            Mail_mimeDecode::getBodyRecursive($message, "plain", $textBody, true);
+            Mail_mimeDecode::getBodyRecursive($message, "html", $textBody, true);
             if (strlen($textBody) > 0) {
                 if ($bpReturnType != SYNC_BODYPREFERENCE_MIME) {
-                    $bpReturnType = SYNC_BODYPREFERENCE_PLAIN;
+                    $bpReturnType = SYNC_BODYPREFERENCE_HTML;
                 }
             }
             else {
-                Mail_mimeDecode::getBodyRecursive($message, "html", $textBody, true);
+                Mail_mimeDecode::getBodyRecursive($message, "plain", $textBody, true);
                 if ($bpReturnType != SYNC_BODYPREFERENCE_MIME) {
-                    $bpReturnType = SYNC_BODYPREFERENCE_HTML;
+                    $bpReturnType = SYNC_BODYPREFERENCE_PLAIN;
                 }
             }