diff --git a/includes/mail.inc b/includes/mail.inc
index 92de9bf6db6b8c631bbe63714201fe24e7f2adb6..6b2d3c229254fd946736eb118f9b26d5a09ed7ae 100644
--- a/includes/mail.inc
+++ b/includes/mail.inc
@@ -8,6 +8,7 @@
 
 /**
  * Auto-detect appropriate line endings for e-mails.
+ *
  * $conf['mail_line_endings'] will override this setting.
  */
 define('MAIL_LINE_ENDINGS', isset($_SERVER['WINDIR']) || strpos($_SERVER['SERVER_SOFTWARE'], 'Win32') !== FALSE ? "\r\n" : "\n");
diff --git a/modules/system/mail.sending.inc b/modules/system/mail.sending.inc
index c0f0738ad6cae0d8026e26e1c7d6796f74b22d0f..f80b6953cf5d50fdaddc04b0f3be92228c65cc19 100644
--- a/modules/system/mail.sending.inc
+++ b/modules/system/mail.sending.inc
@@ -50,7 +50,9 @@ public function mail(array $message) {
       $message['to'],
       mime_header_encode($message['subject']),
       // Note: e-mail uses CRLF for line-endings. PHP's API requires LF
-      // on Unix and CRLF on Windows. See mail_line_endings in settings.php.
+      // on Unix and CRLF on Windows. Drupal automatically guesses the
+      // line-ending format appropriate for your system. If you need to
+      // override this, adjust $conf['mail_line_endings'] in settings.php.
       preg_replace('@\r?\n@', $line_endings, $message['body']),
       // For headers, PHP's API suggests that we use CRLF normally,
       // but some MTAs incorrectly replace LF with CRLF. See #234403.
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index e869027b7f40ac5db267de72ec46dad861cefe66..b8b4dbbe72f3f34e3958ee69c43c6092b77bf5cd 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -166,15 +166,6 @@
  */
 $update_free_access = FALSE;
 
-/**
- * Line endings for e-mail messages
- * 
- * Drupal automatically guesses the line-ending format appropriate for your 
- * system. If you need to override this, uncomment the statement below and set
- * it to the line-ending string of your choice.
- */
-# $conf['mail_line_endings'] = "\r\n";
-
 /**
  * Base URL (optional).
  *