Index: subscriptions.module
===================================================================
--- subscriptions.module	(revision 394)
+++ subscriptions.module	(revision 395)
@@ -353,8 +353,8 @@
 /*
  * Formats the mail and sends it.
  */
-function subscriptions_sendmail($name, $to, $subject, $body, $headers) {
-  $mail_success = drupal_mail('subscriptions-sendmail',$to, $subject, $body, $headers);
+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 .'>');
@@ -439,7 +439,14 @@
       if (function_exists('locale') && $languages[$subscriptions->language]) {
         $locale = $subscriptions->language;
       }
-      $headers = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from";
+      $headers = array(
+        'Content-type' => 'text/html; charset=UTF-8',
+        'From' => $from,
+        'Reply-to' => $from,
+        'X-Mailer' => 'Drupal',
+        'Return-path' => $from,
+        'Errors-to' => $from
+      );
       $subject = t('[%site] %type subscription update for %name : %subject', array('%site' => variable_get('site_name', 'drupal'), '%type' => $strtype, '%name' => $subscriptions->name, '%subject' => $subj));
       $body = t("Greetings, %name.\n\nA %type to which you have subscribed has been updated.\n%title\n%teaser\nTo view the thread, navigate to %url \n\n--\nThis is an automatic message from %site.\nTo manage your subscriptions, browse to %manage-url",
       array('%name' => $subscriptions->name,
@@ -450,7 +457,7 @@
       '%title' => $nobj->title, '%teaser'=> $teaser));
       // 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);
     }
   }
   return $strsent;