Index: branches/5.2.x/core/kernel/utility/email.php
===================================================================
diff -u -N -r15222 -r15225
--- branches/5.2.x/core/kernel/utility/email.php	(.../email.php)	(revision 15222)
+++ branches/5.2.x/core/kernel/utility/email.php	(.../email.php)	(revision 15225)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version	$Id: email.php 15222 2012-03-15 16:38:49Z alex $
+ * @version	$Id: email.php 15225 2012-03-20 09:48:10Z alex $
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
@@ -203,7 +203,7 @@
 	protected function _getCustomParams()
 	{
 		$ret = $this->params;
-		$send_keys = Array ('from_email', 'from_name', 'to_email', 'to_name', 'overwrite_to_email', 'language_id');
+		$send_keys = Array ('from_email', 'from_name', 'to_email', 'to_name', 'overwrite_to_email', 'language_id', 'use_custom_design');
 
 		foreach ($send_keys as $send_key) {
 			unset($ret[$send_key]);
@@ -691,21 +691,16 @@
 		$design_key = $is_html ? 'html' : 'text';
 
 		if ( !isset($design_templates[$design_key]) ) {
-			$footer_email = $this->Application->recallObject('emailevents.footer', null, Array ('skip_autoload' => true));
-			/* @var $footer_email kDBItem */
+			$language = $this->Application->recallObject('lang.current');
+			/* @var $language LanguagesItem */
 
-			$footer_email->Load('COMMON.FOOTER', 'Event');
-			$footer = $footer_email->GetField($is_html ? 'HtmlBody' : 'PlainTextBody');
+			$design_template = $language->GetDBField($is_html ? 'HtmlEmailTemplate' : 'TextEmailTemplate');
 
-			if ( !$is_html && !$footer ) {
-				$footer = $this->sender->ConvertToText($footer_email->GetField('HtmlBody'));
+			if ( !$is_html && !$design_template ) {
+				$design_template = $this->sender->ConvertToText($language->GetDBField('HtmlEmailTemplate'));
 			}
 
-			$design_templates[$design_key] = '$body';
-
-			if ( $footer ) {
-				$design_templates[$design_key] .= "\r\n" . $footer;
-			}
+			$design_templates[$design_key] = $design_template;
 		}
 
 		return $this->_parseText(str_replace('$body', $text, $design_templates[$design_key]));
@@ -731,7 +726,12 @@
 			return false;
 		}
 
-		$message_body = $this->_applyMessageDesign($message_body, $is_html);
+		if ( isset($this->params['use_custom_design']) && $this->params['use_custom_design'] ) {
+			$message_body = $this->_parseText($message_body);
+		}
+		else {
+			$message_body = $this->_applyMessageDesign($message_body, $is_html);
+		}
 
 		return trim($message_body) ? $message_body : false;
 	}