diff --git a/e107_handlers/mail.php b/e107_handlers/mail.php
index c214c2b18..49fc5312d 100644
--- a/e107_handlers/mail.php
+++ b/e107_handlers/mail.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/mail.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2006-12-30 16:33:39 $
+|     $Revision: 1.4 $
+|     $Date: 2006-12-30 18:55:42 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -96,6 +96,7 @@ function sendemail($send_to, $subject, $message, $to_name, $send_from, $from_nam
 		$Html = preg_replace('%(http|ftp|https)(://\S+)%', '<a href="\1\2">\1\2</a>', $Html);
 		$Html = preg_replace('/([[:space:]()[{}])(www.[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i', '\\1<a href="http://\\2">\\2</a>', $Html);
 		$Html = preg_replace('/([_\.0-9a-z-]+@([0-9a-z][0-9a-z-]+\.)+[a-z]{2,3})/i', '<a href="mailto:\\1">\\1</a>', $Html);
+	    $Html = str_replace("\r","\n",$Html);		// Handle alternative newline characters
 		$Html = str_replace("\n", "<br />\n", $Html);
 	}
 	if (strpos($message,"</style>") !== FALSE){