- Applied fixes from trunk up to r5371

2 files changed, 8 insertions, 14 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');
 }
 
 
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index deddb45e8..5022444a7 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -159,14 +159,14 @@ function rcmail_email_input_format($mailto, $count=false, $check=true)
     $item = trim($item);
     // address in brackets without name (do nothing)
     if (preg_match('/^<'.$email_regexp.'>$/', $item)) {
-      $item = rcube_idn_to_ascii($item);
-      $result[] = $item;
+      $item = rcube_idn_to_ascii(trim($item, '<>'));
+      $result[] = '<' . $item . '>';
     // address without brackets and without name (add brackets)
     } else if (preg_match('/^'.$email_regexp.'$/', $item)) {
       $item = rcube_idn_to_ascii($item);
-      $result[] = '<'.$item.'>';
+      $result[] = '<' . $item . '>';
     // address with name (handle name)
-    } else if (preg_match('/'.$email_regexp.'>*$/', $item, $matches)) {
+    } else if (preg_match('/<*'.$email_regexp.'>*$/', $item, $matches)) {
       $address = $matches[0];
       $name = str_replace($address, '', $item);
       $name = trim($name);
@@ -174,9 +174,8 @@ function rcmail_email_input_format($mailto, $count=false, $check=true)
           && preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $name)) {
             $name = '"'.addcslashes($name, '"').'"';
       }
-      $address = rcube_idn_to_ascii($address);
-      if (!preg_match('/^<'.$email_regexp.'>$/', $address))
-        $address = '<'.$address.'>';
+      $address = rcube_idn_to_ascii(trim($address, '<>'));
+      $address = '<' . $address . '>';
 
       $result[] = $name.' '.$address;
       $item = $address;