Index: smtp.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/smtp/smtp.module,v
retrieving revision 1.17.2.18
diff -u -p -r1.17.2.18 smtp.module
--- smtp.module	4 Jan 2010 11:00:54 -0000	1.17.2.18
+++ smtp.module	23 Mar 2010 15:58:57 -0000
@@ -302,7 +302,13 @@ function smtp_drupal_mail_wrapper($messa
     $headers['From'] = $properfrom;
   }
   if (!isset($headers['Reply-To']) || empty($headers['Reply-To'])) {
-    $headers['Reply-To'] = $from;
+    if (strpos($from, '<')) {
+      $reply = preg_replace('/>.*/', '', preg_replace('/.*</','',$from));
+    }
+    else {
+      $reply = $from;
+    }
+    $headers['Reply-To'] = $reply;
   }
 
   // Blank value will let the e-mail address appear.
@@ -903,6 +909,3 @@ function smtp_mailengine($op, $message =
 }
 
 } // if (!module_exists('mimemail'))
-
-
-