From f5727fac90b7eac741a69d8c596e14f0e2f03880 Mon Sep 17 00:00:00 2001
From: Monish Deb <deb.monish@gmail.com>
Date: Mon, 3 Dec 2018 01:16:43 +0530
Subject: [PATCH] dev/core#11: Email - send now error screen should display
 earlier

---
 CRM/Contact/Form/Task/Email.php       | 1 -
 CRM/Contact/Form/Task/EmailCommon.php | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Contact/Form/Task/Email.php b/CRM/Contact/Form/Task/Email.php
index 08556492b2..c40c2be2e3 100644
--- a/CRM/Contact/Form/Task/Email.php
+++ b/CRM/Contact/Form/Task/Email.php
@@ -131,7 +131,6 @@ class CRM_Contact_Form_Task_Email extends CRM_Contact_Form_Task {
     if (!$cid && $this->_context != 'standalone') {
       parent::preProcess();
     }
-    CRM_Contact_Form_Task_EmailCommon::bounceIfSimpleMailLimitExceeded(count($this->_contactIds));
 
     $this->assign('single', $this->_single);
     if (CRM_Core_Permission::check('administer CiviCRM')) {
diff --git a/CRM/Contact/Form/Task/EmailCommon.php b/CRM/Contact/Form/Task/EmailCommon.php
index 0e22d6abc9..de261aab36 100644
--- a/CRM/Contact/Form/Task/EmailCommon.php
+++ b/CRM/Contact/Form/Task/EmailCommon.php
@@ -124,6 +124,7 @@ class CRM_Contact_Form_Task_EmailCommon {
     if (count($form->_contactIds) > 1) {
       $form->_single = FALSE;
     }
+    CRM_Contact_Form_Task_EmailCommon::bounceIfSimpleMailLimitExceeded(count($form->_contactIds));
 
     $emailAttributes = array(
       'class' => 'huge',
-- 
2.25.1