Index: branches/5.3.x/core/install/english.lang
===================================================================
diff -u -r15938 -r15944
--- branches/5.3.x/core/install/english.lang	(.../english.lang)	(revision 15938)
+++ branches/5.3.x/core/install/english.lang	(.../english.lang)	(revision 15944)
@@ -417,6 +417,7 @@
 			<PHRASE Label="la_fld_Enable" Module="Core" Type="1">RW5hYmxl</PHRASE>
 			<PHRASE Label="la_fld_Enabled" Module="Core" Type="1" Column="RW5hYmxlZA==">RW5hYmxlZA==</PHRASE>
 			<PHRASE Label="la_fld_EnablePageCache" Module="Core" Type="1">RW5hYmxlIENhY2hpbmcgZm9yIHRoaXMgU2VjdGlvbg==</PHRASE>
+			<PHRASE Label="la_fld_ErrorMessage" Module="Core" Type="1" Column="RXJyb3IgTWVzc2FnZQ==">RXJyb3IgTWVzc2FnZQ==</PHRASE>
 			<PHRASE Label="la_fld_ErrorTag" Module="Core" Type="1">RXJyb3IgVGFn</PHRASE>
 			<PHRASE Label="la_fld_EstimatedTime" Module="Core" Type="1">RXN0aW1hdGVkIFRpbWU=</PHRASE>
 			<PHRASE Label="la_fld_Event" Module="Core" Type="1" Column="RXZlbnQ=">RXZlbnQ=</PHRASE>
@@ -906,6 +907,7 @@
 			<PHRASE Label="la_opt_EmailLogKeepForever" Module="Core" Type="1">Rm9yZXZlciAobmV2ZXIgZGVsZXRlZCBhdXRvbWF0aWNhbGx5KQ==</PHRASE>
 			<PHRASE Label="la_opt_EmailSubject" Module="Core" Type="1">RS1tYWlsIFN1YmplY3Q=</PHRASE>
 			<PHRASE Label="la_opt_EmailTemplates" Module="Core" Type="1">RS1tYWlsIFRlbXBsYXRlcw==</PHRASE>
+			<PHRASE Label="la_opt_Error" Module="Core" Type="1">RXJyb3I=</PHRASE>
 			<PHRASE Label="la_opt_Everyone" Module="Core" Type="1">RXZlcnlvbmU=</PHRASE>
 			<PHRASE Label="la_opt_Exact" Module="Core" Type="1">RXhhY3Q=</PHRASE>
 			<PHRASE Label="la_opt_Expired" Module="Core" Type="1">RXhwaXJlZA==</PHRASE>
@@ -969,6 +971,7 @@
 			<PHRASE Label="la_opt_Saturday" Module="Core" Type="1">U2F0dXJkYXk=</PHRASE>
 			<PHRASE Label="la_opt_sec" Module="Core" Type="1">c2Vjb25kKHMp</PHRASE>
 			<PHRASE Label="la_opt_Semicolon" Module="Core" Type="1">U2VtaS1jb2xvbg==</PHRASE>
+			<PHRASE Label="la_opt_Sent" Module="Core" Type="1">U2VudA==</PHRASE>
 			<PHRASE Label="la_opt_September" Module="Core" Type="1">U2VwdGVtYmVy</PHRASE>
 			<PHRASE Label="la_opt_Silent" Module="Core" Type="1">U2lsZW50</PHRASE>
 			<PHRASE Label="la_opt_Space" Module="Core" Type="1">U3BhY2U=</PHRASE>
Index: branches/5.3.x/core/kernel/utility/email.php
===================================================================
diff -u -r15938 -r15944
--- branches/5.3.x/core/kernel/utility/email.php	(.../email.php)	(revision 15938)
+++ branches/5.3.x/core/kernel/utility/email.php	(.../email.php)	(revision 15944)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version	$Id: email.php 15938 2013-08-14 09:33:06Z alex $
+ * @version	$Id: email.php 15944 2013-08-22 09:47:06Z alex $
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
@@ -92,6 +92,13 @@
 	);
 
 	/**
+	 * Stores log data.
+	 *
+	 * @var array
+	 */
+	protected $logData = array();
+
+	/**
 	 * Creates e-mail instance
 	 */
 	public function __construct()
