Index: branches/RC/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -N -r11661 -r11677
--- branches/RC/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 11661)
+++ branches/RC/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 11677)
@@ -19,7 +19,7 @@
 		'TitleField' => 'Subject',
 
 		'TitlePresets' => Array (
-			'email_messages_direct_list' => Array ('prefixes' => Array ('emailmessages.module_List'), 'format' => "!la_title_EmailMessages!"),
+			'email_messages_direct_list' => Array ('prefixes' => Array ('emailmessages.st_List'), 'format' => "!la_title_EmailMessages!"),
 			'email_messages_edit_direct' => Array (
 				'prefixes' => Array ('emailmessages'),
 				'new_status_labels' => Array ('emailmessages' => '!la_title_Adding_E-mail!'),
@@ -33,7 +33,7 @@
 				'parent'		=>	'in-portal:site',
 				'icon'			=>	'core:e-mail',
 				'label'			=>	'la_tab_E-mails',
-				'url'			=>	Array('t' => 'config/email_events', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array('t' => 'languages/email_message_list', 'pass' => 'm'),
 				'permissions'	=>	Array('view', 'edit'),
 				'priority'		=>	6,
 				'type'			=>	stTREE,
Index: branches/RC/core/admin_templates/incs/blocks.tpl
===================================================================
diff -u -N -r10865 -r11677
--- branches/RC/core/admin_templates/incs/blocks.tpl	(.../blocks.tpl)	(revision 10865)
+++ branches/RC/core/admin_templates/incs/blocks.tpl	(.../blocks.tpl)	(revision 11677)
@@ -1,12 +1,12 @@
-<inp2:m_DefineElement name="kernel_form" style="">
+<inp2:m_DefineElement name="kernel_form" style="display: inline;">
 	<inp2:m_if check="m_ParamEquals" name="form_name" value="" inverse="inverse">
 		<inp2:m_set form_name="$form_name"/>
 	<inp2:m_else/>
 		<inp2:m_set form_name="kernel_form"/>
 	</inp2:m_if>
 
-	<form style="<inp2:m_Param name="style"/>" id="<inp2:m_get name="form_name"/>" name="<inp2:m_get name="form_name"/>" enctype="multipart/form-data" method="post" action="<inp2:m_t pass="all"/>">
-		<input type="hidden" name="MAX_FILE_SIZE" id="MAX_FILE_SIZE" value="<inp2:m_getconst name="MAX_UPLOAD_SIZE"/>" />
+	<form style="<inp2:m_Param name='style'/>" id="<inp2:m_get name='form_name'/>" name="<inp2:m_get name='form_name'/>" enctype="multipart/form-data" method="post" action="<inp2:m_t pass='all'/>">
+		<input type="hidden" name="MAX_FILE_SIZE" id="MAX_FILE_SIZE" value="<inp2:m_getconst name='MAX_UPLOAD_SIZE'/>" />
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="kernel_form_end">
Index: branches/RC/core/admin_templates/languages/phrase_list.tpl
===================================================================
diff -u -N -r11623 -r11677
--- branches/RC/core/admin_templates/languages/phrase_list.tpl	(.../phrase_list.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/languages/phrase_list.tpl	(.../phrase_list.tpl)	(revision 11677)
@@ -1,5 +1,5 @@
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:phrases" pagination="1" grid="Phrases" prefix="phrases.st" title_preset=""/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:phrases" pagination="1" grid="Phrases" prefix="phrases.st" title_preset="phrases_list_st"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
Index: branches/RC/core/admin_templates/languages/email_message_edit.tpl
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/languages/email_message_edit.tpl	(revision 0)
+++ branches/RC/core/admin_templates/languages/email_message_edit.tpl	(revision 11677)
@@ -0,0 +1,58 @@
+<inp2:adm_SetPopupSize width="875" height="650"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" prefix="emailmessages" title_preset="email_messages_edit_direct"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('emailmessages','<inp2:emailmessages_SaveEvent/>');
+						}
+					) );
+
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							cancel_edit('emailmessages','OnCancelEdit','<inp2:emailmessages_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+						}
+				 ) );
+
+
+				a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
+						reset_form('emailmessages', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+					}
+			 	) );
+
+				a_toolbar.Render();
+
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:emailmessages_SaveWarning name="grid_save_warning"/>
+<inp2:emailmessages_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailmessages" field="LanguageId"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailmessages" field="EventId"/>
+
+			<inp2:m_RenderElement name="inp_label" prefix="emailmessages" field="Description" title="!la_fld_Description!" as_label="1"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="emailmessages" field="Subject" title="!la_fld_Subject!" size="60"/>
+			<!--<inp2:m_RenderElement name="inp_edit_radio" prefix="emailmessages" field="MessageType" title="!la_fld_MessageType!"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="Headers" title="!la_fld_ExtraHeaders!" rows="5" cols="60"/>-->
+		<inp2:m_RenderElement name="subsection" title="!la_section_Message!"/>
+
+		<inp2:m_RenderElement name="inp_edit_fck" prefix="emailmessages" field="Body" title="!la_fld_ExtraHeaders!" rows="5" cols="60" control_options="{min_height: 200}"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
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);
+			}
 		}
 
 		/**
Index: branches/RC/core/admin_templates/config/email_messages_edit.tpl
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/config/email_messages_edit.tpl	(revision 11623)
+++ branches/RC/core/admin_templates/config/email_messages_edit.tpl	(revision 0)
@@ -1,57 +0,0 @@
-<inp2:adm_SetPopupSize width="600" height="460"/>
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" prefix="emailmessages" title_preset="email_messages_edit_direct"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('emailmessages','<inp2:emailmessages_SaveEvent/>');
-						}
-					) );
-
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							cancel_edit('emailmessages','OnCancelEdit','<inp2:emailmessages_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
-						}
-				 ) );
-
-
-				a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
-						reset_form('emailmessages', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
-					}
-			 	) );
-
-				a_toolbar.Render();
-
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<inp2:emailmessages_SaveWarning name="grid_save_warning"/>
-<inp2:emailmessages_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailmessages" field="LanguageId"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailmessages" field="EventId"/>
-
-			<inp2:m_RenderElement name="inp_label" prefix="emailmessages" field="Description" title="!la_fld_Description!" as_label="1"/>
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="emailmessages" field="Subject" title="!la_fld_Subject!" size="60"/>
-			<!--<inp2:m_RenderElement name="inp_edit_radio" prefix="emailmessages" field="MessageType" title="!la_fld_MessageType!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="Headers" title="!la_fld_ExtraHeaders!" rows="5" cols="60"/>-->
-		<inp2:m_RenderElement name="subsection" title="!la_section_Message!"/>
-
-		<inp2:m_RenderElement name="inp_edit_fck" prefix="emailmessages" field="Body" title="!la_fld_ExtraHeaders!" rows="5" cols="60" control_options="{min_height: 200}"/>
-		<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/languages/email_message_list.tpl
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/languages/email_message_list.tpl	(revision 0)
+++ branches/RC/core/admin_templates/languages/email_message_list.tpl	(revision 11677)
@@ -0,0 +1,40 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" pagination="1" prefix="emailmessages.st" grid="Emails" title_preset="email_messages_direct_list"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+
+  				function edit()
+	  			{
+	  				set_hidden_field('remove_specials[emailmessages.st]', 1);
+	  				std_edit_item('emailmessages.st', 'languages/email_message_edit');
+	  			}
+
+  				a_toolbar = new ToolBar();
+					a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
+
+					a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+					a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+								show_viewmenu(a_toolbar,'view');
+							}
+					) );
+
+					a_toolbar.Render();
+
+			</script>
+		</td>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="emailmessages.st" grid="Emails"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="emailmessages.st" IdField="EmailMessageId" grid="Emails" />
+<script type="text/javascript">
+	Grids['emailmessages.st'].SetDependantToolbarButtons( new Array('edit') );
+</script>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/config/email_events.tpl
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/config/email_events.tpl	(revision 11623)
+++ branches/RC/core/admin_templates/config/email_events.tpl	(revision 0)
@@ -1,40 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" pagination="1" prefix="emailmessages.module" grid="Emails" title_preset="email_messages_direct_list"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-
-  				function edit()
-	  			{
-	  				set_hidden_field('remove_specials[emailmessages.module]', 1);
-	  				std_edit_item('emailmessages.module', 'config/email_messages_edit');
-	  			}
-
-  				a_toolbar = new ToolBar();
-					a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
-
-					a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-
-					a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
-								show_viewmenu(a_toolbar,'view');
-							}
-					) );
-
-					a_toolbar.Render();
-
-			</script>
-		</td>
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="emailmessages.module" grid="Emails"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_RenderElement name="grid" PrefixSpecial="emailmessages.module" IdField="EmailMessageId" grid="Emails" />
-<script type="text/javascript">
-	Grids['emailmessages.module'].SetDependantToolbarButtons( new Array('edit') );
-</script>
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file