Fix so non-inline images aren't skipped on forward (#1489150)

CHANGELOG

@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix so non-inline images aren't skipped on forward (#1489150)
 - Add imap_cache_ttl option to configure TTL of imap_cache
 - Make LDAP cache engine configurable via ldap_cache and ldap_cache_ttl options
 - Fix legacy options handling

program/steps/mail/compose.inc

@@ -1033,8 +1033,8 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
       if ($part->ctype_primary == 'message' && $compose_mode == RCUBE_COMPOSE_REPLY) {
         continue;
       }
-      // skip inline images when forwarding in plain text
+      // skip inline images when forwarding
-      if ($part->content_id && !$bodyIsHtml && $compose_mode == RCUBE_COMPOSE_FORWARD) {
+      if ($part->content_id && $part->disposition == 'inline' && $compose_mode == RCUBE_COMPOSE_FORWARD) {
         continue;
       }