@@ -109,6 +116,8 @@
 	 */
 	protected function _resetState()
 	{
+		$this->logData = array();
+
 		$this->fromEmail = $this->fromName = '';
 		$this->Application->removeObject('u.email-from');
 
@@ -233,14 +242,32 @@
 		$this->_processRecipients();
 		$this->_changeLanguage(false);
 
+		if ( $this->_storeEmailLog() ) {
+			// 1. prepare log
+			$this->logData = Array (
+				'From' => $this->fromName . ' (' . $this->fromEmail . ')',
+				'To' => $this->toName . ' (' . $this->toEmail . ')',
+				'OtherRecipients' => serialize($this->recipients),
+				'Status' => EmailLogStatus::SENT,
+				'ErrorMessage' => '',
+				'SentOn' => TIMENOW,
+				'TemplateName' => $this->emailTemplate->GetDBField('TemplateName'),
+				'EventType' => $this->emailTemplate->GetDBField('Type'),
+				'EventParams' => serialize($this->_getCustomParams()),
+				'ToUserId' => $this->recipientUserId,
+				'ItemPrefix' => $this->getItemPrefix(),
+				'ItemId' =>  isset($this->params['item_id']) ? $this->params['item_id'] : null,
+			);
+
+			$this->params['email_access_key'] = $this->_generateAccessKey();
+		}
+
 		// 1. set headers
 		try {
 			$message_headers = $this->_getHeaders();
 		}
 		catch ( Exception $e ) {
-			trigger_error('Error parsing e-mail message headers', E_USER_WARNING);
-
-			return false;
+			return $this->setError('Error parsing e-mail message headers');
 		}
 
 		$message_subject = isset($message_headers['Subject']) ? $message_headers['Subject'] : 'Mail message';
@@ -251,22 +278,7 @@
 		}
 
 		if ( $this->_storeEmailLog() ) {
-			// 2. prepare log
-			$log_fields_hash = Array (
-				'From' => $this->fromName . ' (' . $this->fromEmail . ')',
-				'To' => $this->toName . ' (' . $this->toEmail . ')',
-				'OtherRecipients' => serialize($this->recipients),
-				'Subject' => $message_subject,
-				'SentOn' => TIMENOW,
-				'TemplateName' => $this->emailTemplate->GetDBField('TemplateName'),
-				'EventType' => $this->emailTemplate->GetDBField('Type'),
-				'EventParams' => serialize($this->_getCustomParams()),
-				'ToUserId' => $this->recipientUserId,
-				'ItemPrefix' => $this->getItemPrefix(),
-				'ItemId' =>  isset($this->params['item_id']) ? $this->params['item_id'] : null,
-			);
-
-			$this->params['email_access_key'] = $this->_generateAccessKey($log_fields_hash);
+			$this->logData['Subject'] = $message_subject;
 		}
 
 		// 3. set body
