Index: branches/5.1.x/core/admin_templates/config/config_email.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/config/config_email.tpl	(.../config_email.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/config/config_email.tpl	(.../config_email.tpl)	(revision 12657)
@@ -7,43 +7,77 @@
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
-  	<td>
-  		<script type="text/javascript">
-  			//do not rename - this function is used in default grid for double click!
-  			function edit()
-  			{
-  				openSelector('emailevents.module', '<inp2:m_t t="user_selector" pass="all,emailevents.module" escape="1"/>', 'FromUserId', null, 'OnSaveSelected');
-  			}
+  		<td>
+	  		<script type="text/javascript">
+				//do not rename - this function is used in default grid for double click!
+	  			function edit() {
+	  				Application.SetVar('remove_specials[emailevents.module]', 1);
+	  				std_edit_item('emailevents.module', 'config/config_email_edit');
+	  			}
 
-  			var a_toolbar = new ToolBar();
+	  			var a_toolbar = new ToolBar();
 
-				a_toolbar.AddButton( new ToolBarButton('usertogroup', '<inp2:m_phrase label="la_ToolTip_SelectUser" escape="1"/>', edit
-				 ) );
+	  			a_toolbar.AddButton(
+					new ToolBarButton(
+						'edit',
+						'<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>',
+						edit
+					)
+				);
 
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'select_user',
+						'<inp2:m_phrase label="la_ToolTip_SelectUser" escape="1"/>',
+						function () {
+							openSelector('emailevents.module', '<inp2:m_t t="user_selector" pass="all,emailevents.module" escape="1"/>', 'FromUserId', null, 'OnSaveSelected');
+						}
+					)
+				);
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
-				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Enable" escape="1"/>', function() {
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'approve',
+						'<inp2:m_phrase label="la_ToolTip_Enable" escape="1"/>',
+						function() {
 							submit_event('emailevents.module','OnMassApprove');
 						}
-				 ) );
+					)
+				);
 
-				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Disable" escape="1"/>', function() {
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'decline',
+						'<inp2:m_phrase label="la_ToolTip_Disable" escape="1"/>',
+						function() {
 							submit_event('emailevents.module','OnMassDecline');
 						}
-				 ) );
+					)
+				);
 
-				a_toolbar.AddButton( new ToolBarButton('frontend_mail', '<inp2:m_phrase label="la_ToolTip_Email_FrontOnly" escape="1"/>', function() {
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'frontend_mail',
+						'<inp2:m_phrase label="la_ToolTip_Email_FrontOnly" escape="1"/>',
+						function() {
 							submit_event('emailevents.module','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();
 			</script>
@@ -53,11 +87,19 @@
 </tbody>
 </table>
 
+<inp2:m_DefineElement name="from_user_td">
+	<inp2:m_if check="Field" name="$field" db="db" equals_to="">
+		Root
+	<inp2:m_else/>
+		<inp2:Field name="$field"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
 <inp2:m_RenderElement name="grid" PrefixSpecial="emailevents.module" IdField="EventId" grid="EmailSettings" menu_filters="yes"/>
 <script type="text/javascript">
-	Grids['emailevents.module'].SetDependantToolbarButtons( new Array('frontend_mail','usertogroup','approve','decline') );
+	Grids['emailevents.module'].SetDependantToolbarButtons( new Array('frontend_mail', 'select_user', 'approve', 'decline', 'edit') );
 </script>
 
-<input type="hidden" name="emailevents.module_PopupSelectedUser" value="">
+<input type="hidden" name="emailevents.module_PopupSelectedUser" value=""/>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file