Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r446 -r448
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 446)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 448)
@@ -701,9 +701,12 @@
             
             $headers = "Date: ".date("r")."\n".$headers;
             $headers = "Return-Path: ".$objConfig->Get("Smtp_AdminMailFrom")."\n".$headers;
-            //$Msg = str_replace("\r\n","\n",$Msg);
-            //$Msg = str_replace("\n","\r\n",$Msg);
             
+            if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+            	$Msg = str_replace("\r\n","\n",$Msg);
+            	$Msg = str_replace("\n","\r\n",$Msg);
+            }
+            
             //echo "<PRE>"; print_r(htmlentities($headers)); echo "</PRE>";
             //echo "<PRE>"; print_r(htmlentities($Msg)); echo "</PRE>";
             $ver = phpversion();