Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2012-09-17 8f098e8dead85b6512ac72b2d805314baec72a2f

 program/include/rcube_message.php

@@ -494,8 +494,13 @@
                    }

                    // list as attachment as well
                    if (!empty($mail_part->filename))
                    if (!empty($mail_part->filename)) {
                        $this->attachments[] = $mail_part;
                    }
                    // list html part as attachment (here the part is most likely inside a multipart/related part)
                    else if ($this->parse_alternative && ($secondary_type == 'html' && !$this->opt['prefer_html'])) {
                        $this->attachments[] = $mail_part;
                    }
                }
                // part message/*
                else if ($primary_type == 'message') {