Index: trunk/core/units/email_messages/email_messages_event_handler.php
===================================================================
diff -u -N -r6625 -r7391
--- trunk/core/units/email_messages/email_messages_event_handler.php	(.../email_messages_event_handler.php)	(revision 6625)
+++ trunk/core/units/email_messages/email_messages_event_handler.php	(.../email_messages_event_handler.php)	(revision 7391)
@@ -10,6 +10,9 @@
 		 */
 		function getPassedID(&$event)
 		{
+			$parent = parent::getPassedID($event);
+			if ($parent) return $parent;
+
 			$email_event_id = (int)$this->getEmailEventId();
 			$object =& $event->getObject();
 
@@ -32,6 +35,22 @@
 		}
 
 		/**
+		 * Apply any custom changes to list's sql query
+		 *
+		 * @param kEvent $event
+		 * @access protected
+		 * @see OnListBuild
+		 */
+		function SetCustomQuery(&$event)
+		{
+			if ($event->Special == 'module') {
+				$object =& $event->getObject();
+				$module = $this->Application->GetVar('module');
+				$object->addFilter('module_filter', 'Module = '.$this->Conn->qstr($module));
+			}
+		}
+
+		/**
 		 * If loading empty item, then set parent id
 		 *
 		 * @param kEvent $event