From f593222ef5d5dc3b678618593abb873f4fcd4343 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 13 Sep 2011 08:09:50 +0000
Subject: - Applied fixes from trunk up to r5212

---
 program/include/rcube_imap.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'program/include/rcube_imap.php')

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index dca8961fa..1d258f1e1 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -2491,6 +2491,9 @@ class rcube_imap
             return true;
         }
 
+        // Remove NULL characters (#1486189)
+        $body = str_replace("\x00", '', $body);
+
         // convert charset (if text or message part)
         if ($body && !$skip_charset_conv &&
             preg_match('/^(text|message)$/', $o_part->ctype_primary)
-- 
cgit v1.2.3