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

Merge pull request #423 in ZP/z-push from bugfix/ZP-1098-outlook-over-as-sync-doesn-t-work to develop

* commit '6b6c8a5d':
  ZP-1098 Use native body type algorithm to set native body type if it is undefined for appointments.
  ZP-1098 Set native body type to plain if it is undefined for appointments.

src/backend/kopano/mapiprovider.php

@@ -312,7 +312,14 @@ class MAPIProvider {
 
         }
 
-        if (!isset($message->nativebodytype)) $message->nativebodytype = $this->getNativeBodyType($messageprops);
+        if (!isset($message->nativebodytype)) {
+            $message->nativebodytype = $this->getNativeBodyType($messageprops);
+        }
+        elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
+            $nbt = $this->getNativeBodyType($messageprops);
+            ZLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->getAppointment(): native body type is undefined. Set it to %d.", $nbt));
+            $message->nativebodytype = $nbt;
+        }
 
         // If the user is working from a location other than the office the busystatus should be interpreted as free.
         if (isset($message->busystatus) && $message->busystatus == fbWorkingElsewhere) {