Index: branches/RC/core/admin_templates/config/config_email.tpl
===================================================================
diff -u -r11133 -r11538
--- branches/RC/core/admin_templates/config/config_email.tpl	(.../config_email.tpl)	(revision 11133)
+++ branches/RC/core/admin_templates/config/config_email.tpl	(.../config_email.tpl)	(revision 11538)
@@ -1,8 +1,7 @@
-<inp2:m_RequireLogin perm_event="emailevents:OnLoad" system="1"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="section_header" prefix="emailevents.module" module="in-portal" icon="icon46_settings_email" title="!la_title_emailevents!"/>
 
-<inp2:m_RenderElement name="blue_bar" prefix="emailevents.module" emailevents.module[grid]="Default" title_preset="email_settings_list" icon="icon46_settings_email"/>
+<inp2:m_Get name="section" result_to_var="section"/>
+<inp2:m_RenderElement name="combined_header" prefix="emailevents.module" section="$section" perm_event="emailevents:OnLoad" grid="EmailSettings" title_preset="email_settings_list" pagination="1"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -22,7 +21,7 @@
 				 ) );
 
 
-				//a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Enable" escape="1"/>', function() {
 							submit_event('emailevents.module','OnMassApprove');
@@ -49,6 +48,7 @@
 				a_toolbar.Render();
 			</script>
 		</td>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="emailevents.module" grid="EmailSettings"/>
 	</tr>
 </tbody>
 </table>