Corrected issue forwarding attachments that use content-description rather than filename or name disposition headers

1 files changed, 5 insertions, 0 deletions

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 5969e05a8..d278279d9 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -414,6 +414,11 @@ function rcmail_create_forward_body($body)
 	    $_SESSION['compose']['attachments'][] = array('name' => $part->ctype_parameters['name'],
                                                           'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
                                                           'path' => $tmp_path);
+							  
+          else if ($part->headers['content-description'])
+	    $_SESSION['compose']['attachments'][] = array('name' => $part->headers['content-description'],
+                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
+                                                          'path' => $tmp_path);
           }
 	}
       }