1 files changed, 9 insertions, 1 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index bfeb43343..404713eac 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -246,7 +246,15 @@ function user_mail($mail, $subject, $message, $header) {
     return user_mail_wrapper($mail, $subject, $message, $header);
   }
   else {
-    return mail($mail, $subject, $message, $header);
+    /*
+    ** Note: if you are having problems with sending mail, or mails look wrong
+    ** when they are recieved you may have to modify the str_replace to suit
+    ** your systems.
+    **  - \r\n will work under dos and windows.
+    **  - \n will work for linux, unix and BSDs.
+    **  - \r will work for macs.
+    */
+    return mail($mail, $subject, str_replace("\r", "", $message), $header);
   }
 }