@@ -275,15 +287,11 @@
 			$plain_message_body = $this->_getMessageBody(false);
 		}
 		catch ( Exception $e ) {
-			trigger_error('Error parsing e-mail message body', E_USER_WARNING);
-
-			return false;
+			return $this->setError('Error parsing e-mail message body');
 		}
 
 		if ( $html_message_body === false && $plain_message_body === false ) {
-			trigger_error('Message template is empty (maybe after parsing).', E_USER_WARNING);
-
-			return false;
+			return $this->setError('Message template is empty (maybe after parsing).');
 		}
 
 		if ( $html_message_body !== false ) {
@@ -298,10 +306,10 @@
 
 		if ( $this->_storeEmailLog() ) {
 			// 4. set log
-			$log_fields_hash['HtmlBody'] = $html_message_body;
-			$log_fields_hash['TextBody'] = $plain_message_body;
-			$log_fields_hash['AccessKey'] = $this->params['email_access_key'];
-			$this->sender->setLogData($log_fields_hash);
+			$this->logData['HtmlBody'] = $html_message_body;
+			$this->logData['TextBody'] = $plain_message_body;
+			$this->logData['AccessKey'] = $this->params['email_access_key'];
+			$this->sender->setLogData($this->logData);
 		}
 
 		$delivery = isset($this->params['delivery']) ? $this->params['delivery'] : $this->Application->ConfigValue('EmailDelivery');
@@ -339,19 +347,36 @@
 	}
 
 	/**
+	 * Marks e-mail sending as failed.
+	 *
+	 * @param string $error_message Error message.
+	 *
+	 * @return boolean
+	 */
+	protected function setError($error_message)
+	{
+		if ( $this->_storeEmailLog() ) {
+			$this->logData['Status'] = EmailLogStatus::ERROR;
+			$this->logData['ErrorMessage'] = $error_message;
+			$this->Conn->doInsert($this->logData, TABLE_PREFIX . 'EmailLog');
+		}
+
+		return false;
+	}
+
+	/**
 	 * Generates access key for accessing e-mail later
 	 *
-	 * @param Array $log_fields_hash
 	 * @return string
 	 * @access protected
 	 */
-	protected function _generateAccessKey($log_fields_hash)
+	protected function _generateAccessKey()
 	{
 		$ret = '';
 		$use_fields = Array ('From', 'To', 'Subject');
 
 		foreach ($use_fields as $use_field) {
-			$ret .= $log_fields_hash[$use_field] . ':';
+			$ret .= $this->logData[$use_field] . ':';
 		}
 
 		return md5($ret . microtime(true));
Index: branches/5.3.x/core/kernel/constants.php
===================================================================
diff -u -r15928 -r15944
--- branches/5.3.x/core/kernel/constants.php	(.../constants.php)	(revision 15928)
+++ branches/5.3.x/core/kernel/constants.php	(.../constants.php)	(revision 15944)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: constants.php 15928 2013-07-30 10:03:45Z alex $
+* @version	$Id: constants.php 15944 2013-08-22 09:47:06Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -210,7 +210,13 @@
 		const IMMEDIATE = 2;
 	}
 
-class TranslationSaveMode {
-	const SYNC_WITH_PRIMARY = 1;
-	const MAKE_PRIMARY = 2;
-}
\ No newline at end of file
+	class EmailLogStatus
+	{
+		const SENT = 1;
+		const ERROR = 2;
+	}
+
+	class TranslationSaveMode {
+		const SYNC_WITH_PRIMARY = 1;
+		const MAKE_PRIMARY = 2;
+	}
\ No newline at end of file
Index: branches/5.3.x/core/install/install_schema.sql
===================================================================
diff -u -r15938 -r15944
--- branches/5.3.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 15938)
+++ branches/5.3.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 15944)
@@ -427,6 +427,8 @@
   `Subject` varchar(255) NOT NULL DEFAULT '',
   HtmlBody longtext,
   TextBody longtext,
+  `Status` tinyint(4) NOT NULL DEFAULT '1',
+  ErrorMessage varchar(255) NOT NULL DEFAULT '',
   SentOn int(11) DEFAULT NULL,
   TemplateName varchar(255) NOT NULL DEFAULT '',
   EventType tinyint(4) DEFAULT NULL,
Index: branches/5.3.x/core/kernel/utility/email_send.php
===================================================================
diff -u -r15928 -r15944
--- branches/5.3.x/core/kernel/utility/email_send.php	(.../email_send.php)	(revision 15928)
+++ branches/5.3.x/core/kernel/utility/email_send.php	(.../email_send.php)	(revision 15944)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_send.php 15928 2013-07-30 10:03:45Z alex $
+* @version	$Id: email_send.php 15944 2013-08-22 09:47:06Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1127,15 +1127,22 @@
 
 			$error_msg = 'mail error: ' . vsprintf($error_msgs[$code], $params);
 
