Merge branch 'dev-compose-newwindow'

Thomas Bruederli

2012-10-27 ddafe4e4109a8d6d412c3c138412ee2ca3d58dbf

 program/include/rcube_message.php

@@ -210,15 +210,16 @@
                if (!$recursive) {
                    $level = explode('.', $part->mime_id);

                    // Level too high
                    if (count($level) > 2) {
                    // Skip if level too deep or part has a file name
                    if (count($level) > 2 || $part->filename) {
                        continue;
                    }

                    // HTML part can be on the lower level, if not...
                    if (count($level) > 1) {
                        // It can be an alternative or related message part
                        $parent = $this->mime_parts[0];
                        array_pop($level);
                        $parent = $this->mime_parts[join('.', $level)];
                        // ... parent isn't multipart/alternative or related
                        if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
                            continue;
                        }
@@ -371,9 +372,10 @@
            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')