Index: trunk/kernel/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r2984 -r2991
--- trunk/kernel/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 2984)
+++ trunk/kernel/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 2991)
@@ -15,7 +15,9 @@
 			if($event->Special == 'module')
 			{
 				$object =& $event->getObject();
-				$object->addFilter('module_filter', '%1$s.Module = \'In-Commerce\'');
+				$this->Application->LinkVar('module', 'current_module');
+				$module=$this->Application->GetVar('module');
+				$object->addFilter('module_filter', '%1$s.Module = \''.$module.'\'');
 			}
 		}
 
Index: trunk/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r2984 -r2991
--- trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 2984)
+++ trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 2991)
@@ -15,7 +15,9 @@
 			if($event->Special == 'module')
 			{
 				$object =& $event->getObject();
-				$object->addFilter('module_filter', '%1$s.Module = \'In-Commerce\'');
+				$this->Application->LinkVar('module', 'current_module');
+				$module=$this->Application->GetVar('module');
+				$object->addFilter('module_filter', '%1$s.Module = \''.$module.'\'');
 			}
 		}