- Backported r5598:r5599 from trunk

alecpl

2011-12-14 e2f30659a1bae74290df0e843bac5326cb05b79d

 program/steps/mail/func.inc

@@ -1046,6 +1046,11 @@
  // list images after mail body
  if ($CONFIG['inline_images'] && !empty($MESSAGE->attachments)) {
    foreach ($MESSAGE->attachments as $attach_prop) {
      // skip inline images
      if ($attach_prop->content_id && $attach_prop->disposition == 'inline') {
        continue;
      }

      // Content-Type: image/*...
      if (preg_match('/^image\//i', $attach_prop->mimetype) ||
        // ...or known file extension: many clients are using application/octet-stream