Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -N -r4642 -r5431
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 4642)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 5431)
@@ -73,9 +73,13 @@
            			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];
+			
+			$email_object = &$this->Application->recallObject('kEmailMessage');
+			$email_object->Clear();
+			
+			$footer = $this->Get('MessageType') == 'text' ? $email_object->convertHTMLtoPlain($footer[1]) : $footer[1];
 
-			$template = $this->Get('Template')."\r\n".$footer;
+			$template = $this->Get('Template'); //."\r\n".$footer;
 			// add footer: end
 
 			$lines = explode("\n", $template);
@@ -102,6 +106,8 @@
 			while ($i<count($lines)) {
 				$this->body .= $lines[$i++];
 			}
+			
+			$this->body .= "\r".$footer;
 			$this->TemplateParsed = true;
 
 
@@ -256,8 +262,7 @@
             }
             else
             {
-            	$body = nl2br(str_replace("\r", "", $body));
-            	$body = str_replace('<br />', "\n", $body);
+            	$body = str_replace("\r", "", $body);
                 $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers);
             }
 
@@ -303,8 +308,7 @@
               }
               else
               {
-              	$body=nl2br($body);
-              	$body = str_replace("<br />","\n",$body);
+              	$body = str_replace("\r", "", $body);
                 $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers);
               }
 
@@ -942,21 +946,11 @@
     	$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
-
-    	if(!$Text)
-    	{
-    		$Text = strip_tags($Html."\r\n".$footer);
+    	if (!$Text) {
+    		$Text = strip_tags($Html);
     	}
     	else {
-    		$Text = strip_tags($Text."\r\n".$footer);
+    		$Text = strip_tags($Text);
     	}
 
     	$msg .= "--" . $boundary . "\n";
@@ -970,7 +964,7 @@
     		$msg .= "--" . $boundary . "\n";
     		$msg .= "Content-Type: text/html; charset=\"iso-8859-1\""."\n";
     		$msg .= "Content-Transfer-Encoding:	8bit"."\n"."\n";
-    		$msg .= stripslashes($Html."\r\n".$footer);
+    		$msg .= stripslashes($Html);
     		$msg .= "\n"."\n";
     	}
     	$msg .= "--" . $boundary . "--"."\n";