Index: branches/5.2.x/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r15252 -r15268
--- branches/5.2.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 15252)
+++ branches/5.2.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 15268)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_event_handler.php 15252 2012-03-30 17:49:37Z alex $
+* @version	$Id: email_events_event_handler.php 15268 2012-04-04 13:55:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -709,8 +709,18 @@
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
-			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'EmailEventSubscribers
+			$sql = 'SELECT SubscriptionId
+					FROM ' . TABLE_PREFIX . 'SystemEventSubscriptions
 					WHERE EmailEventId = ' . $object->GetID();
-			$this->Conn->Query($sql);
+			$ids = $this->Conn->GetCol($sql);
+
+			if ( !$ids ) {
+				return;
+			}
+
+			$temp_handler = $this->Application->recallObject('system-event-subscription_TempHandler', 'kTempTablesHandler');
+			/* @var $temp_handler kTempTablesHandler */
+
+			$temp_handler->DeleteItems('system-event-subscription', '', $ids);
 		}
 	}
\ No newline at end of file