Index: trunk/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r3391 -r4207
--- trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 3391)
+++ trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 4207)
@@ -12,12 +12,10 @@
 		 */
 		function SetCustomQuery(&$event)
 		{
-			if($event->Special == 'module')
-			{
+			if ($event->Special == 'module') {
 				$object =& $event->getObject();
-				$this->Application->LinkVar('module', 'current_module');
-				$module = $this->Application->GetVar('module');
-				$object->addFilter('module_filter', '%1$s.Module = \''.$module.'\'');
+				$module_owner = $this->Application->GetLinkedVar('module');
+				$object->addFilter('module_filter', '%1$s.Module = '.$this->Conn->qstr($module_owner));
 			}
 		}