Index: branches/RC/core/units/email_messages/email_messages_event_handler.php
===================================================================
diff -u -N -r11657 -r11677
--- branches/RC/core/units/email_messages/email_messages_event_handler.php	(.../email_messages_event_handler.php)	(revision 11657)
+++ branches/RC/core/units/email_messages/email_messages_event_handler.php	(.../email_messages_event_handler.php)	(revision 11677)
@@ -43,11 +43,17 @@
 		 */
 		function SetCustomQuery(&$event)
 		{
+			$object =& $event->getObject();
+			/* @var $object kDBList */
+
 			if ($event->Special == 'module') {
-				$object =& $event->getObject();
 				$module = $this->Application->GetVar('module');
-				$object->addFilter('module_filter', 'Module = '.$this->Conn->qstr($module));
+				$object->addFilter('module_filter', 'Module = ' . $this->Conn->qstr($module));
 			}
+
+			if ($event->Special == 'st') {
+				$object->addFilter('enabled_filter', TABLE_PREFIX . 'Events.Enabled <> ' . STATUS_DISABLED);
+			}
 		}
 
 		/**