diff --git a/includes/mail.inc b/includes/mail.inc
index a97c788f09..e108211400 100644
--- a/includes/mail.inc
+++ b/includes/mail.inc
@@ -10,7 +10,7 @@
  *
  * $conf['mail_line_endings'] will override this setting.
  */
-define('MAIL_LINE_ENDINGS', isset($_SERVER['WINDIR']) || (isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Win32') !== FALSE) ? "\r\n" : "\n");
+define('MAIL_LINE_ENDINGS', "\r\n");
 
 
 /**
