Index: branches/5.1.x/core/admin_templates/languages/email_message_list.tpl
===================================================================
diff -u -N -r12657 -r13140
--- branches/5.1.x/core/admin_templates/languages/email_message_list.tpl	(.../email_message_list.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/languages/email_message_list.tpl	(.../email_message_list.tpl)	(revision 13140)
@@ -1,21 +1,39 @@
 <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"/>
 
+<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" pagination="1" prefix="emailevents" grid="Emails" title_preset="email_messages_direct_list" additional_blue_bar_render_as="grid_ml_selector"/>
+
 <!-- 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');
+  				function edit() {
+	  				std_edit_item('emailevents', 'languages/email_message_edit');
 	  			}
 
   				a_toolbar = new ToolBar();
+
+  				a_toolbar.AddButton(
+  		  			new ToolBarButton(
+  		  		  		'new_item',
+  		  		  		'<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('emailevents', 'languages/email_message_edit');
+						}
+					)
+				);
+
 				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 ToolBarButton(
+						'delete',
+						'<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('emailevents');
+						}
+					)
+				);
 
 				<inp2:m_if check="m_IsDebugMode">
 					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
@@ -25,8 +43,7 @@
 							'approve',
 							'<inp2:m_phrase label="la_ToolTip_Enable" escape="1"/>',
 							function() {
-								set_hidden_field('remove_specials[emailmessages.st]', 1);
-								submit_event('emailmessages.st', 'OnMassApprove');
+								submit_event('emailevents', 'OnMassApprove');
 							}
 						)
 					);
@@ -36,8 +53,7 @@
 							'decline',
 							'<inp2:m_phrase label="la_ToolTip_Disable" escape="1"/>',
 							function() {
-								set_hidden_field('remove_specials[emailmessages.st]', 1);
-								submit_event('emailmessages.st', 'OnMassDecline');
+								submit_event('emailevents', 'OnMassDecline');
 							}
 						)
 					);
@@ -54,7 +70,7 @@
 
 			</script>
 		</td>
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="emailmessages.st" grid="Emails"/>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="emailevents" grid="Emails"/>
 	</tr>
 </tbody>
 </table>
@@ -75,8 +91,8 @@
 	</inp2:m_ifnot>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="emailmessages.st" IdField="EmailMessageId" grid="Emails" row_class_render_as="row_class"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="emailevents" IdField="EventId" grid="Emails" row_class_render_as="row_class"/>
 <script type="text/javascript">
-	Grids['emailmessages.st'].SetDependantToolbarButtons( new Array('edit', 'approve', 'decline') );
+	Grids['emailevents'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline') );
 </script>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file