Index: trunk/admin/email/do_send.php
===================================================================
diff -u -N -r3145 -r5431
--- trunk/admin/email/do_send.php	(.../do_send.php)	(revision 3145)
+++ trunk/admin/email/do_send.php	(.../do_send.php)	(revision 5431)
@@ -62,16 +62,36 @@
 $TargetURL = $_SERVER["PHP_SELF"]."?".$envar.'&destform=popup';
 $CancelURL = $TargetURL."&EmailState=email_user_cancel";
 
+	function getEmailFooter($is_html = true)
+	{
+		static $footer = Array('html' => null, 'plain' => null);
+		
+		$footer_body =& $footer[$is_html ? 'html' : 'plain']; 
+		if (is_null($footer_body)) {
+			$application =& kApplication::Instance();
+			$email_object =& $application->recallObject('kEmailMessage');
+			$email_object->Clear();
+			
+			$sql = 'SELECT em.Template
+           			FROM '.TABLE_PREFIX.'EmailMessage em
+           			LEFT JOIN '.TABLE_PREFIX.'Events e ON e.EventId = em.EventId
+           			WHERE em.LanguageId = '.$application->GetVar('m_lang').' AND e.Event = "COMMON.FOOTER"';
+			$footer_body = explode("\n\n", $application->Conn->GetOne($sql));
+			$footer_body = "\r\n".($is_html ? $footer_body[1] : $email_object->convertHTMLtoPlain($footer_body[1]));
+		}
+		return $footer_body;
+	}
 
+
 /*Initialize page*/
 switch($State)
 {
   case "email_single_send": /*single user send */
       $PageTitle = admin_language("la_Title_SendInit");
       $Subject = $_POST["subject"];
-      $Html = $_POST["messageHTML"];
-      $Text = strip_tags($_POST["messageTEXT"]);
-
+      $Html = $_POST["messageHTML"].getEmailFooter(true);
+      $Text = strip_tags($_POST["messageTEXT"]).getEmailFooter(false);
+      
       if(is_array($_FILES))
       {
           $attatch = $_FILES["attatchment"];
@@ -99,8 +119,8 @@
       //echo $_POST["sendaddrs"]."<br>\n";
       
       $Subject = $_POST["subject"];
-      $Html = $_POST["messageHTML"];
-      $Text = strip_tags($_POST["messageTEXT"]);
+      $Html = $_POST["messageHTML"].getEmailFooter(true);
+      $Text = strip_tags($_POST["messageTEXT"]).getEmailFooter(false);
 
       if(is_array($_FILES))
       {