Index: branches/5.2.x/core/units/helpers/mailing_list_helper.php
===================================================================
diff -u -N -r14628 -r14861
--- branches/5.2.x/core/units/helpers/mailing_list_helper.php	(.../mailing_list_helper.php)	(revision 14628)
+++ branches/5.2.x/core/units/helpers/mailing_list_helper.php	(.../mailing_list_helper.php)	(revision 14861)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_list_helper.php 14628 2011-10-04 09:36:30Z alex $
+* @version	$Id: mailing_list_helper.php 14861 2011-12-13 09:39:34Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -55,7 +55,6 @@
 
 			// 3. set recipient specific fields
 			$esender->SetTo($email, $email);
-			$esender->Deliver(null, $mailing_id, false);
 
 			// 4. write to log
 			$log_fields_hash = Array (
@@ -66,7 +65,8 @@
 				'EventParams' => serialize( Array ('MailingId' => $mailing_id) ),
 			);
 
-			$this->Conn->doInsert($log_fields_hash, TABLE_PREFIX . 'EmailLog');
+			$esender->setLogData($log_fields_hash);
+			$esender->Deliver(null, $mailing_id, false);
 		}
 
 		/**
@@ -80,7 +80,7 @@
 		{
 			$is_root = true;
 			$email_address = $name = '';
-			
+
 			if ( $mailing_data['PortalUserId'] > 0 ) {
 				$sender =& $this->Application->recallObject('u.-item', null, Array ('skip_autoload' => true));
 				/* @var $sender UsersItem */
@@ -263,10 +263,12 @@
 			while ($i < $message_count) {
 				$message[0] = unserialize($messages[$i]['MessageHeaders']);
 				$message[1] =& $messages[$i]['MessageBody'];
+
+				$esender->setLogData( unserialize($messages[$i]['LogData']) );
 				$delivered = $esender->Deliver($message, true); // immediate send!
 
 				if ($delivered) {
-					// send succseeded, delete from queue
+					// send succeeded, delete from queue
 					$sql = 'DELETE FROM ' . $queue_table . '
 							WHERE EmailQueueId = ' . $messages[$i]['EmailQueueId'];
 					$this->Conn->Query($sql);