Index: trunk/kernel/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r3032 -r3046
--- trunk/kernel/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 3032)
+++ trunk/kernel/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 3046)
@@ -116,13 +116,13 @@
 			$old_autoload = $this->Application->getUnitOption('u', 'AutoLoad');
 			$this->Application->setUnitOption('u', 'AutoLoad', false);
 
-			$from_user_object = &$this->Application->recallObject('u.-item');
+			$from_user_object = &$this->Application->recallObject('u.-email'.$from_user_id);
 			$from_user_object->Load($from_user_id);
 			// here if we don't have from_user loaded, it takes a default user from config values
-			$from_user_email = $from_user_object->GetDBField('Email')?$from_user_object->GetDBField('Email'):$this->Application->ConfigValue('Smtp_AdminMailFrom');
+			$from_user_email = $from_user_object->GetDBField('Email') ? $from_user_object->GetDBField('Email') : $this->Application->ConfigValue('Smtp_AdminMailFrom');
 			$from_user_name = trim($from_user_object->GetDBField('FirstName').' '.$from_user_object->GetDBField('LastName'));
 
-			$to_user_object = &$this->Application->recallObject('u.-item');
+			$to_user_object = &$this->Application->recallObject('u.-email'.$to_user_id);
 			$to_user_object->Load($to_user_id);
 			$to_user_email = $to_user_object->GetDBField('Email');
 			$to_user_name = trim($to_user_object->GetDBField('FirstName').' '.$to_user_object->GetDBField('LastName'));
Index: trunk/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r3032 -r3046
--- trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 3032)
+++ trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 3046)
@@ -116,13 +116,13 @@
 			$old_autoload = $this->Application->getUnitOption('u', 'AutoLoad');
 			$this->Application->setUnitOption('u', 'AutoLoad', false);
 
-			$from_user_object = &$this->Application->recallObject('u.-item');
+			$from_user_object = &$this->Application->recallObject('u.-email'.$from_user_id);
 			$from_user_object->Load($from_user_id);
 			// here if we don't have from_user loaded, it takes a default user from config values
-			$from_user_email = $from_user_object->GetDBField('Email')?$from_user_object->GetDBField('Email'):$this->Application->ConfigValue('Smtp_AdminMailFrom');
+			$from_user_email = $from_user_object->GetDBField('Email') ? $from_user_object->GetDBField('Email') : $this->Application->ConfigValue('Smtp_AdminMailFrom');
 			$from_user_name = trim($from_user_object->GetDBField('FirstName').' '.$from_user_object->GetDBField('LastName'));
 
-			$to_user_object = &$this->Application->recallObject('u.-item');
+			$to_user_object = &$this->Application->recallObject('u.-email'.$to_user_id);
 			$to_user_object->Load($to_user_id);
 			$to_user_email = $to_user_object->GetDBField('Email');
 			$to_user_name = trim($to_user_object->GetDBField('FirstName').' '.$to_user_object->GetDBField('LastName'));