From 9b4aaa79d3cc1cded4e8a3bd11063994152fccc7 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 03 Feb 2009 02:40:26 -0500
Subject: [PATCH] - Fix displaying of alternative-inside-alternative messages (#1485713)

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

diff --git a/CHANGELOG b/CHANGELOG
index ca03af3..ea1af1d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 ----------
 - Fix checking for recent messages on various IMAP servers (#1485702)
 - performance fix: Don't fetch quota and recent messages in "message view" mode
+- Fix displaying of alternative-inside-alternative messages (#1485713)
 
 2009/01/28 (alec)
 ----------
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 8a2cb17..fa2aebc 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -266,7 +266,7 @@
           $html_part = $p;
         else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='enriched')
           $enriched_part = $p;
-        else if ($sub_ctype_primary=='multipart' && ($sub_ctype_secondary=='related' || $sub_ctype_secondary=='mixed'))
+        else if ($sub_ctype_primary=='multipart' && in_array($sub_ctype_secondary, array('related', 'mixed', 'alternative')))
           $related_part = $p;
       }
 

--
Gitblit v1.9.1