Index: includes/phpmailer.drupal.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/phpmailer/includes/phpmailer.drupal.inc,v
retrieving revision 1.11
diff -u -p -r1.11 phpmailer.drupal.inc
--- includes/phpmailer.drupal.inc	21 Nov 2009 19:05:37 -0000	1.11
+++ includes/phpmailer.drupal.inc	3 Dec 2009 13:16:26 -0000
@@ -23,10 +23,10 @@ function phpmailer_send($message) {
   }
 
   // Parse 'From' e-mail address.
-  $address = phpmailer_parse_address($message['from']);
-  $mail->From = $address[0]['mail'];
-  if ($address[0]['name'] != '') {
-    $mail->FromName = $address[0]['name'];
+  $from = reset(phpmailer_parse_address($message['from']));
+  $mail->From = $from['mail'];
+  if ($from['name'] != '') {
+    $mail->FromName = $from['name'];
   }
   unset($message['headers']['From']);
 
@@ -60,6 +60,11 @@ function phpmailer_send($message) {
     }
     unset($message['headers']['Reply-To']);
   }
+  else {
+    // If no Reply-To header has been explicitly set, use the From address to
+    // be able to respond to e-mails sent via Google Mail.
+    $mail->AddReplyTo($from['mail'], $from['name']);
+  }
 
   // Extract Content-Type and charset.
   if (isset($message['headers']['Content-Type'])) {
Index: includes/phpmailer.mimemail.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/phpmailer/includes/phpmailer.mimemail.inc,v
retrieving revision 1.8
diff -u -p -r1.8 phpmailer.mimemail.inc
--- includes/phpmailer.mimemail.inc	21 Nov 2009 19:05:37 -0000	1.8
+++ includes/phpmailer.mimemail.inc	3 Dec 2009 13:25:45 -0000
@@ -28,11 +28,11 @@ function mimemail_phpmailer_send($messag
   // Display names are not required. Leave header intact.
 
   // Parse 'From' e-mail address.
-  $address = phpmailer_parse_address($message['sender']);
-  if ($address[0]['name'] != '') {
-    $mail->FromName = $address[0]['name'];
+  $from = reset(phpmailer_parse_address($message['sender']));
+  $mail->From = $from['mail'];
+  if ($from['name'] != '') {
+    $mail->FromName = $from['name'];
   }
-  $mail->From = $address[0]['mail'];
 
   if (variable_get('phpmailer_debug_email', '') === '') {
     // Set recipients.
@@ -62,6 +62,11 @@ function mimemail_phpmailer_send($messag
   if ($message['address']) {
     $message['headers']['To'] = $message['address'];
   }
+  // If no Reply-To header has been explicitly set, use the From address to be
+  // able to respond to e-mails sent via Google Mail.
+  if (!isset($message['headers']['Reply-To'])) {
+    $message['headers']['Reply-To'] = $from['mail'];
+  }
   $message['headers']['Subject'] = $message['subject'];
   // FIXME SpamAssassin says INVALID_MSGID to PHPMailer's generated Message-ID. 06/04/2009 smk
 //  if (!isset($message['headers']['Message-ID'])) {