Index: branches/5.2.x/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -N -r14244 -r14572
--- branches/5.2.x/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 14572)
@@ -20,8 +20,32 @@
 						}
 				 ) );
 
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+				
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+					go_to_id('emailevents', '<inp2:emailevents_PrevId/>');
+					}
+				));
+	
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('emailevents', '<inp2:emailevents_NextId/>');
+					}
+				));
+	
 				a_toolbar.Render();
-
+				
+				<inp2:m_if check="emailevents_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="emailevents_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="emailevents_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
@@ -36,7 +60,7 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="emailevents" field="EventId" title="la_fld_Id"/>
-			<!--## <inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Type" title="la_fld_EventType"/> ##-->
+			<!--## <inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Type" title="la_fld_Type"/> ##-->
 
 			<inp2:lang_Field name="LanguageId" result_to_var="language_id"/>
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="emailevents" field="l{$language_id}_Subject" title="la_fld_Subject" size="60"/>