Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.611.2.20
diff -u -9 -p -r1.611.2.20 common.inc
--- includes/common.inc	9 Jul 2008 19:34:30 -0000	1.611.2.20
+++ includes/common.inc	8 Nov 2008 13:53:26 -0000
@@ -1923,19 +1924,19 @@ function page_set_cache() {
  *    user@example.com, anotheruser@example.com
  *    User <user@example.com>
  *    User <user@example.com>, Another User <anotheruser@example.com>
  * @param $subject
  *   Subject of the e-mail to be sent. This must not contain any newline
  *   characters, or the mail may not be sent properly.
  * @param $body
  *   Message to be sent. Drupal will format the correct line endings for you.
  * @param $from
- *   Sets From, Reply-To, Return-Path and Error-To to this value, if given.
+ *   Sets From to this value, if given.
  * @param $headers
  *   Associative array containing the headers to add. This is typically
  *   used to add extra headers (From, Cc, and Bcc).
  *   <em>When sending mail, the mail must contain a From header.</em>
  * @return Returns TRUE if the mail was successfully accepted for delivery,
  *   FALSE otherwise.
  */
 function drupal_mail($mailkey, $to, $subject, $body, $from = NULL, $headers = array()) {
   $defaults = array(
@@ -1943,22 +1944,22 @@ function drupal_mail($mailkey, $to, $sub
     'Content-Type' => 'text/plain; charset=UTF-8; format=flowed',
     'Content-Transfer-Encoding' => '8Bit',
     'X-Mailer' => 'Drupal'
   );
   // To prevent e-mail from looking like spam, the addresses in the Sender and
   // Return-Path headers should have a domain authorized to use the originating
   // SMTP server.  Errors-To is redundant, but shouldn't hurt.
   $default_from = variable_get('site_mail', ini_get('sendmail_from'));
   if ($default_from) {
-    $defaults['From'] = $defaults['Reply-To'] = $defaults['Sender'] = $defaults['Return-Path'] = $defaults['Errors-To'] = $default_from;
+    $defaults['From'] = $defaults['Sender'] = $defaults['Return-Path'] = $defaults['Errors-To'] = $default_from;
   }
   if ($from) {
-    $defaults['From'] = $defaults['Reply-To'] = $from;
+    $defaults['From'] = $from;
   }
   $headers = array_merge($defaults, $headers);
   // Custom hook traversal to allow pass by reference
   foreach (module_implements('mail_alter') AS $module) {
     $function = $module .'_mail_alter';
     $function($mailkey, $to, $subject, $body, $from, $headers);
   }
   // Allow for custom mail backend
   if (variable_get('smtp_library', '') && file_exists(variable_get('smtp_library', ''))) {