Index: branches/5.1.x/core/admin_templates/languages/email_message_list.tpl
===================================================================
diff -u -N -r13140 -r13635
--- branches/5.1.x/core/admin_templates/languages/email_message_list.tpl	(.../email_message_list.tpl)	(revision 13140)
+++ branches/5.1.x/core/admin_templates/languages/email_message_list.tpl	(.../email_message_list.tpl)	(revision 13635)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header"/>
 
-<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"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" pagination="1" prefix="emailevents" grid="Emails" title_preset="email_message_list" additional_blue_bar_render_as="grid_ml_selector"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -14,30 +14,41 @@
 
   				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');
-						}
-					)
-				);
+  				<inp2:m_if check="m_IsDebugMode">
+	  				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');
+							}
+						)
+					);
+				</inp2:m_if>
 
-				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');
-						}
+						'edit',
+						'<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>',
+						edit
 					)
 				);
 
 				<inp2:m_if check="m_IsDebugMode">
-					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+					a_toolbar.AddButton(
+						new ToolBarButton(
+							'delete',
+							'<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+							function() {
+								std_delete_items('emailevents');
+							}
+						)
+					);
+				</inp2:m_if>
 
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				<inp2:m_if check="m_IsDebugMode">
 					a_toolbar.AddButton(
 						new ToolBarButton(
 							'approve',
@@ -59,12 +70,27 @@
 					);
 				</inp2:m_if>
 
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'frontend_mail',
+						'<inp2:m_phrase label="la_ToolTip_Email_FrontOnly" escape="1"/>',
+						function() {
+							submit_event('emailevents', 'OnFrontOnly');
+						}
+					)
+				);
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'view',
+						'<inp2:m_phrase label="la_ToolTip_View" escape="1"/>',
+						function() {
 							show_viewmenu(a_toolbar,'view');
 						}
-				) );
+					)
+				);
 
 				a_toolbar.Render();
 
@@ -93,6 +119,6 @@
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="emailevents" IdField="EventId" grid="Emails" row_class_render_as="row_class"/>
 <script type="text/javascript">
-	Grids['emailevents'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline') );
+	Grids['emailevents'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline', 'frontend_mail') );
 </script>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file