Index: branches/5.3.x/core/units/email_templates/email_template_tp.php
===================================================================
diff -u -N -r15677 -r15698
--- branches/5.3.x/core/units/email_templates/email_template_tp.php	(.../email_template_tp.php)	(revision 15677)
+++ branches/5.3.x/core/units/email_templates/email_template_tp.php	(.../email_template_tp.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_template_tp.php 15608 2012-11-06 17:21:28Z alex $
+* @version	$Id: email_template_tp.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -24,16 +24,16 @@
 		function ModifyUnitConfig($params)
 		{
 			if ( !$this->Application->isDebugMode() ) {
-				$grids = $this->Application->getUnitOption($this->Prefix, 'Grids', Array ());
-				/* @var $grids Array */
+				$config = $this->getUnitConfig();
+				$grids = $config->getGrids(Array ());
 
 				foreach ($grids as $grid_name => $grid_data) {
 					if ( array_key_exists('Enabled', $grid_data['Fields']) ) {
 						unset($grids[$grid_name]['Fields']['Enabled']);
 					}
 				}
 
-				$this->Application->setUnitOption($this->Prefix, 'Grids', $grids);
+				$config->setGrids($grids);
 			}
 		}
 
@@ -93,8 +93,9 @@
 			/* @var $object kDBItem */
 
 			$field_options = $object->GetFieldOptions('RecipientType');
-			$virtual_fields = $this->Application->getUnitOption($this->Prefix, 'VirtualFields');
-			$field_options['options'] = $virtual_fields['RecipientType']['options'];
+			$virtual_field_options = $this->getUnitConfig()->getVirtualFieldByName('RecipientType');
+
+			$field_options['options'] = $virtual_field_options['options'];
 			$object->SetFieldOptions('RecipientType', $field_options);
 		}