Merge branch 'hotfix/4.4.1'

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');

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>