Merge pull request #509 in ZP/z-push from develop to release/2.3

* commit 'e13b7b46':
  Revert "Merge pull request #465 in ZP/z-push from bugfix/ZP-1155-ios-mail-with-z-push-preview-show to develop"
  ZP-1191 Fix php-awl package name for rpm based distributions.

build/rpm/z-push.spec

@@ -50,7 +50,7 @@ Z-push is an implementation of the ActiveSync protocol which is used 'over-the-a
 Summary:    Z-Push caldav backend
 Group:      Productivity/Networking/Email/Utilities
 Requires:   %name-common = %version
-Requires:   libawl-php
+Requires:   php-awl
 %if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
 Requires:   rh-php56-php-common
 Requires:   rh-php56-php-xml
@@ -91,7 +91,7 @@ Backend for Z-Push, that adds the ability to combine backends.
 Summary:    Z-Push imap backend
 Group:      Productivity/Networking/Email/Utilities
 Requires:   %name-common = %version
-Requires:   libawl-php
+Requires:   php-awl
 %if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
 Requires:   rh-php56-php-imap
 %else

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;
                 }
             }