Index: branches/5.3.x/units/products/products_event_handler.php
===================================================================
diff -u -N -r15925 -r15936
--- branches/5.3.x/units/products/products_event_handler.php	(.../products_event_handler.php)	(revision 15925)
+++ branches/5.3.x/units/products/products_event_handler.php	(.../products_event_handler.php)	(revision 15936)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_event_handler.php 15925 2013-07-30 10:02:36Z alex $
+* @version	$Id: products_event_handler.php 15936 2013-08-14 09:32:43Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -293,10 +293,12 @@
 		if (!$orders) return;
 
 		$order = $this->Application->recallObject('ord.-inv', null, Array('skip_autoload' => true));
+		/* @var $order OrdersItem */
+
 		foreach ($orders as $ord_id) {
 			$order->Load($ord_id);
 
-			$this->Application->emailAdmin('BACKORDER.FULLFILL');
+			$this->Application->emailAdmin('BACKORDER.FULLFILL', null, $order->getEmailParams());
 
 			//reserve what's possible in any case
 			$event = new kEvent('ord:OnReserveItems');
@@ -752,6 +754,7 @@
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
+	 * @todo Might be not used anymore
 	 */
 	function OnRecommendProduct($event)
 	{
@@ -773,9 +776,12 @@
 		$send_params['message']=$my_message;
 
 		if ( preg_match('/' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . '/', $friend_email) ) {
+			$product = $this->Application->recallObject('p');
+			/* @var $product ProductsItem */
+
 			$user_id = $this->Application->RecallVar('user_id');
-			$email_sent = $this->Application->emailUser('PRODUCT.SUGGEST', $user_id, $send_params);
-			$this->Application->emailAdmin('PRODUCT.SUGGEST');
+			$email_sent = $this->Application->emailUser('PRODUCT.SUGGEST', $user_id, $product->getEmailParams($send_params));
+			$this->Application->emailAdmin('PRODUCT.SUGGEST', null, $product->getEmailParams());
 
 			if ( $email_sent ) {
 				$event->setRedirectParams(Array ('opener' => 's', 'pass' => 'all'));
Index: branches/5.3.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r15925 -r15936
--- branches/5.3.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15925)
+++ branches/5.3.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15936)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 15925 2013-07-30 10:02:36Z alex $
+* @version	$Id: orders_event_handler.php 15936 2013-08-14 09:32:43Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -382,7 +382,7 @@
 			'to_email' => $billing_email ? $billing_email : $user_email,
 		);
 
-		return $ret;
+		return $order->getEmailParams($ret);
 	}
 
 	function PrepareCoupons($event, &$order)
@@ -489,7 +489,7 @@
 			}
 
 			$this->Application->emailUser('ORDER.SUBMIT', null, $this->OrderEmailParams($order));
-			$this->Application->emailAdmin('ORDER.SUBMIT');
+			$this->Application->emailAdmin('ORDER.SUBMIT', null, $order->getEmailParams());
 		}
 
 		if ($shipping_control === false || $shipping_control == SHIPPING_CONTROL_PREAUTH ) {
@@ -2897,7 +2897,7 @@
 
 				if ($event->Special != 'recurring') { // just in case if admin uses tangible backordered products in recurring orders
 					$this->Application->emailUser('BACKORDER.ADD', null, $this->OrderEmailParams($sub_order));
-		    		$this->Application->emailAdmin('BACKORDER.ADD');
+		    		$this->Application->emailAdmin('BACKORDER.ADD', null, $sub_order->getEmailParams());
 				}
 			}
 			else {
@@ -3535,22 +3535,25 @@
 			/* @var $temp_handler kTempTablesHandler */
 
 			$cloned_order_ids = $temp_handler->CloneItems($event->Prefix, 'recurring', $order_ids);
-			$order =&  $this->Application->recallObject($event->Prefix.'.recurring', null, Array('skip_autoload' => true));
+
+			$order = $this->Application->recallObject($event->Prefix.'.recurring', null, Array('skip_autoload' => true));
+			/* @var $order OrdersItem */
+
 			foreach ($cloned_order_ids as $order_id) {
 				$order->Load($order_id);
 				$this->Application->HandleEvent($complete_event, $event->Prefix.'.recurring:OnCompleteOrder' );
 
 				if ($complete_event->status == kEvent::erSUCCESS) {
 					//send recurring ok email
 					$this->Application->emailUser('ORDER.RECURRING.PROCESSED', null, $this->OrderEmailParams($order));
-					$this->Application->emailAdmin('ORDER.RECURRING.PROCESSED');
+					$this->Application->emailAdmin('ORDER.RECURRING.PROCESSED', null, $order->getEmailParams());
 				}
 				else {
 					//send Recurring failed event
 					$order->SetDBField('Status', ORDER_STATUS_DENIED);
 					$order->Update();
 					$this->Application->emailUser('ORDER.RECURRING.DENIED', null, $this->OrderEmailParams($order));
-					$this->Application->emailAdmin('ORDER.RECURRING.DENIED');
+					$this->Application->emailAdmin('ORDER.RECURRING.DENIED', null, $order->getEmailParams());
 				}
 			}
 
Index: branches/5.3.x/units/affiliates/affiliates_event_handler.php
===================================================================
diff -u -N -r15925 -r15936
--- branches/5.3.x/units/affiliates/affiliates_event_handler.php	(.../affiliates_event_handler.php)	(revision 15925)
+++ branches/5.3.x/units/affiliates/affiliates_event_handler.php	(.../affiliates_event_handler.php)	(revision 15936)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_event_handler.php 15925 2013-07-30 10:02:36Z alex $
+* @version	$Id: affiliates_event_handler.php 15936 2013-08-14 09:32:43Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -349,8 +349,9 @@
 			$object->SetDBField('PortalUserId', $user->GetID());
 
 			if ( $object->Create() ) {
-				$this->Application->emailUser('AFFILIATE.REGISTER', $user->GetID());
-				$this->Application->emailAdmin('AFFILIATE.REGISTER');
+				$send_params = $object->getEmailParams();
+				$this->Application->emailUser('AFFILIATE.REGISTER', $user->GetID(), $send_params);
+				$this->Application->emailAdmin('AFFILIATE.REGISTER', null, $send_params);
 			}
 		}
 
