Index: kernel/utility/email.php =================================================================== --- kernel/utility/email.php (revision 15908) +++ kernel/utility/email.php (working copy) @@ -231,7 +231,14 @@ $this->_changeLanguage(false); // 1. set headers - $message_headers = $this->_getHeaders(); + try { + $message_headers = $this->_getHeaders(); + } catch (Exception $e) { + trigger_error('Error parsing e-mail message headers', E_USER_WARNING); + + return false; + } + $message_subject = isset($message_headers['Subject']) ? $message_headers['Subject'] : 'Mail message'; $this->sender->SetSubject($message_subject); @@ -256,9 +263,15 @@ } // 3. set body - $html_message_body = $this->_getMessageBody(true); - $plain_message_body = $this->_getMessageBody(false); + try { + $html_message_body = $this->_getMessageBody(true); + $plain_message_body = $this->_getMessageBody(false); + } catch (Exception $e) { + trigger_error('Error parsing e-mail message body', E_USER_WARNING); + return false; + } + if ( $html_message_body === false && $plain_message_body === false ) { trigger_error('Message template is empty (maybe after parsing).', E_USER_WARNING);