- Fix handling of messages with Content-Type: application/* and no filename (#1484050)

2 files changed, 6 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 6348729c9..4c66adba5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix handling of messages with Content-Type: application/* and no filename (#1484050)
 - Improved compose screen: resizable body and attachments list, vertical splitter, options menu
 - Fix RC forgets search results (#1483883)
 - TinyMCE 3.3.7
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index c3753b290..fac7fe86b 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -488,6 +488,11 @@ class rcube_message
         else if ($structure->filename) {
             $this->attachments[] = $structure;
         }
+        // message is a single part non-text (without filename)
+        else if (preg_match('/application\//i', $mimetype)) {
+            $structure->filename = 'Part '.$structure->mime_id;
+            $this->attachments[] = $structure;
+        }
     }