Index: branches/5.1.x/admin/system_presets/simple/email_events_emailevents.php
===================================================================
diff -u -N -r13140 -r13635
--- branches/5.1.x/admin/system_presets/simple/email_events_emailevents.php	(.../email_events_emailevents.php)	(revision 13140)
+++ branches/5.1.x/admin/system_presets/simple/email_events_emailevents.php	(.../email_events_emailevents.php)	(revision 13635)
@@ -14,45 +14,51 @@
 
 	// toolbar buttons
 	$remove_buttons = Array (
-//		list of all email templates (direct list)
-//		'email_messages_direct_list' => Array ('edit', 'view', 'dbl-click'),
+//		list of all email templates
+//		'email_message_list' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'frontend_mail', 'view', 'dbl-click'),
 
-//		edit email body direct
-//		'email_messages_edit_direct' => Array ('select', 'cancel', 'reset_edit'),
+//		edit email edit - general tab
+//		'email_message_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+
+//		edit email edit - settings tab
+//		'email_message_edit_settings' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
 	);
 
 	// fields to hide
 	$hidden_fields = Array (
-		/*'EventId', 'Event',*/ 'Headers', /*'ReplacementTags', 'Subject', 'Body',*/
-		'MessageType', 'Enabled', 'FrontEndOnly', 'FromUserId', /*'Module',
-		'Description', 'Type',*/
+		/*'EventId', 'Event', 'ReplacementTags', 'AllowChangingSender', 'CustomSender',
+		'SenderName', 'SenderAddressType', 'SenderAddress', 'AllowChangingRecipient',
+		'CustomRecipient', 'Recipients', 'Subject', 'Body', 'Headers', 'MessageType',
+		'Enabled', 'FrontEndOnly', 'Module', 'Description', 'Type'*/
 	);
 
 	// virtual fields to hide
 	$virtual_hidden_fields = Array (
-
+		/*'RecipientType', 'RecipientName', 'RecipientAddressType',
+		'RecipientAddress', 'Tag', 'Replacement', 'ReplacementTagsXML',*/
 	);
 
 	// fields to make required
 	$required_fields = Array (
-		'EventId', 'Event', /*'Headers', 'ReplacementTags',*/ 'Subject', 'Body',
-		'MessageType', /*'Enabled', 'FrontEndOnly', 'FromUserId',*/ 'Module',
-		/*'Description',*/ 'Type',
+		/*'EventId',*/ 'Event', /*'ReplacementTags', 'AllowChangingSender', 'CustomSender',
+		'SenderName', 'SenderAddressType', 'SenderAddress', 'AllowChangingRecipient',
+		'CustomRecipient', 'Recipients',*/ 'Subject', 'Body', /*'Headers',*/ 'MessageType',
+		/*'Enabled', 'FrontEndOnly',*/ 'Module', /*'Description',*/ 'Type'
 	);
 
 	// virtual fields to make required
 	$virtual_required_fields = Array (
-
+		/*'RecipientType', 'RecipientName', 'RecipientAddressType',
+		'RecipientAddress', 'Tag', 'Replacement', 'ReplacementTagsXML',*/
 	);
 
 	// tabs during editing
 	$hide_edit_tabs = Array (
-
+		'Default' => Array (/*'general',*/ 'settings'),
 	);
 
 	// hide columns in grids
 	$hide_columns = Array (
-//		currently not in user
-//		'Default'	=>	Array ('Subject', 'Description', 'Type', ),
-//		'Emails'	=>	Array ('EventId', 'Subject', 'Description', 'Type', ),
+//		'Default'	=>	Array ('EventId', 'Description', 'Event', 'Module', 'Type', 'Enabled'),
+//		'Emails'	=>	Array ('EventId', 'Event', 'Subject', 'Description', 'Type', 'Enabled', 'Module', 'FrontEndOnly'),
 	);
\ No newline at end of file