diff --git a/CRM/Contact/Form/Task/EmailCommon.php b/CRM/Contact/Form/Task/EmailCommon.php
index 7742403b927..750c8ea1b78 100644
--- a/CRM/Contact/Form/Task/EmailCommon.php
+++ b/CRM/Contact/Form/Task/EmailCommon.php
@@ -62,14 +62,8 @@ public static function preProcessFromAddress(&$form, $bounce = TRUE) {
 
     $fromEmailValues = CRM_Core_BAO_Email::getFromEmail();
 
-    $form->_noEmails = FALSE;
-    if (empty($fromEmailValues)) {
-      $form->_noEmails = TRUE;
-    }
-    $form->assign('noEmails', $form->_noEmails);
-
     if ($bounce) {
-      if ($form->_noEmails) {
+      if (empty($fromEmailValues)) {
         CRM_Core_Error::statusBounce(ts('Your user record does not have a valid email address and no from addresses have been configured.'));
       }
     }
diff --git a/templates/CRM/Contact/Form/Task/Email.tpl b/templates/CRM/Contact/Form/Task/Email.tpl
index d665a1b18fd..825dfaf8bc4 100644
--- a/templates/CRM/Contact/Form/Task/Email.tpl
+++ b/templates/CRM/Contact/Form/Task/Email.tpl
@@ -23,7 +23,7 @@
     <tr class="crm-contactEmail-form-block-recipient">
        <td class="label">{if $single eq false}{ts}Recipient(s){/ts}{else}{$form.to.label}{/if}</td>
        <td>
-         {$form.to.html}{if $noEmails eq true}&nbsp;&nbsp;{$form.emailAddress.html}{/if}
+         {$form.to.html}
        </td>
     </tr>
     <tr class="crm-contactEmail-form-block-cc_id" {if !$form.cc_id.value}style="display:none;"{/if}>