From 96458ab26a2fe7e49d0cb2839e767d22e9689f9d Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Thu, 2 Feb 2017 12:38:40 +0200
Subject: [PATCH 1/2] admin iframe height

---
 client/res/templates/admin/index.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/res/templates/admin/index.tpl b/client/res/templates/admin/index.tpl
index 68fdf5c58e..6c536cf8ca 100644
--- a/client/res/templates/admin/index.tpl
+++ b/client/res/templates/admin/index.tpl
@@ -18,7 +18,7 @@
 			{{/each}}
 		</div>
 		<div class="col-md-5">
-			<iframe src="{{iframeUrl}}" style="width: 100%; height: 870px;" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+			<iframe src="{{iframeUrl}}" style="width: 100%; height: 874px;" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 		</div>
 	</div>
 </div>
\ No newline at end of file

From 4b24491fe4e4fa584df018c38e8988de9965f554 Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Thu, 2 Feb 2017 12:44:05 +0200
Subject: [PATCH 2/2] fix mass email

---
 application/Espo/Modules/Crm/Services/MassEmail.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/Espo/Modules/Crm/Services/MassEmail.php b/application/Espo/Modules/Crm/Services/MassEmail.php
index 8757feb6cf..ac0fe408c8 100644
--- a/application/Espo/Modules/Crm/Services/MassEmail.php
+++ b/application/Espo/Modules/Crm/Services/MassEmail.php
@@ -394,6 +394,11 @@ class MassEmail extends \Espo\Services\Record
 
     protected function sendQueueItem(Entity $queueItem, Entity $massEmail, Entity $emailTemplate, $attachmentList = [], $campaign = null, $isTest = false)
     {
+        $queueItemFetched = $this->getEntityManager()->getEntity($queueItem->getEntityType(), $queueItem->id);
+        if ($queueItemFetched->get('status') !== 'Pending') {
+            return;
+        }
+
         $target = $this->getEntityManager()->getEntity($queueItem->get('targetType'), $queueItem->get('targetId'));
         if (!$target || !$target->id || !$target->get('emailAddress')) {
             $queueItem->set('status', 'Failed');