From 070b8e9f7144d3f517c68356eacdf3e96484be06 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 17 Oct 2012 10:35:10 +0200
Subject: Fix the fix for empty text parts handling (#1488757)

---
 program/include/rcube_message.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index f5d253dc6..60e79cb97 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -364,9 +364,10 @@ class rcube_message
             foreach ($structure->parts as $p => $sub_part) {
                 $sub_mimetype = $sub_part->mimetype;
 
-                // skip empty parts
-                if (!$sub_part->size)
+                // skip empty text parts
+                if (!$sub_part->size && preg_match('#^text/(plain|html|enriched)$#', $sub_mimetype)) {
                     continue;
+                }
 
                 // check if sub part is
                 if ($sub_mimetype == 'text/plain')
-- 
cgit v1.2.3