$body_data contains a stream, not a string.

horde · Nov 5, 2016 · 13b8ff2 · 13b8ff2
1 parent a07040e
commit 13b8ff2
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Mail.php b/framework/Core/lib/Horde/Core/ActiveSync/Mail.php
@@ -605,10 +605,9 @@ protected function _msgBody(array $body_data, Horde_Mime_Part $part, $html, $flo
     {
         $subtype = $html == true ? 'html' : 'plain';
         $msg = Horde_String::convertCharset(
-            $body_data[$subtype]['body'],
+            (string)$body_data[$subtype]['body'],
             $body_data[$subtype]['charset'],
             'UTF-8');
-        trim($msg);
         if (!$html) {
             if ($part->getContentTypeParameter('format') == 'flowed') {
                 $flowed = new Horde_Text_Flowed($msg, 'UTF-8');