From 2268aa676d4f21f0f26b4c802c6fb9c2c631d206 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 22 Oct 2014 13:02:23 -0400
Subject: [PATCH] Fix handling of uuencoded messages if messages_cache is enabled (#1490108)

---
 program/lib/Roundcube/rcube_message.php |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
index a00f6bf..4f0f0fd 100644
--- a/program/lib/Roundcube/rcube_message.php
+++ b/program/lib/Roundcube/rcube_message.php
@@ -899,13 +899,6 @@
                 break;
             }
 
-            // update message content-type
-            if ($part->mimetype != 'multipart/mixed') {
-                $part->ctype_primary   = 'multipart';
-                $part->ctype_secondary = 'mixed';
-                $part->mimetype        = $part->ctype_primary . '/' . $part->ctype_secondary;
-            }
-
             $endpos    = $m[0][1];
             $begin_len = strlen($matches[0][0]);
             $end_len   = strlen($m[0][0]);
@@ -916,6 +909,8 @@
 
             // remove attachment body from the message body
             $part->body = substr_replace($part->body, '', $startpos, $endpos + $end_len - $startpos);
+            // mark body as modified so it will not be cached by rcube_imap_cache
+            $part->body_modified = true;
 
             // add attachments to the structure
             $uupart = new rcube_message_part;

--
Gitblit v1.9.1