--- password_policy.module	Thu Jun  4 13:32:54 2009
+++ password_policy.module	Wed Jul 22 21:19:08 2009
@@ -834,7 +834,7 @@ function password_policy_send_login($acc
   $variables = array('!username' => $account->name, '!site' => variable_get('site_name', 'drupal'), '!login_url' => user_pass_reset_url($account), '!uri' => $base_url, '!uri_brief' => substr($base_url, strlen('http://')), '%mailto' => $account->mail, '%date' => format_date(time()), '%login_uri' => url('user', NULL, NULL, TRUE), '!edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE));
   $subject = _user_mail_text('pass_subject', $variables);
   $body = _user_mail_text('pass_body', $variables);
-  $headers = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from";
+  $headers = array('From' => $from, 'Reply-to' => $from, 'X-Mailer' => 'Drupal', 'Return-path' => $from, 'Errors-to' => $from);
   $mail_success = drupal_mail('password-policy-send-login', $account->mail, $subject, $body, $from, $headers);
 
   if ($mail_success) {
@@ -893,7 +893,7 @@ function password_policy_cron() {
               $variables = array('%username' => $account->name, '%site' => variable_get('site_name', 'drupal'), '%uri' => $base_url, '%uri_brief' => substr($base_url, strlen('http://')), '%mailto' => $account->mail, '%date' => format_date(time()), '%login_uri' => url('user', NULL, NULL, TRUE), '%edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE), '%days' => $warning);
               $subject = _password_policy_mail_text('warning_subject', $variables);
               $body = _password_policy_mail_text('warning_body', $variables);
-              $headers = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from";
+              $headers = array('From' => $from, 'Reply-to' => $from, 'X-Mailer' => 'Drupal', 'Return-path' => $from, 'Errors-to' => $from);
               $mail_success = drupal_mail('password-policy-cron-warning', $account->mail, $subject, $body, $from, $headers);
 
               if ($mail_success) {