Index: branches/5.2.x/core/units/helpers/mailing_list_helper.php
===================================================================
diff -u -N -r15137 -r15230
--- branches/5.2.x/core/units/helpers/mailing_list_helper.php	(.../mailing_list_helper.php)	(revision 15137)
+++ branches/5.2.x/core/units/helpers/mailing_list_helper.php	(.../mailing_list_helper.php)	(revision 15230)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_list_helper.php 15137 2012-03-04 08:06:21Z alex $
+* @version	$Id: mailing_list_helper.php 15230 2012-03-26 10:13:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -41,6 +41,10 @@
 				$esender->SetFrom($mailing_data['FromEmail'], $mailing_data['FromName']);
 
 				$esender->SetSubject($mailing_data['Subject']);
+				if ( !$mailing_data['MessageText'] ) {
+					$mailing_data['MessageText'] = $esender->ConvertToText($mailing_data['MessageHtml']);
+				}
+
 				$esender->SetBody($mailing_data['MessageHtml'], $mailing_data['MessageText']);
 
 		    	// 2. add attachment if any
@@ -56,16 +60,21 @@
 			// 3. set recipient specific fields
 			$esender->SetTo($email, $email);
 
-			// 4. write to log
-			$log_fields_hash = Array (
-				'fromuser'	=>	$mailing_data['FromName'] . '<' . $mailing_data['FromEmail'] . '>',
-				'addressto'	=>	$email,
-				'subject'	=>	$mailing_data['Subject'],
-				'timestamp'	=>	adodb_mktime(),
-				'EventParams' => serialize( Array ('MailingId' => $mailing_id) ),
-			);
+			if ( $this->Application->ConfigValue('EmailLogRotationInterval') != '' ) {
+				// 4. write to log
+				$log_fields_hash = Array (
+					'From' => $mailing_data['FromName'] . '(' . $mailing_data['FromEmail'] . ')',
+					'To' => $email,
+					'Subject' => $mailing_data['Subject'],
+					'HtmlBody' => $mailing_data['MessageHtml'],
+					'TextBody' => $mailing_data['MessageText'],
+					'SentOn' => TIMENOW,
+					'EventParams' => serialize( Array ('MailingId' => $mailing_id) ),
+				);
 
-			$esender->setLogData($log_fields_hash);
+				$esender->setLogData($log_fields_hash);
+			}
+
 			$esender->Deliver(null, $mailing_id, false);
 		}