- Fix listing of attachments of some types e.g. "x-epoc/x-sisx-app" (#1486653)

2 files changed, 6 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index f22025fb8..b1b053bca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix listing of attachments of some types e.g. "x-epoc/x-sisx-app" (#1486653)
+- Fix DB Schema checking when some db_table_* options are not set (#1486654)
+
+RELEASE 0.4-beta
+----------------
 - Add sizelimit and timelimit variables in LDAP config (#1486544)
 - Hide IMAP host dropdown when single host is defined (#1486326)
 - Add images pre-loading on login page (#1451160)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index fd7a970d3..8cb7b02ab 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -422,7 +422,7 @@ class rcube_message
             $this->inline_parts[] = $mail_part;
           }
           // is a regular attachment
-          else if (preg_match('!^[a-z]+/[a-z0-9-.+]+$!i', $part_mimetype)) {
+          else if (preg_match('!^[a-z0-9-.+]+/[a-z0-9-.+]+$!i', $part_mimetype)) {
             if (!$mail_part->filename)
               $mail_part->filename = 'Part '.$mail_part->mime_id;
             $this->attachments[] = $mail_part;