Index: branches/5.3.x/core/kernel/utility/email.php
===================================================================
diff -u -N -r15677 -r15916
--- branches/5.3.x/core/kernel/utility/email.php	(.../email.php)	(revision 15677)
+++ branches/5.3.x/core/kernel/utility/email.php	(.../email.php)	(revision 15916)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version	$Id: email.php 15677 2013-01-17 18:52:50Z alex $
+ * @version	$Id: email.php 15916 2013-07-24 14:19:35Z alex $
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
@@ -204,7 +204,7 @@
 	protected function _getCustomParams()
 	{
 		$ret = $this->params;
-		$send_keys = Array ('from_email', 'from_name', 'to_email', 'to_name', 'overwrite_to_email', 'language_id', 'use_custom_design');
+		$send_keys = Array ('from_email', 'from_name', 'to_email', 'to_name', 'overwrite_to_email', 'language_id', 'use_custom_design', 'delivery');
 
 		foreach ($send_keys as $send_key) {
 			unset($ret[$send_key]);
@@ -217,11 +217,10 @@
 	 * Sends e-mail now or puts it in queue
 	 *
 	 * @param int $recipient_user_id
-	 * @param bool $immediate_send
 	 * @return bool
 	 * @access public
 	 */
-	public function send($recipient_user_id = null, $immediate_send = true)
+	public function send($recipient_user_id = null)
 	{
 		$this->recipientUserId = $recipient_user_id;
 
@@ -283,7 +282,9 @@
 			$this->sender->setLogData($log_fields_hash);
 		}
 
-		return $this->sender->Deliver(null, $immediate_send);
+		$delivery = isset($this->params['delivery']) ? $this->params['delivery'] : $this->Application->ConfigValue('EmailDelivery');
+
+		return $this->sender->Deliver(null, $delivery == EmailDelivery::IMMEDIATE);
 	}
 
 	/**