Index: branches/5.2.x/core/kernel/managers/cache_manager.php
===================================================================
diff -u -N -r14934 -r14941
--- branches/5.2.x/core/kernel/managers/cache_manager.php	(.../cache_manager.php)	(revision 14934)
+++ branches/5.2.x/core/kernel/managers/cache_manager.php	(.../cache_manager.php)	(revision 14941)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cache_manager.php 14934 2011-12-28 18:06:28Z alex $
+* @version	$Id: cache_manager.php 14941 2011-12-29 12:47:14Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -169,10 +169,15 @@
 	 */
 	public function ConfigValue($name)
 	{
-		if ($name == 'Smtp_AdminMailFrom') {
-			$res = $this->Application->siteDomainField('AdminEmail');
+		$site_domain_override = Array (
+			'DefaultEmailSender' => 'AdminEmail',
+			'DefaultEmailRecipients' => 'DefaultEmailRecipients',
+		);
 
-			if ($res) {
+		if ( isset($site_domain_override[$name]) ) {
+			$res = $this->Application->siteDomainField($site_domain_override[$name]);
+
+			if ( $res ) {
 				return $res;
 			}
 		}
@@ -191,7 +196,7 @@
 				WHERE VariableName = ' . $this->Conn->qstr($name);
 		$res = $this->Conn->GetRow($sql);
 
-		if ($res !== false) {
+		if ( $res !== false ) {
 			$this->configIDs[] = $res['VariableId'];
 			$this->configVariables[$name] = $res['VariableValue'];