- Fix displaying of alternative-inside-alternative messages (#1485713)

2 files changed, 2 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index ca03af336..ea1af1dec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ CHANGELOG RoundCube Webmail
 ----------
 - 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 8a2cb1703..fa2aebc5c 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -266,7 +266,7 @@ class rcube_message
           $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;
       }