diff --git a/templates/CRM/Contact/Form/Edit/Email.tpl b/templates/CRM/Contact/Form/Edit/Email.tpl
index 94323e8dafb7..c0a9021f2a72 100644
--- a/templates/CRM/Contact/Form/Edit/Email.tpl
+++ b/templates/CRM/Contact/Form/Edit/Email.tpl
@@ -28,42 +28,45 @@
 {* @var $blockId Contains the current email block id in evaluation, and assigned in the CRM/Contact/Form/Location.php file *}
 
 {if !$addBlock}
-    <tr>
-  <td>{ts}Email{/ts}
+  <tr>
+    <td>{ts}Email{/ts}
       &nbsp;&nbsp;<a id='addEmail' href="#" title={ts}Add{/ts} onClick="buildAdditionalBlocks( 'Email', '{$className}');return false;">{ts}add{/ts}</a>
-  </td>
-  {if $className eq 'CRM_Contact_Form_Contact'}
+    </td>
+    {if $className eq 'CRM_Contact_Form_Contact'}
       <td>{ts}On Hold?{/ts} {help id="id-onhold" file="CRM/Contact/Form/Contact.hlp"}</td>
       <td>{ts}Bulk Mailings?{/ts} {help id="id-bulkmail" file="CRM/Contact/Form/Contact.hlp"}</td>
       <td id="Email-Primary" class="hiddenElement">{ts}Primary?{/ts}</td>
-  {/if}
-    </tr>
+    {/if}
+  </tr>
 {/if}
 
 <tr id="Email_Block_{$blockId}">
-    <td>{$form.email.$blockId.email.html|crmAddClass:email}&nbsp;{$form.email.$blockId.location_type_id.html}
+  <td>{$form.email.$blockId.email.html|crmAddClass:email}&nbsp;{$form.email.$blockId.location_type_id.html}
     <div class="clear"></div>
-{if $className eq 'CRM_Contact_Form_Contact'}
-<div class="email-signature crm-collapsible collapsed">
-  <div class="collapsible-title">
-    {ts}Signature{/ts}
-  </div>
-  <div id="signatureBlock{$blockId}">
-    {$form.email.$blockId.signature_html.label}<br />{$form.email.$blockId.signature_html.html}<br />
-    {$form.email.$blockId.signature_text.label}<br />{$form.email.$blockId.signature_text.html}
-  </div>
-</div>
-
-{/if}
-    </td>
-    <td align="center">{$form.email.$blockId.on_hold.html}</td>
-    {if $multipleBulk}
-      <td align="center" id="Email-Bulkmail-html">{$form.email.$blockId.is_bulkmail.html}</td>
-    {else}
-      <td align="center" id="Email-Bulkmail-html">{$form.email.$blockId.is_bulkmail.1.html}</td>
-    {/if}
-    <td align="center" id="Email-Primary-html" {if $blockId eq 1}class="hiddenElement"{/if}>{$form.email.$blockId.is_primary.1.html}</td>
-    {if $blockId gt 1}
-  <td><a href="#" title="{ts}Delete Email Block{/ts}" onClick="removeBlock( 'Email', '{$blockId}' ); return false;">{ts}delete{/ts}</a></td>
+    {if $className eq 'CRM_Contact_Form_Contact'}
+      <div class="email-signature crm-collapsible collapsed">
+        <div class="collapsible-title">
+          {ts}Signature{/ts}
+        </div>
+        <div id="signatureBlock{$blockId}">
+          {$form.email.$blockId.signature_html.label}<br/>{$form.email.$blockId.signature_html.html}<br/>
+          {$form.email.$blockId.signature_text.label}<br/>{$form.email.$blockId.signature_text.html}
+        </div>
+      </div>
     {/if}
+  </td>
+  <td align="center">{$form.email.$blockId.on_hold.html}</td>
+  {if $multipleBulk}
+    <td align="center" id="Email-Bulkmail-html">{$form.email.$blockId.is_bulkmail.html}</td>
+  {else}
+    <td align="center" id="Email-Bulkmail-html">{$form.email.$blockId.is_bulkmail.1.html}</td>
+  {/if}
+  <td align="center" id="Email-Primary-html" {if $blockId eq 1}class="hiddenElement"{/if}>
+    {$form.email.$blockId.is_primary.1.html}
+  </td>
+  {if $blockId gt 1}
+    <td>
+      <a href="#" title="{ts}Delete Email Block{/ts}" onClick="removeBlock( 'Email', '{$blockId}' ); return false;">{ts}delete{/ts}</a>
+    </td>
+  {/if}
 </tr>
