Index: branches/RC/core/units/email_messages/email_messages_event_handler.php
===================================================================
diff -u -N -r10194 -r10533
--- branches/RC/core/units/email_messages/email_messages_event_handler.php	(.../email_messages_event_handler.php)	(revision 10194)
+++ branches/RC/core/units/email_messages/email_messages_event_handler.php	(.../email_messages_event_handler.php)	(revision 10533)
@@ -10,23 +10,23 @@
 		 */
 		function getPassedID(&$event)
 		{
+			$event->setEventParam('raise_warnings', 0);
+
 			$parent = parent::getPassedID($event);
-			if ($parent) return $parent;
+			if ($parent) {
+				return $parent;
+			}
 
 			$email_event_id = (int)$this->getEmailEventId();
 			$object =& $event->getObject();
 
 			$parent_info = $object->getLinkedInfo();
 
-			$sql = 'SELECT '.$object->IDField.' FROM '.$object->TableName.' WHERE ('.$parent_info['ForeignKey'].' = '.$parent_info['ParentId'].') AND (EventId = '.$email_event_id.')';
+			$sql = 'SELECT '.$object->IDField.'
+					FROM '.$object->TableName.'
+					WHERE ('.$parent_info['ForeignKey'].' = '.$parent_info['ParentId'].') AND (EventId = '.$email_event_id.')';
 
-			$id = (int)$this->Conn->GetOne($sql);
-			if(!$id)
-			{
-				$object->SetDBField('EventId', $email_event_id);
-				$object->SetDBField('Headers', $this->Application->ConfigValue('Smtp_DefaultHeaders') );
-			}
-			return $id;
+			return (int)$this->Conn->GetOne($sql);
 		}
 
 		function getEmailEventId()
@@ -77,6 +77,7 @@
 			/* @var $object kDBItem */
 
 			$object->SetDBField('EventId', $this->getEmailEventId());
+			$object->SetDBField('Headers', $this->Application->ConfigValue('Smtp_DefaultHeaders') );
 		}
 
 		/**