summaryrefslogtreecommitdiff
path: root/includes/mail.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/mail.inc')
-rw-r--r--includes/mail.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/mail.inc b/includes/mail.inc
index 64b9b9363..3d6bf659a 100644
--- a/includes/mail.inc
+++ b/includes/mail.inc
@@ -184,10 +184,12 @@ 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.
+ // Note: e-mail uses CRLF for line-endings, but PHP's API requires LF
+ // for the message body.
// They will appear correctly in the actual e-mail that is sent.
str_replace("\r", '', $message['body']),
- join("\n", $mimeheaders)
+ // For headers, PHP's API requires that we use CRLF normally.
+ join("\r\n", $mimeheaders)
);
}
}