Index: mimemail.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mimemail/mimemail.inc,v
retrieving revision 1.10
diff -u -u -F^f -r1.10 mimemail.inc
--- mimemail.inc	29 Nov 2005 18:11:34 -0000	1.10
+++ mimemail.inc	3 Dec 2005 02:18:38 -0000
@@ -63,9 +63,10 @@ function mimemail_address($address) {
     
     // it's an array containing 'mail' and/or 'name'
     if (isset($address['mail'])) {
-      $output = '';
-      if (!empty($address['name'])) $output .= '"'.addslashes($address['name']).'" ';
-      $output .= '<'.$address['mail'].'>';
+    
+      if (empty($address['name'])) $output = $address['mail'];
+      else $output = '"'.addslashes($address['name']).'" <'.$address['mail'].'>';
+          
       return $output;
     }
     
@@ -103,7 +104,7 @@ function mimemail_prepare_headers($heade
     $from = variable_get('site_mail', ini_get('sendmail_from'));
   }
   // allow a mail to overwrite standard headers.
-  $headers = array_merge(array('Return-Path' => "<$from>", 'Errors-To' => $from, 'From' => $from, 'Content-Type' => 'text/plain; charset=utf-8; format=flowed'),$headers);
+  $headers = array_merge(array('Return-Path' => "$from", 'Errors-To' => $from, 'From' => $from, 'Content-Type' => 'text/plain; charset=utf-8; format=flowed'),$headers);
   return mimemail_rfc_headers($headers);
 }