-			if ($fatal) {
-				throw new Exception($error_msg);
+			if ( $this->_logData ) {
+				$this->_logData['Status'] = EmailLogStatus::ERROR;
+				$this->_logData['ErrorMessage'] = $error_msg;
+				$this->Conn->doInsert($this->_logData, TABLE_PREFIX . 'EmailLog');
 			}
 			else {
-				if ( $this->Application->isDebugMode() ) {
-					$this->Application->Debugger->appendTrace();
+				if ($fatal) {
+					throw new Exception($error_msg);
 				}
+				else {
+					if ( $this->Application->isDebugMode() ) {
+						$this->Application->Debugger->appendTrace();
+					}
 
-				trigger_error($error_msg, E_USER_WARNING);
+					trigger_error($error_msg, E_USER_WARNING);
+				}
 			}
 
 			return false;
Index: branches/5.3.x/core/install/upgrades.sql
===================================================================
diff -u -r15938 -r15944
--- branches/5.3.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 15938)
+++ branches/5.3.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 15944)
@@ -2955,3 +2955,7 @@
 	ADD ItemId INT(11) DEFAULT NULL;
 
 DELETE FROM UserPersistentSessionData WHERE VariableName = 'email-log[Default]columns_.';
+
+ALTER TABLE EmailLog
+	ADD Status TINYINT NOT NULL DEFAULT '1' AFTER TextBody,
+	ADD ErrorMessage VARCHAR(255) NOT NULL DEFAULT '' AFTER Status;
Index: branches/5.3.x/core/units/logs/email_logs/email_logs_config.php
===================================================================
diff -u -r15938 -r15944
--- branches/5.3.x/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 15938)
+++ branches/5.3.x/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 15944)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_logs_config.php 15938 2013-08-14 09:33:06Z alex $
+* @version	$Id: email_logs_config.php 15944 2013-08-22 09:47:06Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -89,6 +89,14 @@
 		'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 		'HtmlBody' => Array ('type' => 'string', 'default' => NULL),
 		'TextBody' => Array ('type' => 'string', 'default' => NULL),
+		'Status' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (
+				EmailLogStatus::SENT => 'la_opt_Sent',
+				EmailLogStatus::ERROR => 'la_opt_Error'
+			), 'use_phrases' => 1, 'not_null' => 1, 'default' => EmailLogStatus::SENT
+		),
+		'ErrorMessage' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 		'SentOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 		'TemplateName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 		'EventType' => Array (
@@ -124,6 +132,8 @@
 				'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200),
 				'TemplateName' => Array ('filter_block' => 'grid_like_filter', 'width' => 170),
 				'EventType' => Array ('title' => 'column:la_fld_Type', 'filter_block' => 'grid_options_filter', 'width' => 60),
+				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+				'ErrorMessage' => Array ('filter_block' => 'grid_like_filter', 'width' => 200),
 				'SentOn' => Array ('title' => 'la_prompt_SentOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145),
 //				'EventParams' => Array ('title' => 'la_col_EventParams', 'filter_block' => 'grid_like_filter'),
 				'ItemPrefix' => Array('filter_block' => 'grid_options_filter'),
Index: branches/5.3.x/core/admin_templates/logs/email_logs/email_log_edit.tpl
===================================================================
diff -u -r15938 -r15944
--- branches/5.3.x/core/admin_templates/logs/email_logs/email_log_edit.tpl	(.../email_log_edit.tpl)	(revision 15938)
+++ branches/5.3.x/core/admin_templates/logs/email_logs/email_log_edit.tpl	(.../email_log_edit.tpl)	(revision 15944)
@@ -89,6 +89,12 @@
 			</td>
 		</inp2:m_RenderElement>
 
+		<inp2:m_RenderElement name="inp_label" prefix="email-log" field="Status"/>
+
+		<inp2:m_if check="email-log_Field" name="ErrorMessage" db="db">
+			<inp2:m_RenderElement name="inp_label" prefix="email-log" field="ErrorMessage"/>
+		</inp2:m_if>
+
 		<inp2:m_RenderElement name="inp_label" prefix="email-log" field="SentOn"/>
 		<inp2:m_RenderElement name="inp_label" prefix="email-log" field="ToUser" title="la_fld_RecipientUser"/>