Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r4322 -r4642
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 4322)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 4642)
@@ -66,18 +66,18 @@
 	{
 		if (!$this->TemplateParsed) {
 			$this->headers = Array();
-			
+
 			// add footer: begin
 			$sql = 'SELECT em.Template
            			FROM '.$this->tablename.' em
            			LEFT JOIN '.TABLE_PREFIX.'Events e ON e.EventId = em.EventId
            			WHERE em.LanguageId = '.$this->Get('LanguageId').' AND e.Event = "COMMON.FOOTER"';
 			$footer = explode("\n\n", $this->Conn->GetOne($sql));
 			$footer = $this->Get('MessageType') == 'text' ? strip_tags($footer[1]) : $footer[1];
-			
+
 			$template = $this->Get('Template')."\r\n".$footer;
 			// add footer: end
-			
+
 			$lines = explode("\n", $template);
 			$header_end = false;
 			$i = 0;
@@ -104,7 +104,7 @@
 			}
 			$this->TemplateParsed = true;
 
-			
+
 		}
     }
 
@@ -768,7 +768,7 @@
 				return mail($To,trim($Subject),$Msg, $headers);
 			}
 
-    	$headers = "To: <".$To.">"."\n".$headers;
+    	$headers = "To: <".$To.">"."\r\n".$headers;
 			$headers = "Subject: ".trim($Subject)."\r\n".$headers;
 
 			if (strpos($To, ',') !== false) {
@@ -941,16 +941,16 @@
 
     	$application =& kApplication::Instance();
     	$db =& $application->GetADODBConnection();
-    	
+
 		// get footer: begin
 		$sql = 'SELECT em.Template
        			FROM '.TABLE_PREFIX.'EmailMessage em
        			LEFT JOIN '.TABLE_PREFIX.'Events e ON e.EventId = em.EventId
        			WHERE em.LanguageId = '.$GLOBALS['m_var_list']['lang'].' AND e.Event = "COMMON.FOOTER"';
 		$footer = explode("\n\n", $db->GetOne($sql));
 		$footer = $footer[1];
-		// get footer: end    	
-	    	
+		// get footer: end
+
     	if(!$Text)
     	{
     		$Text = strip_tags($Html."\r\n".$footer);