Index: trunk/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r4216 -r4322
--- trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 4216)
+++ trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 4322)
@@ -106,8 +106,17 @@
 			//Parse Message Template
 			$message_object->Load(array('EventId' => $event_id, 'LanguageId' => $this->Application->GetVar('m_lang')));
 			$message_type 		= $message_object->GetDBField('MessageType');
-			$message_template	= $message_object->GetDBField('Template');
 
+			// add footer: begin
+			$sql = 'SELECT em.Template
+           			FROM '.$message_object->TableName.' em
+           			LEFT JOIN '.TABLE_PREFIX.'Events e ON e.EventId = em.EventId
+           			WHERE em.LanguageId = '.$message_object->GetDBField('LanguageId').' AND e.Event = "COMMON.FOOTER"';
+			$footer = explode("\n\n", $this->Conn->GetOne($sql));
+			$footer = $message_object->GetDBField('MessageType') == 'text' ? strip_tags($footer[1]) : $footer[1];
+			$message_template = $message_object->GetDBField('Template')."\r\n".$footer;
+			// add footer: end
+			
 			$email_object = &$this->Application->recallObject('kEmailMessage');
 			$email_object->Clear();