From 5b3a0a2797c8939b397f37dbb9cbf05a50622895 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 19 Oct 2012 09:30:51 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 program/include/rcube_message.php |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index fe2fcf3..4e1b5a0 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -371,6 +371,11 @@
             foreach ($structure->parts as $p => $sub_part) {
                 $sub_mimetype = $sub_part->mimetype;
 
+                // 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')
                     $plain_part = $p;

--
Gitblit v1.9.1