Index: branches/5.2.x/core/kernel/utility/email.php =================================================================== diff -u -N -r16598 -r16599 --- branches/5.2.x/core/kernel/utility/email.php (.../email.php) (revision 16598) +++ branches/5.2.x/core/kernel/utility/email.php (.../email.php) (revision 16599) @@ -1,6 +1,6 @@ recipientUserId = $recipient_user_id; @@ -282,9 +283,18 @@ $this->sender->setLogData($log_fields_hash); } - $delivery = isset($this->params['delivery']) ? $this->params['delivery'] : $this->Application->ConfigValue('EmailDelivery'); + if ( !isset($immediate_send) ) { + if ( isset($this->params['delivery']) ) { + $delivery = $this->params['delivery']; + } + else { + $delivery = $this->Application->ConfigValue('EmailDelivery'); + } - return $this->sender->Deliver(null, $delivery == EmailDelivery::IMMEDIATE); + $immediate_send = $delivery == EmailDelivery::IMMEDIATE; + } + + return $this->sender->Deliver(null, $immediate_send); } /**