diff --git a/templates/CRM/Contact/Form/Inline/Email.tpl b/templates/CRM/Contact/Form/Inline/Email.tpl
index be0767213e28..ccbfd1d54a0a 100644
--- a/templates/CRM/Contact/Form/Inline/Email.tpl
+++ b/templates/CRM/Contact/Form/Inline/Email.tpl
@@ -26,50 +26,52 @@
 {* This file provides the template for inline editing of emails *}
 {$form.oplock_ts.html}
 <table class="crm-inline-edit-form">
-    <tr>
-      <td colspan="5">
-        <div class="crm-submit-buttons">
-          {include file="CRM/common/formButtons.tpl"}
-        </div>
-      </td>
-    </tr>
-    <tr>
-      <td>{ts}Email{/ts}&nbsp;
+  <tr>
+    <td colspan="5">
+      <div class="crm-submit-buttons">
+        {include file="CRM/common/formButtons.tpl"}
+      </div>
+    </td>
+  </tr>
+  <tr>
+    <td>{ts}Email{/ts}&nbsp;
       {if $actualBlockCount lt 5 }
-        <span id="add-more-email" title="{ts}click to add more{/ts}"><a class="crm-hover-button action-item add-more-inline" href="#">{ts}add{/ts}</a></span>
+        <span id="add-more-email" title="{ts}click to add more{/ts}">
+          <a class="crm-hover-button action-item add-more-inline" href="#">{ts}add{/ts}</a>
+        </span>
       {/if}
+    </td>
+    <td>{ts}On Hold?{/ts}</td>
+    <td>{ts}Bulk Mailings?{/ts}</td>
+    <td>{ts}Primary?{/ts}</td>
+    <td>&nbsp;</td>
+  </tr>
+  {section name='i' start=1 loop=$totalBlocks}
+    {assign var='blockId' value=$smarty.section.i.index}
+    <tr id="Email_Block_{$blockId}" {if $blockId gt $actualBlockCount}class="hiddenElement"{/if}>
+      <td>{$form.email.$blockId.email.html|crmAddClass:email}&nbsp;{$form.email.$blockId.location_type_id.html}</td>
+      <td align="center">{$form.email.$blockId.on_hold.html}</td>
+      {if $multipleBulk}
+        <td align="center">{$form.email.$blockId.is_bulkmail.html}</td>
+      {else}
+        <td align="center" class="crm-email-bulkmail">{$form.email.$blockId.is_bulkmail.1.html}</td>
+      {/if}
+      <td align="center" class="crm-email-is_primary">{$form.email.$blockId.is_primary.1.html}</td>
+      <td>
+        {if $blockId gt 1}
+          <a title="{ts}Delete Email{/ts}" class="crm-delete-inline crm-hover-button" href="#"><span
+              class="icon delete-icon"></span></a>
+        {/if}
       </td>
-      <td>{ts}On Hold?{/ts}</td>
-      <td>{ts}Bulk Mailings?{/ts}</td>
-      <td>{ts}Primary?{/ts}</td>
-      <td>&nbsp;</td>
     </tr>
-    {section name='i' start=1 loop=$totalBlocks}
-    {assign var='blockId' value=$smarty.section.i.index}
-        <tr id="Email_Block_{$blockId}" {if $blockId gt $actualBlockCount}class="hiddenElement"{/if}>
-            <td>{$form.email.$blockId.email.html|crmAddClass:email}&nbsp;{$form.email.$blockId.location_type_id.html}
-            </td>
-            <td align="center">{$form.email.$blockId.on_hold.html}</td>
-            {if $multipleBulk}
-              <td align="center">{$form.email.$blockId.is_bulkmail.html}</td>
-            {else}
-              <td align="center" class="crm-email-bulkmail">{$form.email.$blockId.is_bulkmail.1.html}</td>
-            {/if}
-            <td align="center" class="crm-email-is_primary">{$form.email.$blockId.is_primary.1.html}</td>
-            <td>
-              {if $blockId gt 1}
-                <a title="{ts}Delete Email{/ts}" class="crm-delete-inline crm-hover-button" href="#"><span class="icon delete-icon"></span></a>
-              {/if}
-            </td>
-        </tr>
-    {/section}
+  {/section}
 </table>
 
 {literal}
-<script type="text/javascript">
-    CRM.$(function($) {
+  <script type="text/javascript">
+    CRM.$(function ($) {
       // check first primary radio
-      $('#Email_1_IsPrimary').prop('checked', true );
+      $('#Email_1_IsPrimary').prop('checked', true);
     });
-</script>
+  </script>
 {/literal}