Index: includes/mail.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/mail.inc,v
retrieving revision 1.8.2.1
diff -u -p -r1.8.2.1 mail.inc
--- includes/mail.inc	21 Mar 2008 22:10:20 -0000	1.8.2.1
+++ includes/mail.inc	1 Apr 2008 22:45:50 -0000
@@ -184,12 +184,10 @@ function drupal_mail_send($message) {
     return mail(
       $message['to'],
       mime_header_encode($message['subject']),
-      // Note: e-mail uses CRLF for line-endings, but PHP's API requires LF
-      // for the message body.
+      // Note: e-mail uses CRLF for line-endings, but PHP's API requires LF.
       // They will appear correctly in the actual e-mail that is sent.
       str_replace("\r", '', $message['body']),
-      // For headers, PHP's API requires that we use CRLF normally.
-      join("\r\n", $mimeheaders)
+      join("\n", $mimeheaders)
     );
   }
 }