Index: branches/5.1.x/core/admin_templates/forms/form_field_edit.tpl
===================================================================
diff -u -N -r12127 -r13390
--- branches/5.1.x/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 13390)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="780" height="570"/>
+
 <inp2:m_include t="incs/header" />
 <inp2:m_RenderElement name="combined_header" section="in-portal:forms" prefix="form" title_preset="form_field_edit"/>
 
@@ -37,7 +39,7 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="FieldName" title="!la_prompt_FieldName!" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="FieldLabel" title="!la_prompt_FieldLabel!" size="40"/>
 
-		<inp2:m_RenderElement name="subsection" prefix="" fields="Prompt,ElementType,Validation,ValueList,DefaultValue,Priority,Required,DisplayInGrid" title="!la_tab_AdminUI!"/>
+		<inp2:m_RenderElement name="subsection" prefix="formflds" fields="Prompt,ElementType,Validation,ValueList,DefaultValue,Priority,Required,DisplayInGrid,Visibility,EmailCommunicationRole" title="!la_tab_AdminUI!"/>
 			<!--<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Heading" title="!la_prompt_heading!" size="40"/>-->
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="ElementType" title="!la_prompt_InputType!"/>
@@ -47,7 +49,12 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Priority" title="!la_field_Priority!" size="10"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="Required" title="!la_fld_Required!"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="DisplayInGrid" title="!la_fld_DisplayInGrid!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="formflds" field="Visibility" title="la_fld_Visibility"/>
 
+			<inp2:m_if check="form_Field" name="EnableEmailCommunication" db="db">
+				<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="EmailCommunicationRole" title="la_fld_EmailCommunicationRole" has_empty="1"/>
+			</inp2:m_if>
+
 			<inp2:m_if check="m_IsDebugMode">
 				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="IsSystem" title="!la_fld_IsSystem!"/>
 			</inp2:m_if>