@@ -407,8 +408,9 @@
 				$object = $event->getObject();
 				/* @var $object kDBItem */
 
-				$this->Application->emailUser('AFFILIATE.PAYMENT.TYPE.CHANGED', $object->GetDBField('PortalUserId'));
-				$this->Application->emailAdmin('AFFILIATE.PAYMENT.TYPE.CHANGED');
+				$send_params = $object->getEmailParams();
+				$this->Application->emailUser('AFFILIATE.PAYMENT.TYPE.CHANGED', $object->GetDBField('PortalUserId'), $send_params);
+				$this->Application->emailAdmin('AFFILIATE.PAYMENT.TYPE.CHANGED', null, $send_params);
 
 				$next_template = $this->Application->GetVar('next_template');
 
@@ -451,8 +453,9 @@
 
 			foreach ($new_ids as $payment_id) {
 				$payment_object->Load($payment_id);
-				$this->Application->emailUser('AFFILIATE.PAYMENT', $payment_object->GetDBField('PortalUserId'));
-				$this->Application->emailAdmin('AFFILIATE.PAYMENT');
+				$send_params = $payment_object->getEmailParams();
+				$this->Application->emailUser('AFFILIATE.PAYMENT', $payment_object->GetDBField('PortalUserId'), $send_params);
+				$this->Application->emailAdmin('AFFILIATE.PAYMENT', null, $send_params);
 			}
 
 			$object = $event->getObject();
@@ -470,8 +473,9 @@
 			$old_status = $this->Conn->GetOne($sql);
 
 			if ( $old_status == 2 && $object->GetDBField('Status') == 1 ) {
-				$this->Application->emailUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
-				$this->Application->emailAdmin('AFFILIATE.REGISTRATION.APPROVED');
+				$send_params = $object->getEmailParams();
+				$this->Application->emailUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'), $send_params);
+				$this->Application->emailAdmin('AFFILIATE.REGISTRATION.APPROVED', null, $send_params);
 			}
 		}
 
@@ -619,16 +623,19 @@
 					}
 
 					if ( $object->Update() ) {
+						$send_params = $object->getEmailParams();
+
 						switch ($event->Name) {
 							case 'OnMassApprove':
-								$this->Application->emailUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
-								$this->Application->emailAdmin('AFFILIATE.REGISTRATION.APPROVED');
+								$this->Application->emailUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'), $send_params);
+								$this->Application->emailAdmin('AFFILIATE.REGISTRATION.APPROVED', null, $send_params);
 								break;
 							case 'OnMassDecline':
-								$this->Application->emailUser('AFFILIATE.REGISTRATION.DENIED', $object->GetDBField('PortalUserId'));
-								$this->Application->emailAdmin('AFFILIATE.REGISTRATION.DENIED');
+								$this->Application->emailUser('AFFILIATE.REGISTRATION.DENIED', $object->GetDBField('PortalUserId'), $send_params);
+								$this->Application->emailAdmin('AFFILIATE.REGISTRATION.DENIED', null, $send_params);
 								break;
 						}
+
 						$event->status = kEvent::erSUCCESS;
 						$event->SetRedirectParam('opener', 's'); //stay!
 					}
Index: branches/5.3.x/units/gift_certificates/gift_certificates_eh.php
===================================================================
diff -u -N -r15925 -r15936
--- branches/5.3.x/units/gift_certificates/gift_certificates_eh.php	(.../gift_certificates_eh.php)	(revision 15925)
+++ branches/5.3.x/units/gift_certificates/gift_certificates_eh.php	(.../gift_certificates_eh.php)	(revision 15936)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: gift_certificates_eh.php 15925 2013-07-30 10:02:36Z alex $
+* @version	$Id: gift_certificates_eh.php 15936 2013-08-14 09:32:43Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -181,13 +181,13 @@
 		foreach ($ids as $id) {
 			$object->Load($id);
 
-			$send_params = Array (
+			$send_params = $object->getEmailParams(Array (
 				'from_email' => $this->Application->ConfigValue('DefaultEmailSender'),
 				'from_name' => $object->GetDBField('Purchaser'),
 				'message' => $object->GetDBField('Message'),
 				'amount' => $object->GetField('Amount'),
 				'gifcert_id' => $object->GetDBField('Code'),
-			);
+			));
 
 			$this->Application->emailAdmin('USER.GIFTCERTIFICATE', null, $send_params);