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

Merge pull request #543 in ZP/z-push from bugfix/ZP-1230-windows-phone-8.1-unable-to-sync to develop

* commit '1691dff0':
  ZP-1230 Reverted change: Regexp faulty. Details in ticket comment.
  ZP-1230 Reverting change: newlines shouldn't matter in HTML.
  ZP-1230 Reverting change: ob_start() is not required at this point.
  ZP-1230 Reverting change: WBXMLEncoder->getBodypartsCount() is correct.
  ZP-1230 windows-phone-8.1-unable-to-sync. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1230 windows-phone-8.1-unable-to-sync. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1230 windows-phone-8.1-unable-to-sync. Released under the Affero GNU General Public License (AGPL) version 3. Fixed as described in Jira.

src/backend/kopano/mapiprovider.php

@@ -2478,6 +2478,7 @@ class MAPIProvider {
                 else {
                     $body = $this->mapiReadStream($stream, $streamsize);
                     $message->asbody->data = StringStreamWrapper::Open(Utils::ConvertCodepageStringToUtf8($message->internetcpid, $body));
+                    $message->internetcpid = INTERNET_CPID_UTF8;
                 }
             }
             else {

src/lib/syncobjects/syncbasebody.php

@@ -41,6 +41,7 @@ class SyncBaseBody extends SyncObject {
                     SYNC_AIRSYNCBASE_TRUNCATED                          => array (self::STREAMER_VAR        => "truncated"),
                     SYNC_AIRSYNCBASE_DATA                               => array (self::STREAMER_VAR        => "data",
                                                                                   self::STREAMER_TYPE       => self::STREAMER_TYPE_STREAM_ASPLAIN,
+                                                                                  self::STREAMER_PROP       => self::STREAMER_TYPE_MULTIPART,
                                                                                   self::STREAMER_RONOTIFY   => true,
                                                                                   self::STREAMER_PRIVATE    => true),       // just remove the body when stripping private
         );