--- smtp.module	2009-07-05 11:05:43.000000000 -0400
+++ smtp/smtp.module	2008-06-18 11:53:16.000000000 -0400
@@ -188,7 +188,7 @@ function _drupal_mail_wrapper($mailkey, 
     }
   }
 
-  $from_name = preg_replace("/\"(.*)\"(.*)/i", "$1", $from_name); // It gives: Name
+  $from_name = preg_replace("/\"(.*)\"(.*)/i", "$1", $from); // It gives: Name
   $from      = preg_replace("/(.*)\<(.*)\>/i", "$2", $from); // It gives: name@domain.tld
 
   // Defines the From value to what we expect
@@ -235,7 +235,7 @@ function _drupal_mail_wrapper($mailkey, 
          case 'reply-to':
             // Only add a "reply-to" if it's not the same as "return-path".
             if ($value != $header['Return-Path']) {
-               $mail->AddReplyTo($value, $from_name);
+               $mail->AddReplyTo($value);
             }
             break;
  
@@ -243,7 +243,6 @@ function _drupal_mail_wrapper($mailkey, 
             if (trim($value) !=  '') {
                // This is be set by SmtpSend()
                // $mail->Sender = $value;
-               $mail->AddReplyTo($value, $from_name);
             }
             break;