Index: branches/5.2.x/core/admin_templates/agents/agent_edit.tpl
===================================================================
diff -u -N -r14605 -r14670
--- branches/5.2.x/core/admin_templates/agents/agent_edit.tpl	(.../agent_edit.tpl)	(revision 14605)
+++ branches/5.2.x/core/admin_templates/agents/agent_edit.tpl	(.../agent_edit.tpl)	(revision 14670)
@@ -1,4 +1,4 @@
-<inp2:adm_SetPopupSize width="550" height="400"/>
+<inp2:adm_SetPopupSize width="750" height="600"/>
 <inp2:m_include t="incs/header"/>
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:agents" prefix="agent" title_preset="agent_edit"/>
@@ -82,7 +82,12 @@
 		<inp2:m_RenderElement name="inp_label" prefix="agent" field="LastRunStatus"/>
 		<inp2:m_RenderElement name="inp_edit_date_time" prefix="agent" field="NextRunOn"/>
 		<inp2:m_RenderElement name="inp_label" prefix="agent" field="RunTime"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="agent" field="Timeout" style="width: 50px"/>
 
+		<inp2:m_if check="agent_Field" name="LastTimeoutOn" db="db">
+			<inp2:m_RenderElement name="inp_label" prefix="agent" field="LastTimeoutOn"/>
+		</inp2:m_if>
+
 		<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="agent" field="SiteDomainLimitation"/>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>