- Applied fixes from trunk up to r5232

alecpl

2011-09-19 b578abb9f94fa1d7dc8ce2ee94e35fa074d51ce4

 program/steps/mail/func.inc

@@ -1427,12 +1427,12 @@
 */
function rcmail_compose_cleanup($id)
{
  if (!isset($_SESSION['compose_data'][$id]))
  if (!isset($_SESSION['compose_data_'.$id]))
    return;

  $rcmail = rcmail::get_instance();
  $rcmail->plugins->exec_hook('attachments_cleanup', array('group' => $id));
  unset($_SESSION['compose_data'][$id]);
  $rcmail->session->remove('compose_data_'.$id);
}


@@ -1448,7 +1448,7 @@
{
  global $RCMAIL, $IMAP;

  if (!is_object($message) || !is_a($message, rcube_message))
  if (!is_object($message) || !is_a($message, 'rcube_message'))
    $message = new rcube_message($message);

  if ($message->headers->mdn_to && !$message->headers->mdn_sent &&