Index: branches/5.3.x/units/private_messages/private_message_eh.php
===================================================================
diff -u -N -r15670 -r15694
--- branches/5.3.x/units/private_messages/private_message_eh.php	(.../private_message_eh.php)	(revision 15670)
+++ branches/5.3.x/units/private_messages/private_message_eh.php	(.../private_message_eh.php)	(revision 15694)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: private_message_eh.php 15670 2013-01-17 08:35:40Z alex $
+* @version	$Id: private_message_eh.php 15694 2013-02-19 11:30:18Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -217,12 +217,11 @@
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
-			$body_idfield = $this->Application->getUnitOption($event->Prefix . '-body', 'IDField');
-			$body_table = $this->Application->getUnitOption($event->Prefix . '-body', 'TableName');
+			$config = $this->Application->getUnitConfig($event->Prefix . '-body');
 
-			$sql = 'UPDATE ' . $body_table . '
+			$sql = 'UPDATE ' . $config->getTableName() . '
 	    			SET ReferenceCount = ReferenceCount - 1
-	    			WHERE ' . $body_idfield . ' = ' . $object->GetDBField('PMBodyId');
+	    			WHERE ' . $config->getIDField() . ' = ' . $object->GetDBField('PMBodyId');
 			$this->Conn->Query($sql);
 		}
 
@@ -237,11 +236,13 @@
 		{
 			parent::OnAfterConfigRead($event);
 
-			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields');
+			$config = $event->getUnitConfig();
+
+			$virtual_fields = $config->getVirtualFields();
 			$virtual_fields['DisableBBCodes']['default'] = (int)!$this->Application->RecallPersistentVar('bbcode');
 			$virtual_fields['DisableSmileys']['default'] = (int)!$this->Application->RecallPersistentVar('smileys');
 			$virtual_fields['ShowSignatures']['default'] = (int)$this->Application->RecallPersistentVar('show_sig');
-			$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields);
+			$config->setVirtualFields($virtual_fields);
 		}
 
 		/**