Index: subscriptions.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/subscriptions/subscriptions.module,v
retrieving revision 1.62.2.20
diff -u -r1.62.2.20 subscriptions.module
--- subscriptions.module        9 Feb 2007 21:51:49 -0000       1.62.2.20
+++ subscriptions.module        11 Feb 2007 17:00:13 -0000
@@ -434,8 +434,8 @@
  * @from
  *
  */
-function subscriptions_sendmail($name, $to, $subject, $body, $from) {
-  $mail_success = drupal_mail('subscriptions-sendmail', $to, $subject, $body, $from);
+function subscriptions_sendmail($name, $to, $subject, $body, $from, $headers) {
+  $mail_success = drupal_mail('subscriptions-sendmail', $to, $subject, $body, $from, $headers);
   if ($mail_success) {
     if(variable_get('subscriptions_watchgood', 1) == 1){
       watchdog('regular', t('subscription notification for ') .'"'. $name .'" <'. $to .'>');
@@ -536,7 +536,7 @@
       // revert to original locale
       $locale = $initial_locale;

-      subscriptions_sendmail($subscriptions->name, $subscriptions->mail, $subject, $body, $headers);
+      subscriptions_sendmail($subscriptions->name, $subscriptions->mail, $subject, $body, $from, $headers);
     }
   }

@@ -1474,8 +1474,8 @@
 /**
  * theme a header for an email output
  */
-function theme_subscriptions_mail_item_headers($from){
-  $headers = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from";
+function theme_subscriptions_mail_item_headers($from) {
+  $headers = "X-Mailer: Drupal";
   return $headers;
 }

@@ -1490,4 +1490,4 @@
               '!subject' => $subject)
   );
   return $subject;
-}
\ No newline at end of file
+}