- Applied fixes from trunk up to r5371

alecpl

2011-10-29 f1654a33b271f80422729f72d58695130724cb98

 program/steps/mail/func.inc

@@ -1037,14 +1037,8 @@
      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 @@
  $rcmail = rcmail::get_instance();
  $rcmail->plugins->exec_hook('attachments_cleanup', array('group' => $id));
  $rcmail->session->remove('compose_data_'.$id);
  $rcmail->session->remove('compose');
}