Index: branches/5.2.x/units/gateways/gw_classes/rightconnect.php
===================================================================
diff -u -N -r14258 -r14940
--- branches/5.2.x/units/gateways/gw_classes/rightconnect.php	(.../rightconnect.php)	(revision 14258)
+++ branches/5.2.x/units/gateways/gw_classes/rightconnect.php	(.../rightconnect.php)	(revision 14940)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: rightconnect.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: rightconnect.php 14940 2011-12-29 12:46:25Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -107,7 +107,7 @@
 			$post_fields['customer_addr'] = $item_data['OrderIP']; // according to fields list in doc
 			$post_fields['customer_ip'] = $item_data['OrderIP']; // according to example from doc
 			$post_fields["email"] = $item_data['BillingEmail'];
-			$post_fields["ADMIN_EMAIL"] = $this->Application->ConfigValue('Smtp_AdminMailFrom');
+			$post_fields["ADMIN_EMAIL"] = $this->Application->ConfigValue('DefaultEmailSender');
 
 			$curl_helper =& $this->Application->recallObject('CurlHelper');
 			/* @var $curl_helper kCurlHelper */
Index: branches/5.2.x/units/gift_certificates/gift_certificates_eh.php
===================================================================
diff -u -N -r14677 -r14940
--- branches/5.2.x/units/gift_certificates/gift_certificates_eh.php	(.../gift_certificates_eh.php)	(revision 14677)
+++ branches/5.2.x/units/gift_certificates/gift_certificates_eh.php	(.../gift_certificates_eh.php)	(revision 14940)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: gift_certificates_eh.php 14677 2011-10-19 08:32:00Z alex $
+* @version	$Id: gift_certificates_eh.php 14940 2011-12-29 12:46:25Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -178,7 +178,7 @@
 			$object->Load($id);
 
 			$send_params = Array (
-				'from_email' => $this->Application->ConfigValue('Smtp_AdminMailFrom'),
+				'from_email' => $this->Application->ConfigValue('DefaultEmailSender'),
 				'from_name' => $object->GetDBField('Purchaser'),
 				'to_email' => $object->GetDBField('RecipientEmail'),
 				'to_name' => $object->GetDBField('Recipient'),
Index: branches/5.2.x/units/orders/orders_tag_processor.php
===================================================================
diff -u -N -r14883 -r14940
--- branches/5.2.x/units/orders/orders_tag_processor.php	(.../orders_tag_processor.php)	(revision 14883)
+++ branches/5.2.x/units/orders/orders_tag_processor.php	(.../orders_tag_processor.php)	(revision 14940)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_tag_processor.php 14883 2011-12-19 10:27:51Z alex $
+* @version	$Id: orders_tag_processor.php 14940 2011-12-29 12:46:25Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1242,7 +1242,7 @@
 			}
 
 			$from_name = strip_tags($this->Application->ConfigValue('Site_Name'));
-			$from_email = $this->Application->ConfigValue('Smtp_AdminMailFrom');
+			$from_email = $this->Application->ConfigValue('DefaultEmailSender');
 
 			$to_name = $order->GetDBField('BillingTo');
 			$to_email = $order->GetDBField('BillingEmail');