diff options
Diffstat (limited to 'program/steps/mail/func.inc')
| -rw-r--r-- | program/steps/mail/func.inc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index f9352a3df..69724c554 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1037,14 +1037,8 @@ function rcmail_message_body($attrib) rcmail_plain_body(Q($MESSAGE->body, 'strict', false)))); } - $ctype_primary = strtolower($MESSAGE->structure->ctype_primary); - $ctype_secondary = strtolower($MESSAGE->structure->ctype_secondary); - // list images after mail body - if ($CONFIG['inline_images'] - && $ctype_primary == 'multipart' - && !empty($MESSAGE->attachments)) - { + if ($CONFIG['inline_images'] && !empty($MESSAGE->attachments)) { foreach ($MESSAGE->attachments as $attach_prop) { // Content-Type: image/*... if (preg_match('/^image\//i', $attach_prop->mimetype) || @@ -1427,6 +1421,7 @@ function rcmail_compose_cleanup($id) $rcmail = rcmail::get_instance(); $rcmail->plugins->exec_hook('attachments_cleanup', array('group' => $id)); $rcmail->session->remove('compose_data_'.$id); + $rcmail->session->remove('compose'); } |