diff --git a/externals/amazon-ses/ses.php b/externals/amazon-ses/ses.php
index b405a6de46..ed5b29e558 100644
--- a/externals/amazon-ses/ses.php
+++ b/externals/amazon-ses/ses.php
@@ -1,703 +1,722 @@
 <?php
 /**
 *
 * Copyright (c) 2011, Dan Myers.
 * Parts copyright (c) 2008, Donovan Schonknecht.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 *
 * - Redistributions of source code must retain the above copyright notice,
 *   this list of conditions and the following disclaimer.
 * - Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
 * This is a modified BSD license (the third clause has been removed).
 * The BSD license may be found here:
 * http://www.opensource.org/licenses/bsd-license.php
 *
 * Amazon Simple Email Service is a trademark of Amazon.com, Inc. or its affiliates.
 *
 * SimpleEmailService is based on Donovan Schonknecht's Amazon S3 PHP class, found here:
 * http://undesigned.org.za/2007/10/22/amazon-s3-php-class
 *
 */
 
 /**
 * Amazon SimpleEmailService PHP class
 *
 * @link http://sourceforge.net/projects/php-aws-ses/
 * version 0.8.1
 *
 */
 class SimpleEmailService
 {
   protected $__accessKey; // AWS Access key
   protected $__secretKey; // AWS Secret key
   protected $__host;
 
   public function getAccessKey() { return $this->__accessKey; }
   public function getSecretKey() { return $this->__secretKey; }
   public function getHost() { return $this->__host; }
 
   protected $__verifyHost = 1;
   protected $__verifyPeer = 1;
 
   // verifyHost and verifyPeer determine whether curl verifies ssl certificates.
   // It may be necessary to disable these checks on certain systems.
   // These only have an effect if SSL is enabled.
   public function verifyHost() { return $this->__verifyHost; }
   public function enableVerifyHost($enable = true) { $this->__verifyHost = $enable; }
 
   public function verifyPeer() { return $this->__verifyPeer; }
   public function enableVerifyPeer($enable = true) { $this->__verifyPeer = $enable; }
 
   /**
   * Constructor
   *
   * @param string $accessKey Access key
   * @param string $secretKey Secret key
   * @return void
   */
   public function __construct($accessKey = null, $secretKey = null, $host = 'email.us-east-1.amazonaws.com') {
     if ($accessKey !== null && $secretKey !== null) {
       $this->setAuth($accessKey, $secretKey);
     }
     $this->__host = $host;
   }
 
   /**
   * Set AWS access key and secret key
   *
   * @param string $accessKey Access key
   * @param string $secretKey Secret key
   * @return void
   */
   public function setAuth($accessKey, $secretKey) {
     $this->__accessKey = $accessKey;
     $this->__secretKey = $secretKey;
   }
 
   /**
   * Lists the email addresses that have been verified and can be used as the 'From' address
   * 
   * @return An array containing two items: a list of verified email addresses, and the request id.
   */
   public function listVerifiedEmailAddresses() {
     $rest = new SimpleEmailServiceRequest($this, 'GET');
     $rest->setParameter('Action', 'ListVerifiedEmailAddresses');
 
     $rest = $rest->getResponse();
     if($rest->error === false && $rest->code !== 200) {
       $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
     }
     if($rest->error !== false) {
       $this->__triggerError('listVerifiedEmailAddresses', $rest->error);
       return false;
     }
 
     $response = array();
     if(!isset($rest->body)) {
       return $response;
     }
 
     $addresses = array();
     foreach($rest->body->ListVerifiedEmailAddressesResult->VerifiedEmailAddresses->member as $address) {
       $addresses[] = (string)$address;
     }
 
     $response['Addresses'] = $addresses;
     $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId;
 
     return $response;
   }
 
   /**
   * Requests verification of the provided email address, so it can be used
   * as the 'From' address when sending emails through SimpleEmailService.
   *
   * After submitting this request, you should receive a verification email
   * from Amazon at the specified address containing instructions to follow.
   *
   * @param string email The email address to get verified
   * @return The request id for this request.
   */
   public function verifyEmailAddress($email) {
     $rest = new SimpleEmailServiceRequest($this, 'POST');
     $rest->setParameter('Action', 'VerifyEmailAddress');
     $rest->setParameter('EmailAddress', $email);
 
     $rest = $rest->getResponse();
     if($rest->error === false && $rest->code !== 200) {
       $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
     }
     if($rest->error !== false) {
       $this->__triggerError('verifyEmailAddress', $rest->error);
       return false;
     }
 
     $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId;
     return $response;
   }
 
   /**
   * Removes the specified email address from the list of verified addresses.
   *
   * @param string email The email address to remove
   * @return The request id for this request.
   */
   public function deleteVerifiedEmailAddress($email) {
     $rest = new SimpleEmailServiceRequest($this, 'DELETE');
     $rest->setParameter('Action', 'DeleteVerifiedEmailAddress');
     $rest->setParameter('EmailAddress', $email);
 
     $rest = $rest->getResponse();
     if($rest->error === false && $rest->code !== 200) {
       $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
     }
     if($rest->error !== false) {
       $this->__triggerError('deleteVerifiedEmailAddress', $rest->error);
       return false;
     }
 
     $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId;
     return $response;
   }
 
   /**
   * Retrieves information on the current activity limits for this account.
   * See http://docs.amazonwebservices.com/ses/latest/APIReference/API_GetSendQuota.html
   *
   * @return An array containing information on this account's activity limits.
   */
   public function getSendQuota() {
     $rest = new SimpleEmailServiceRequest($this, 'GET');
     $rest->setParameter('Action', 'GetSendQuota');
 
     $rest = $rest->getResponse();
     if($rest->error === false && $rest->code !== 200) {
       $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
     }
     if($rest->error !== false) {
       $this->__triggerError('getSendQuota', $rest->error);
       return false;
     }
 
     $response = array();
     if(!isset($rest->body)) {
       return $response;
     }
 
     $response['Max24HourSend'] = (string)$rest->body->GetSendQuotaResult->Max24HourSend;
     $response['MaxSendRate'] = (string)$rest->body->GetSendQuotaResult->MaxSendRate;
     $response['SentLast24Hours'] = (string)$rest->body->GetSendQuotaResult->SentLast24Hours;
     $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId;
 
     return $response;
   }
 
   /**
   * Retrieves statistics for the last two weeks of activity on this account.
   * See http://docs.amazonwebservices.com/ses/latest/APIReference/API_GetSendStatistics.html
   *
   * @return An array of activity statistics.  Each array item covers a 15-minute period.
   */
   public function getSendStatistics() {
     $rest = new SimpleEmailServiceRequest($this, 'GET');
     $rest->setParameter('Action', 'GetSendStatistics');
 
     $rest = $rest->getResponse();
     if($rest->error === false && $rest->code !== 200) {
       $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
     }
     if($rest->error !== false) {
       $this->__triggerError('getSendStatistics', $rest->error);
       return false;
     }
 
     $response = array();
     if(!isset($rest->body)) {
       return $response;
     }
 
     $datapoints = array();
     foreach($rest->body->GetSendStatisticsResult->SendDataPoints->member as $datapoint) {
       $p = array();
       $p['Bounces'] = (string)$datapoint->Bounces;
       $p['Complaints'] = (string)$datapoint->Complaints;
       $p['DeliveryAttempts'] = (string)$datapoint->DeliveryAttempts;
       $p['Rejects'] = (string)$datapoint->Rejects;
       $p['Timestamp'] = (string)$datapoint->Timestamp;
 
       $datapoints[] = $p;
     }
 
     $response['SendDataPoints'] = $datapoints;
     $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId;
 
     return $response;
   }
 
 
+  public function sendRawEmail($raw) {
+    $rest = new SimpleEmailServiceRequest($this, 'POST');
+    $rest->setParameter('Action', 'SendRawEmail');
+    $rest->setParameter('RawMessage.Data', base64_encode($raw));
+
+    $rest = $rest->getResponse();
+    if($rest->error === false && $rest->code !== 200) {
+      $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
+    }
+    if($rest->error !== false) {
+      $this->__triggerError('sendRawEmail', $rest->error);
+      return false;
+    }
+
+    $response['MessageId'] = (string)$rest->body->SendEmailResult->MessageId;
+    $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId;
+    return $response;
+  }
+
   /**
   * Given a SimpleEmailServiceMessage object, submits the message to the service for sending.
   *
   * @return An array containing the unique identifier for this message and a separate request id.
   *         Returns false if the provided message is missing any required fields.
   */
   public function sendEmail($sesMessage) {
     if(!$sesMessage->validate()) {
       return false;
     }
 
     $rest = new SimpleEmailServiceRequest($this, 'POST');
     $rest->setParameter('Action', 'SendEmail');
 
     $i = 1;
     foreach($sesMessage->to as $to) {
       $rest->setParameter('Destination.ToAddresses.member.'.$i, $to);
       $i++;
     }
 
     if(is_array($sesMessage->cc)) {
       $i = 1;
       foreach($sesMessage->cc as $cc) {
         $rest->setParameter('Destination.CcAddresses.member.'.$i, $cc);
         $i++;
       }
     }
 
     if(is_array($sesMessage->bcc)) {
       $i = 1;
       foreach($sesMessage->bcc as $bcc) {
         $rest->setParameter('Destination.BccAddresses.member.'.$i, $bcc);
         $i++;
       }
     }
 
     if(is_array($sesMessage->replyto)) {
       $i = 1;
       foreach($sesMessage->replyto as $replyto) {
         $rest->setParameter('ReplyToAddresses.member.'.$i, $replyto);
         $i++;
       }
     }
 
     $rest->setParameter('Source', $sesMessage->from);
 
     if($sesMessage->returnpath != null) {
       $rest->setParameter('ReturnPath', $sesMessage->returnpath);
     }
 
     if($sesMessage->subject != null && strlen($sesMessage->subject) > 0) {
       $rest->setParameter('Message.Subject.Data', $sesMessage->subject);
       if($sesMessage->subjectCharset != null && strlen($sesMessage->subjectCharset) > 0) {
         $rest->setParameter('Message.Subject.Charset', $sesMessage->subjectCharset);
       }
     }
 
 
     if($sesMessage->messagetext != null && strlen($sesMessage->messagetext) > 0) {
       $rest->setParameter('Message.Body.Text.Data', $sesMessage->messagetext);
       if($sesMessage->messageTextCharset != null && strlen($sesMessage->messageTextCharset) > 0) {
         $rest->setParameter('Message.Body.Text.Charset', $sesMessage->messageTextCharset);
       }
     }
 
     if($sesMessage->messagehtml != null && strlen($sesMessage->messagehtml) > 0) {
       $rest->setParameter('Message.Body.Html.Data', $sesMessage->messagehtml);
       if($sesMessage->messageHtmlCharset != null && strlen($sesMessage->messageHtmlCharset) > 0) {
         $rest->setParameter('Message.Body.Html.Charset', $sesMessage->messageHtmlCharset);
       }
     }
 
     $rest = $rest->getResponse();
     if($rest->error === false && $rest->code !== 200) {
       $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
     }
     if($rest->error !== false) {
       $this->__triggerError('sendEmail', $rest->error);
       return false;
     }
 
     $response['MessageId'] = (string)$rest->body->SendEmailResult->MessageId;
     $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId;
     return $response;
   }
 
   /**
   * Trigger an error message
   *
   * @internal Used by member functions to output errors
   * @param array $error Array containing error information
   * @return string
   */
   public function __triggerError($functionname, $error)
   {
     if($error == false) {
       trigger_error(sprintf("SimpleEmailService::%s(): Encountered an error, but no description given", $functionname), E_USER_WARNING);
     }
     else if(isset($error['curl']) && $error['curl'])
     {
       trigger_error(sprintf("SimpleEmailService::%s(): %s %s", $functionname, $error['code'], $error['message']), E_USER_WARNING);
     }
     else if(isset($error['Error']))
     {
       $e = $error['Error'];
       $message = sprintf("SimpleEmailService::%s(): %s - %s: %s\nRequest Id: %s\n", $functionname, $e['Type'], $e['Code'], $e['Message'], $error['RequestId']);
       trigger_error($message, E_USER_WARNING);
     }
   }
 
   /**
   * Callback handler for 503 retries.
   *
   * @internal Used by SimpleDBRequest to call the user-specified callback, if set
   * @param $attempt The number of failed attempts so far
   * @return The retry delay in microseconds, or 0 to stop retrying.
   */
   public function __executeServiceTemporarilyUnavailableRetryDelay($attempt)
   {
     if(is_callable($this->__serviceUnavailableRetryDelayCallback)) {
       $callback = $this->__serviceUnavailableRetryDelayCallback;
       return $callback($attempt);
     }
     return 0;
   }
 }
 
 final class SimpleEmailServiceRequest
 {
   private $ses, $verb, $parameters = array();
   public $response;
 
   /**
   * Constructor
   *
   * @param string $ses The SimpleEmailService object making this request
   * @param string $action action
   * @param string $verb HTTP verb
   * @return mixed
   */
   function __construct($ses, $verb) {
     $this->ses = $ses;
     $this->verb = $verb;
     $this->response = new STDClass;
     $this->response->error = false;
   }
 
   /**
   * Set request parameter
   *
   * @param string  $key Key
   * @param string  $value Value
   * @param boolean $replace Whether to replace the key if it already exists (default true)
   * @return void
   */
   public function setParameter($key, $value, $replace = true) {
     if(!$replace && isset($this->parameters[$key]))
     {
       $temp = (array)($this->parameters[$key]);
       $temp[] = $value;
       $this->parameters[$key] = $temp;
     }
     else
     {
       $this->parameters[$key] = $value;
     }
   }
 
   /**
   * Get the response
   *
   * @return object | false
   */
   public function getResponse() {
 
     $params = array();
     foreach ($this->parameters as $var => $value)
     {
       if(is_array($value))
       {
         foreach($value as $v)
         {
           $params[] = $var.'='.$this->__customUrlEncode($v);
         }
       }
       else
       {
         $params[] = $var.'='.$this->__customUrlEncode($value);
       }
     }
 
     sort($params, SORT_STRING);
 
     // must be in format 'Sun, 06 Nov 1994 08:49:37 GMT'
     $date = gmdate('D, d M Y H:i:s e');
 
     $query = implode('&', $params);
 
     $headers = array();
     $headers[] = 'Date: '.$date;
     $headers[] = 'Host: '.$this->ses->getHost();
 
     $auth = 'AWS3-HTTPS AWSAccessKeyId='.$this->ses->getAccessKey();
     $auth .= ',Algorithm=HmacSHA256,Signature='.$this->__getSignature($date);
     $headers[] = 'X-Amzn-Authorization: '.$auth;
 
     $url = 'https://'.$this->ses->getHost().'/';
 
     // Basic setup
     $curl = curl_init();
     curl_setopt($curl, CURLOPT_USERAGENT, 'SimpleEmailService/php');
 
     curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, ($this->ses->verifyHost() ? 1 : 0));
     curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, ($this->ses->verifyPeer() ? 1 : 0));
 
     // Request types
     switch ($this->verb) {
       case 'GET':
         $url .= '?'.$query;
         break;
       case 'POST':
         curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $this->verb);
         curl_setopt($curl, CURLOPT_POSTFIELDS, $query);
         $headers[] = 'Content-Type: application/x-www-form-urlencoded';
       break;
       case 'DELETE':
         $url .= '?'.$query;
         curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'DELETE');
       break;
       default: break;
     }
     curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
     curl_setopt($curl, CURLOPT_HEADER, false);
 
     curl_setopt($curl, CURLOPT_URL, $url);
     curl_setopt($curl, CURLOPT_RETURNTRANSFER, false);
     curl_setopt($curl, CURLOPT_WRITEFUNCTION, array(&$this, '__responseWriteCallback'));
     curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
 
     // Execute, grab errors
     if (curl_exec($curl)) {
       $this->response->code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
     } else {
       $this->response->error = array(
         'curl' => true,
         'code' => curl_errno($curl),
         'message' => curl_error($curl),
         'resource' => $this->resource
       );
     }
 
     @curl_close($curl);
 
     // Parse body into XML
     if ($this->response->error === false && isset($this->response->body)) {
       $this->response->body = simplexml_load_string($this->response->body);
 
       // Grab SES errors
       if (!in_array($this->response->code, array(200, 201, 202, 204))
         && isset($this->response->body->Error)) {
         $error = $this->response->body->Error;
         $output = array();
         $output['curl'] = false;
         $output['Error'] = array();
         $output['Error']['Type'] = (string)$error->Type;
         $output['Error']['Code'] = (string)$error->Code;
         $output['Error']['Message'] = (string)$error->Message;
         $output['RequestId'] = (string)$this->response->body->RequestId;
 
         $this->response->error = $output;
         unset($this->response->body);
       }
     }
 
     return $this->response;
   }
 
   /**
   * CURL write callback
   *
   * @param resource &$curl CURL resource
   * @param string &$data Data
   * @return integer
   */
   private function __responseWriteCallback(&$curl, &$data) {
     $this->response->body .= $data;
     return strlen($data);
   }
 
   /**
   * Contributed by afx114
   * URL encode the parameters as per http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/index.html?Query_QueryAuth.html
   * PHP's rawurlencode() follows RFC 1738, not RFC 3986 as required by Amazon. The only difference is the tilde (~), so convert it back after rawurlencode
   * See: http://www.morganney.com/blog/API/AWS-Product-Advertising-API-Requires-a-Signed-Request.php
   *
   * @param string $var String to encode
   * @return string
   */
   private function __customUrlEncode($var) {
     return str_replace('%7E', '~', rawurlencode($var));
   }
 
   /**
   * Generate the auth string using Hmac-SHA256
   *
   * @internal Used by SimpleDBRequest::getResponse()
   * @param string $string String to sign
   * @return string
   */
   private function __getSignature($string) {
     return base64_encode(hash_hmac('sha256', $string, $this->ses->getSecretKey(), true));
   }
 }
 
 
 final class SimpleEmailServiceMessage {
 
   // these are public for convenience only
   // these are not to be used outside of the SimpleEmailService class!
   public $to, $cc, $bcc, $replyto;
   public $from, $returnpath;
   public $subject, $messagetext, $messagehtml;
   public $subjectCharset, $messageTextCharset, $messageHtmlCharset;
 
   function __construct() {
     $to = array();
     $cc = array();
     $bcc = array();
     $replyto = array();
 
     $from = null;
     $returnpath = null;
 
     $subject = null;
     $messagetext = null;
     $messagehtml = null;
 
     $subjectCharset = null;
     $messageTextCharset = null;
     $messageHtmlCharset = null;
   }
 
 
   /**
   * addTo, addCC, addBCC, and addReplyTo have the following behavior:
   * If a single address is passed, it is appended to the current list of addresses.
   * If an array of addresses is passed, that array is merged into the current list.
   */
   function addTo($to) {
     if(!is_array($to)) {
       $this->to[] = $to;
     }
     else {
       $this->to = array_merge($this->to, $to);
     }
   }
 
   function addCC($cc) {
     if(!is_array($cc)) {
       $this->cc[] = $cc;
     }
     else {
       $this->cc = array_merge($this->cc, $cc);
     }
   }
 
   function addBCC($bcc) {
     if(!is_array($bcc)) {
       $this->bcc[] = $bcc;
     }
     else {
       $this->bcc = array_merge($this->bcc, $bcc);
     }
   }
 
   function addReplyTo($replyto) {
     if(!is_array($replyto)) {
       $this->replyto[] = $replyto;
     }
     else {
       $this->replyto = array_merge($this->replyto, $replyto);
     }
   }
 
   function setFrom($from) {
     $this->from = $from;
   }
 
   function setReturnPath($returnpath) {
     $this->returnpath = $returnpath;
   }
 
   function setSubject($subject) {
     $this->subject = $subject;
   }
 
   function setSubjectCharset($charset) {
     $this->subjectCharset = $charset;
   }
 
   function setMessageFromString($text, $html = null) {
     $this->messagetext = $text;
     $this->messagehtml = $html;
   }
 
   function setMessageFromFile($textfile, $htmlfile = null) {
     if(file_exists($textfile) && is_file($textfile) && is_readable($textfile)) {
       $this->messagetext = file_get_contents($textfile);
     }
     if(file_exists($htmlfile) && is_file($htmlfile) && is_readable($htmlfile)) {
       $this->messagehtml = file_get_contents($htmlfile);
     }
   }
 
   function setMessageFromURL($texturl, $htmlurl = null) {
     $this->messagetext = file_get_contents($texturl);
     if($htmlurl !== null) {
       $this->messagehtml = file_get_contents($htmlurl);
     }
   }
 
   function setMessageCharset($textCharset, $htmlCharset = null) {
     $this->messageTextCharset = $textCharset;
     $this->messageHtmlCharset = $htmlCharset;
   }
 
   /**
   * Validates whether the message object has sufficient information to submit a request to SES.
   * This does not guarantee the message will arrive, nor that the request will succeed;
   * instead, it makes sure that no required fields are missing.
   *
   * This is used internally before attempting a SendEmail or SendRawEmail request,
   * but it can be used outside of this file if verification is desired.
   * May be useful if e.g. the data is being populated from a form; developers can generally
   * use this function to verify completeness instead of writing custom logic.
   *
   * @return boolean
   */
   public function validate() {
     if(count($this->to) == 0)
       return false;
     if($this->from == null || strlen($this->from) == 0)
       return false;
     if($this->messagetext == null)
       return false;
     return true;
   }
 }
diff --git a/externals/phpmailer/class.phpmailer-lite.php b/externals/phpmailer/class.phpmailer-lite.php
index 2b37167b6f..f12a8d5844 100755
--- a/externals/phpmailer/class.phpmailer-lite.php
+++ b/externals/phpmailer/class.phpmailer-lite.php
@@ -1,2075 +1,2086 @@
 <?php
 /*~ class.phpmailer-lite.php
 .---------------------------------------------------------------------------.
 |  Software: PHPMailer Lite - PHP email class                               |
 |   Version: 5.1                                                            |
 |   Contact: via sourceforge.net support pages (also www.codeworxtech.com)  |
 |      Info: http://phpmailer.sourceforge.net                               |
 |   Support: http://sourceforge.net/projects/phpmailer/                     |
 | ------------------------------------------------------------------------- |
 |     Admin: Andy Prevost (project admininistrator)                         |
 |   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
 |          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
 |   Founder: Brent R. Matzelle (original founder)                           |
 | Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
 | Copyright (c) 2001-2003, Brent R. Matzelle                                |
 | ------------------------------------------------------------------------- |
 |   License: Distributed under the Lesser General Public License (LGPL)     |
 |            http://www.gnu.org/copyleft/lesser.html                        |
 | This program is distributed in the hope that it will be useful - WITHOUT  |
 | ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
 | FITNESS FOR A PARTICULAR PURPOSE.                                         |
 | ------------------------------------------------------------------------- |
 | We offer a number of paid services (www.codeworxtech.com):                |
 | - Web Hosting on highly optimized fast and secure servers                 |
 | - Technology Consulting                                                   |
 | - Oursourcing (highly qualified programmers and graphic designers)        |
 '---------------------------------------------------------------------------'
 */
 
 /**
  * PHPMailer Lite - PHP email transport class
  * NOTE: Requires PHP version 5 or later
  * @package PHPMailer Lite
  * @author Andy Prevost
  * @author Marcus Bointon
  * @copyright 2004 - 2009 Andy Prevost
  * @version $Id: class.phpmailer-lite.php 447 2009-09-12 13:21:38Z codeworxtech $
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 
 if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
 
 class PHPMailerLite {
 
   /////////////////////////////////////////////////
   // PROPERTIES, PUBLIC
   /////////////////////////////////////////////////
 
   /**
    * Email priority (1 = High, 3 = Normal, 5 = low).
    * @var int
    */
   public $Priority          = 3;
 
   /**
    * Sets the CharSet of the message.
    * @var string
    */
   public $CharSet           = 'iso-8859-1';
 
   /**
    * Sets the Content-type of the message.
    * @var string
    */
   public $ContentType       = 'text/plain';
 
   /**
    * Sets the Encoding of the message. Options for this are
    *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
    * @var string
    */
   public $Encoding          = '8bit';
 
   /**
    * Holds the most recent mailer error message.
    * @var string
    */
   public $ErrorInfo         = '';
 
   /**
    * Sets the From email address for the message.
    * @var string
    */
   public $From              = 'root@localhost';
 
   /**
    * Sets the From name of the message.
    * @var string
    */
   public $FromName          = 'Root User';
 
   /**
    * Sets the Sender email (Return-Path) of the message.  If not empty,
    * will be sent via -f to sendmail
    * @var string
    */
   public $Sender            = '';
 
   /**
    * Sets the Subject of the message.
    * @var string
    */
   public $Subject           = '';
 
   /**
    * Sets the Body of the message.  This can be either an HTML or text body.
    * If HTML then run IsHTML(true).
    * @var string
    */
   public $Body              = '';
 
   /**
    * Sets the text-only body of the message.  This automatically sets the
    * email to multipart/alternative.  This body can be read by mail
    * clients that do not have HTML email capability such as mutt. Clients
    * that can read HTML will view the normal Body.
    * @var string
    */
   public $AltBody           = '';
 
   /**
    * Sets word wrapping on the body of the message to a given number of
    * characters.
    * @var int
    */
   public $WordWrap          = 0;
 
   /**
    * Method to send mail: ("mail", or "sendmail").
    * @var string
    */
   public $Mailer            = 'sendmail';
 
   /**
    * Sets the path of the sendmail program.
    * @var string
    */
   public $Sendmail          = '/usr/sbin/sendmail';
 
   /**
    * Sets the email address that a reading confirmation will be sent.
    * @var string
    */
   public $ConfirmReadingTo  = '';
 
   /**
    * Sets the hostname to use in Message-Id and Received headers
    * and as default HELO string. If empty, the value returned
    * by SERVER_NAME is used or 'localhost.localdomain'.
    * @var string
    */
   public $Hostname          = '';
 
   /**
    * Sets the message ID to be used in the Message-Id header.
    * If empty, a unique id will be generated.
    * @var string
    */
   public $MessageID         = '';
 
   /**
    * Provides the ability to have the TO field process individual
    * emails, instead of sending to entire TO addresses
    * @var bool
    */
   public $SingleTo      = true;
 
   /**
    * If SingleTo is true, this provides the array to hold the email addresses
    * @var bool
    */
   public $SingleToArray = array();
 
   /**
    * Provides the ability to change the line ending
    * @var string
    */
   public $LE              = "\n";
 
   /**
    * Used with DKIM DNS Resource Record
    * @var string
    */
   public $DKIM_selector   = 'phpmailer';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
   public $DKIM_identity   = '';
 
   /**
    * Used with DKIM DNS Resource Record
    * required, in format of base domain 'yourdomain.com'
    * @var string
    */
   public $DKIM_domain     = '';
 
   /**
    * Used with DKIM Digital Signing process
    * optional
    * @var string
    */
   public $DKIM_passphrase = '';
 
   /**
    * Used with DKIM DNS Resource Record
    * required, private key (read from /.htprivkey)
    * @var string
    */
   public $DKIM_private    = '';
 
   /**
    * Callback Action function name
    * the function that handles the result of the send email action. Parameters:
    *   bool    $result        result of the send action
    *   string  $to            email address of the recipient
    *   string  $cc            cc email addresses
    *   string  $bcc           bcc email addresses
    *   string  $subject       the subject
    *   string  $body          the email body
    * @var string
    */
   public $action_function = ''; //'callbackAction';
 
   /**
    * Sets the PHPMailer Version number
    * @var string
    */
   public $Version         = 'Lite 5.1';
 
   /////////////////////////////////////////////////
   // PROPERTIES, PRIVATE AND PROTECTED
   /////////////////////////////////////////////////
 
   private   $to             = array();
   private   $cc             = array();
   private   $bcc            = array();
   private   $ReplyTo        = array();
   private   $all_recipients = array();
   private   $attachment     = array();
   private   $CustomHeader   = array();
   private   $message_type   = '';
   private   $boundary       = array();
   protected $language       = array();
   private   $error_count    = 0;
   private   $sign_cert_file = "";
   private   $sign_key_file  = "";
   private   $sign_key_pass  = "";
   private   $exceptions     = false;
 
   /////////////////////////////////////////////////
   // CONSTANTS
   /////////////////////////////////////////////////
 
   const STOP_MESSAGE = 0; // message only, continue processing
   const STOP_CONTINUE = 1; // message?, likely ok to continue processing
   const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
 
   /////////////////////////////////////////////////
   // METHODS, VARIABLES
   /////////////////////////////////////////////////
 
   /**
    * Constructor
    * @param boolean $exceptions Should we throw external exceptions?
    */
   public function __construct($exceptions = false) {
     $this->exceptions = ($exceptions == true);
   }
 
   /**
    * Sets message type to HTML.
    * @param bool $ishtml
    * @return void
    */
   public function IsHTML($ishtml = true) {
     if ($ishtml) {
       $this->ContentType = 'text/html';
     } else {
       $this->ContentType = 'text/plain';
     }
   }
 
   /**
    * Sets Mailer to send message using PHP mail() function.
    * @return void
    */
   public function IsMail() {
     $this->Mailer = 'mail';
   }
 
   /**
    * Sets Mailer to send message using the $Sendmail program.
    * @return void
    */
   public function IsSendmail() {
     if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
       $this->Sendmail = '/var/qmail/bin/sendmail';
     }
     $this->Mailer = 'sendmail';
   }
 
   /**
    * Sets Mailer to send message using the qmail MTA.
    * @return void
    */
   public function IsQmail() {
     if (stristr(ini_get('sendmail_path'), 'qmail')) {
       $this->Sendmail = '/var/qmail/bin/sendmail';
     }
     $this->Mailer = 'sendmail';
   }
 
   /////////////////////////////////////////////////
   // METHODS, RECIPIENTS
   /////////////////////////////////////////////////
 
   /**
    * Adds a "To" address.
    * @param string $address
    * @param string $name
    * @return boolean true on success, false if address already used
    */
   public function AddAddress($address, $name = '') {
     return $this->AddAnAddress('to', $address, $name);
   }
 
   /**
    * Adds a "Cc" address.
    * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
    * @param string $address
    * @param string $name
    * @return boolean true on success, false if address already used
    */
   public function AddCC($address, $name = '') {
     return $this->AddAnAddress('cc', $address, $name);
   }
 
   /**
    * Adds a "Bcc" address.
    * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
    * @param string $address
    * @param string $name
    * @return boolean true on success, false if address already used
    */
   public function AddBCC($address, $name = '') {
     return $this->AddAnAddress('bcc', $address, $name);
   }
 
   /**
    * Adds a "Reply-to" address.
    * @param string $address
    * @param string $name
    * @return boolean
    */
   public function AddReplyTo($address, $name = '') {
     return $this->AddAnAddress('ReplyTo', $address, $name);
   }
 
   /**
    * Adds an address to one of the recipient arrays
    * Addresses that have been added already return false, but do not throw exceptions
    * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
    * @param string $address The email address to send to
    * @param string $name
    * @return boolean true on success, false if address already used or invalid in some way
    * @access private
    */
   private function AddAnAddress($kind, $address, $name = '') {
     if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
       echo 'Invalid recipient array: ' . kind;
       return false;
     }
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
       $this->SetError($this->Lang('invalid_address').': '. $address);
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
       echo $this->Lang('invalid_address').': '.$address;
       return false;
     }
   if ($kind != 'ReplyTo') {
     if (!isset($this->all_recipients[strtolower($address)])) {
       array_push($this->$kind, array($address, $name));
       $this->all_recipients[strtolower($address)] = true;
       return true;
     }
   } else {
     if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
       $this->ReplyTo[strtolower($address)] = array($address, $name);
       return true;
     }
   }
   return false;
 }
 
 /**
  * Set the From and FromName properties
  * @param string $address
  * @param string $name
  * @return boolean
  */
   public function SetFrom($address, $name = '',$auto=1) {
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
       $this->SetError($this->Lang('invalid_address').': '. $address);
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
       echo $this->Lang('invalid_address').': '.$address;
       return false;
     }
     $this->From = $address;
     $this->FromName = $name;
     if ($auto) {
       if (empty($this->ReplyTo)) {
         $this->AddAnAddress('ReplyTo', $address, $name);
       }
       if (empty($this->Sender)) {
         $this->Sender = $address;
       }
     }
   return true;
   }
 
   /**
    * Check that a string looks roughly like an email address should
    * Static so it can be used without instantiation
    * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator
    * Conforms approximately to RFC2822
    * @link http://www.hexillion.com/samples/#Regex Original pattern found here
    * @param string $address The email address to check
    * @return boolean
    * @static
    * @access public
    */
   public static function ValidateAddress($address) {
     if (function_exists('filter_var')) { //Introduced in PHP 5.2
       if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
         return false;
       } else {
         return true;
       }
     } else {
       return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
     }
   }
 
   /////////////////////////////////////////////////
   // METHODS, MAIL SENDING
   /////////////////////////////////////////////////
 
   /**
    * Creates message and assigns Mailer. If the message is
    * not sent successfully then it returns false.  Use the ErrorInfo
    * variable to view description of the error.
    * @return bool
    */
   public function Send() {
     try {
       if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
         throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
       }
 
       // Set whether the message is multipart/alternative
       if(!empty($this->AltBody)) {
         $this->ContentType = 'multipart/alternative';
       }
 
       $this->error_count = 0; // reset errors
       $this->SetMessageType();
       $header = $this->CreateHeader();
       $body = $this->CreateBody();
 
       if (empty($this->Body)) {
         throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
       }
 
       // digitally sign with DKIM if enabled
       if ($this->DKIM_domain && $this->DKIM_private) {
         $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
         $header = str_replace("\r\n","\n",$header_dkim) . $header;
       }
 
       // Choose the mailer and send through it
       switch($this->Mailer) {
+        
+        case 'amazon-ses':
+          $toArr = array();
+          foreach($this->to as $t) {
+            $toArr[] = $this->AddrFormat($t);
+          }
+          $to = implode(', ', $toArr);
+          return $this->customMailer->executeSend(
+            "To: ".$to."\n".
+            $header.
+            $body);
+
         case 'sendmail':
           $sendAction = $this->SendmailSend($header, $body);
           return $sendAction;
         default:
           $sendAction = $this->MailSend($header, $body);
           return $sendAction;
       }
 
     } catch (phpmailerException $e) {
       $this->SetError($e->getMessage());
       if ($this->exceptions) {
         throw $e;
       }
       echo $e->getMessage()."\n";
       return false;
     }
   }
 
   /**
    * Sends mail using the $Sendmail program.
    * @param string $header The message headers
    * @param string $body The message body
    * @access protected
    * @return bool
    */
   protected function SendmailSend($header, $body) {
     if ($this->Sender != '') {
       $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
     } else {
       $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
     }
     if ($this->SingleTo === true) {
       foreach ($this->SingleToArray as $key => $val) {
         if(!@$mail = popen($sendmail, 'w')) {
           throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
         }
         fputs($mail, "To: " . $val . "\n");
         fputs($mail, $header);
         fputs($mail, $body);
         $result = pclose($mail);
         // implement call back function if it exists
         $isSent = ($result == 0) ? 1 : 0;
         $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
         if($result != 0) {
           throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
         }
       }
     } else {
       if(!@$mail = popen($sendmail, 'w')) {
         throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
       }
       fputs($mail, $header);
       fputs($mail, $body);
       $result = pclose($mail);
       // implement call back function if it exists
       $isSent = ($result == 0) ? 1 : 0;
       $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
       if($result != 0) {
         throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
       }
     }
     return true;
   }
 
   /**
    * Sends mail using the PHP mail() function.
    * @param string $header The message headers
    * @param string $body The message body
    * @access protected
    * @return bool
    */
   protected function MailSend($header, $body) {
     $toArr = array();
     foreach($this->to as $t) {
       $toArr[] = $this->AddrFormat($t);
     }
     $to = implode(', ', $toArr);
 
     $params = sprintf("-oi -f %s", $this->Sender);
     if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
       $old_from = ini_get('sendmail_from');
       ini_set('sendmail_from', $this->Sender);
       if ($this->SingleTo === true && count($toArr) > 1) {
         foreach ($toArr as $key => $val) {
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
           // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
           $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
         }
       } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
         $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
       }
     } else {
       if ($this->SingleTo === true && count($toArr) > 1) {
         foreach ($toArr as $key => $val) {
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
           // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
           $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
         }
       } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
         $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
       }
     }
     if (isset($old_from)) {
       ini_set('sendmail_from', $old_from);
     }
     if(!$rt) {
       throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
     }
     return true;
   }
 
   /**
   * Sets the language for all class error messages.
   * Returns false if it cannot load the language file.  The default language is English.
   * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
   * @param string $lang_path Path to the language file directory
   * @access public
   */
   function SetLanguage($langcode = 'en', $lang_path = 'language/') {
     //Define full set of translatable strings
     $PHPMAILER_LANG = array(
       'provide_address' => 'You must provide at least one recipient email address.',
       'mailer_not_supported' => ' mailer is not supported.',
       'execute' => 'Could not execute: ',
       'instantiate' => 'Could not instantiate mail function.',
       'from_failed' => 'The following From address failed: ',
       'file_access' => 'Could not access file: ',
       'file_open' => 'File Error: Could not open file: ',
       'encoding' => 'Unknown encoding: ',
       'signing' => 'Signing Error: ',
       'empty_message' => 'Message body empty',
       'invalid_address' => 'Invalid address',
       'variable_set' => 'Cannot set or reset variable: '
     );
     //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
     $l = true;
     if ($langcode != 'en') { //There is no English translation file
       $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
     }
     $this->language = $PHPMAILER_LANG;
     return ($l == true); //Returns false if language not found
   }
 
   /**
   * Return the current array of language strings
   * @return array
   */
   public function GetTranslations() {
     return $this->language;
   }
 
   /////////////////////////////////////////////////
   // METHODS, MESSAGE CREATION
   /////////////////////////////////////////////////
 
   /**
    * Creates recipient headers.
    * @access public
    * @return string
    */
   public function AddrAppend($type, $addr) {
     $addr_str = $type . ': ';
     $addresses = array();
     foreach ($addr as $a) {
       $addresses[] = $this->AddrFormat($a);
     }
     $addr_str .= implode(', ', $addresses);
     $addr_str .= $this->LE;
 
     return $addr_str;
   }
 
   /**
    * Formats an address correctly.
    * @access public
    * @return string
    */
   public function AddrFormat($addr) {
     if (empty($addr[1])) {
       return $this->SecureHeader($addr[0]);
     } else {
       return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
     }
   }
 
   /**
    * Wraps message for use with mailers that do not
    * automatically perform wrapping and for quoted-printable.
    * Original written by philippe.
    * @param string $message The message to wrap
    * @param integer $length The line length to wrap to
    * @param boolean $qp_mode Whether to run in Quoted-Printable mode
    * @access public
    * @return string
    */
   public function WrapText($message, $length, $qp_mode = false) {
     $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
     // If utf-8 encoding is used, we will need to make sure we don't
     // split multibyte characters when we wrap
     $is_utf8 = (strtolower($this->CharSet) == "utf-8");
 
     $message = $this->FixEOL($message);
     if (substr($message, -1) == $this->LE) {
       $message = substr($message, 0, -1);
     }
 
     $line = explode($this->LE, $message);
     $message = '';
     for ($i=0 ;$i < count($line); $i++) {
       $line_part = explode(' ', $line[$i]);
       $buf = '';
       for ($e = 0; $e<count($line_part); $e++) {
         $word = $line_part[$e];
         if ($qp_mode and (strlen($word) > $length)) {
           $space_left = $length - strlen($buf) - 1;
           if ($e != 0) {
             if ($space_left > 20) {
               $len = $space_left;
               if ($is_utf8) {
                 $len = $this->UTF8CharBoundary($word, $len);
               } elseif (substr($word, $len - 1, 1) == "=") {
                 $len--;
               } elseif (substr($word, $len - 2, 1) == "=") {
                 $len -= 2;
               }
               $part = substr($word, 0, $len);
               $word = substr($word, $len);
               $buf .= ' ' . $part;
               $message .= $buf . sprintf("=%s", $this->LE);
             } else {
               $message .= $buf . $soft_break;
             }
             $buf = '';
           }
           while (strlen($word) > 0) {
             $len = $length;
             if ($is_utf8) {
               $len = $this->UTF8CharBoundary($word, $len);
             } elseif (substr($word, $len - 1, 1) == "=") {
               $len--;
             } elseif (substr($word, $len - 2, 1) == "=") {
               $len -= 2;
             }
             $part = substr($word, 0, $len);
             $word = substr($word, $len);
 
             if (strlen($word) > 0) {
               $message .= $part . sprintf("=%s", $this->LE);
             } else {
               $buf = $part;
             }
           }
         } else {
           $buf_o = $buf;
           $buf .= ($e == 0) ? $word : (' ' . $word);
 
           if (strlen($buf) > $length and $buf_o != '') {
             $message .= $buf_o . $soft_break;
             $buf = $word;
           }
         }
       }
       $message .= $buf . $this->LE;
     }
 
     return $message;
   }
 
   /**
    * Finds last character boundary prior to maxLength in a utf-8
    * quoted (printable) encoded string.
    * Original written by Colin Brown.
    * @access public
    * @param string $encodedText utf-8 QP text
    * @param int    $maxLength   find last character boundary prior to this length
    * @return int
    */
   public function UTF8CharBoundary($encodedText, $maxLength) {
     $foundSplitPos = false;
     $lookBack = 3;
     while (!$foundSplitPos) {
       $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
       $encodedCharPos = strpos($lastChunk, "=");
       if ($encodedCharPos !== false) {
         // Found start of encoded character byte within $lookBack block.
         // Check the encoded byte value (the 2 chars after the '=')
         $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
         $dec = hexdec($hex);
         if ($dec < 128) { // Single byte character.
           // If the encoded char was found at pos 0, it will fit
           // otherwise reduce maxLength to start of the encoded char
           $maxLength = ($encodedCharPos == 0) ? $maxLength :
           $maxLength - ($lookBack - $encodedCharPos);
           $foundSplitPos = true;
         } elseif ($dec >= 192) { // First byte of a multi byte character
           // Reduce maxLength to split at start of character
           $maxLength = $maxLength - ($lookBack - $encodedCharPos);
           $foundSplitPos = true;
         } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
           $lookBack += 3;
         }
       } else {
         // No encoded character found
         $foundSplitPos = true;
       }
     }
     return $maxLength;
   }
 
   /**
    * Set the body wrapping.
    * @access public
    * @return void
    */
   public function SetWordWrap() {
     if($this->WordWrap < 1) {
       return;
     }
     switch($this->message_type) {
       case 'alt':
       case 'alt_attachments':
         $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
         break;
       default:
         $this->Body = $this->WrapText($this->Body, $this->WordWrap);
         break;
     }
   }
 
   /**
    * Assembles message header.
    * @access public
    * @return string The assembled header
    */
   public function CreateHeader() {
     $result = '';
 
     // Set the boundaries
     $uniq_id = md5(uniqid(time()));
     $this->boundary[1] = 'b1_' . $uniq_id;
     $this->boundary[2] = 'b2_' . $uniq_id;
 
     $result .= $this->HeaderLine('Date', self::RFCDate());
     if($this->Sender == '') {
       $result .= $this->HeaderLine('Return-Path', trim($this->From));
     } else {
       $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
     }
 
     // To be created automatically by mail()
     if($this->Mailer != 'mail') {
       if ($this->SingleTo === true) {
         foreach($this->to as $t) {
           $this->SingleToArray[] = $this->AddrFormat($t);
         }
       } else {
         if(count($this->to) > 0) {
           $result .= $this->AddrAppend('To', $this->to);
         } elseif (count($this->cc) == 0) {
           $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
         }
       }
     }
 
     $from = array();
     $from[0][0] = trim($this->From);
     $from[0][1] = $this->FromName;
     $result .= $this->AddrAppend('From', $from);
 
     // sendmail and mail() extract Cc from the header before sending
     if(count($this->cc) > 0) {
       $result .= $this->AddrAppend('Cc', $this->cc);
     }
 
     // sendmail and mail() extract Bcc from the header before sending
     if(count($this->bcc) > 0) {
       $result .= $this->AddrAppend('Bcc', $this->bcc);
     }
 
     if(count($this->ReplyTo) > 0) {
       $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
     }
 
     // mail() sets the subject itself
     if($this->Mailer != 'mail') {
       $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
     }
 
     if($this->MessageID != '') {
       $result .= $this->HeaderLine('Message-ID',$this->MessageID);
     } else {
       $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
     }
     $result .= $this->HeaderLine('X-Priority', $this->Priority);
-    $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.codeworxtech.com)');
 
     if($this->ConfirmReadingTo != '') {
       $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
     }
 
     // Add custom headers
     for($index = 0; $index < count($this->CustomHeader); $index++) {
       $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
     }
     if (!$this->sign_key_file) {
       $result .= $this->HeaderLine('MIME-Version', '1.0');
       $result .= $this->GetMailMIME();
     }
 
     return $result;
   }
 
   /**
    * Returns the message MIME.
    * @access public
    * @return string
    */
   public function GetMailMIME() {
     $result = '';
     switch($this->message_type) {
       case 'plain':
         $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
         $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
         break;
       case 'attachments':
       case 'alt_attachments':
         if($this->InlineImageExists()){
           $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
         } else {
           $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
           $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
         }
         break;
       case 'alt':
         $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
         $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
         break;
     }
 
     if($this->Mailer != 'mail') {
       $result .= $this->LE.$this->LE;
     }
 
     return $result;
   }
 
   /**
    * Assembles the message body.  Returns an empty string on failure.
    * @access public
    * @return string The assembled message body
    */
   public function CreateBody() {
     $body = '';
 
     if ($this->sign_key_file) {
       $body .= $this->GetMailMIME();
     }
 
     $this->SetWordWrap();
 
     switch($this->message_type) {
       case 'alt':
         $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->EndBoundary($this->boundary[1]);
         break;
       case 'plain':
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         break;
       case 'attachments':
         $body .= $this->GetBoundary($this->boundary[1], '', '', '');
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE;
         $body .= $this->AttachAll();
         break;
       case 'alt_attachments':
         $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
         $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
         $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->EndBoundary($this->boundary[2]);
         $body .= $this->AttachAll();
         break;
     }
 
     if ($this->IsError()) {
       $body = '';
     } elseif ($this->sign_key_file) {
       try {
         $file = tempnam('', 'mail');
         file_put_contents($file, $body); //TODO check this worked
         $signed = tempnam("", "signed");
         if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) {
           @unlink($file);
           @unlink($signed);
           $body = file_get_contents($signed);
         } else {
           @unlink($file);
           @unlink($signed);
           throw new phpmailerException($this->Lang("signing").openssl_error_string());
         }
       } catch (phpmailerException $e) {
         $body = '';
         if ($this->exceptions) {
           throw $e;
         }
       }
     }
 
     return $body;
   }
 
   /**
    * Returns the start of a message boundary.
    * @access private
    */
   private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
     $result = '';
     if($charSet == '') {
       $charSet = $this->CharSet;
     }
     if($contentType == '') {
       $contentType = $this->ContentType;
     }
     if($encoding == '') {
       $encoding = $this->Encoding;
     }
     $result .= $this->TextLine('--' . $boundary);
     $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
     $result .= $this->LE;
     $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
     $result .= $this->LE;
 
     return $result;
   }
 
   /**
    * Returns the end of a message boundary.
    * @access private
    */
   private function EndBoundary($boundary) {
     return $this->LE . '--' . $boundary . '--' . $this->LE;
   }
 
   /**
    * Sets the message type.
    * @access private
    * @return void
    */
   private function SetMessageType() {
     if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
       $this->message_type = 'plain';
     } else {
       if(count($this->attachment) > 0) {
         $this->message_type = 'attachments';
       }
       if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
         $this->message_type = 'alt';
       }
       if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
         $this->message_type = 'alt_attachments';
       }
     }
   }
 
   /**
    *  Returns a formatted header line.
    * @access public
    * @return string
    */
   public function HeaderLine($name, $value) {
     return $name . ': ' . $value . $this->LE;
   }
 
   /**
    * Returns a formatted mail line.
    * @access public
    * @return string
    */
   public function TextLine($value) {
     return $value . $this->LE;
   }
 
   /////////////////////////////////////////////////
   // CLASS METHODS, ATTACHMENTS
   /////////////////////////////////////////////////
 
   /**
    * Adds an attachment from a path on the filesystem.
    * Returns false if the file could not be found
    * or accessed.
    * @param string $path Path to the attachment.
    * @param string $name Overrides the attachment name.
    * @param string $encoding File encoding (see $Encoding).
    * @param string $type File extension (MIME) type.
    * @return bool
    */
   public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
     try {
       if ( !@is_file($path) ) {
         throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
       }
       $filename = basename($path);
       if ( $name == '' ) {
         $name = $filename;
       }
 
       $this->attachment[] = array(
         0 => $path,
         1 => $filename,
         2 => $name,
         3 => $encoding,
         4 => $type,
         5 => false,  // isStringAttachment
         6 => 'attachment',
         7 => 0
       );
 
     } catch (phpmailerException $e) {
       $this->SetError($e->getMessage());
       if ($this->exceptions) {
         throw $e;
       }
       echo $e->getMessage()."\n";
       if ( $e->getCode() == self::STOP_CRITICAL ) {
         return false;
       }
     }
     return true;
   }
 
   /**
   * Return the current array of attachments
   * @return array
   */
   public function GetAttachments() {
     return $this->attachment;
   }
 
   /**
    * Attaches all fs, string, and binary attachments to the message.
    * Returns an empty string on failure.
    * @access private
    * @return string
    */
   private function AttachAll() {
     // Return text of body
     $mime = array();
     $cidUniq = array();
     $incl = array();
 
     // Add all attachments
     foreach ($this->attachment as $attachment) {
       // Check for string attachment
       $bString = $attachment[5];
       if ($bString) {
         $string = $attachment[0];
       } else {
         $path = $attachment[0];
       }
 
       if (in_array($attachment[0], $incl)) { continue; }
       $filename    = $attachment[1];
       $name        = $attachment[2];
       $encoding    = $attachment[3];
       $type        = $attachment[4];
       $disposition = $attachment[6];
       $cid         = $attachment[7];
       $incl[]      = $attachment[0];
       if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
       $cidUniq[$cid] = true;
 
       $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
       $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
       $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
 
       if($disposition == 'inline') {
         $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
       }
 
       $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
 
       // Encode as string attachment
       if($bString) {
         $mime[] = $this->EncodeString($string, $encoding);
         if($this->IsError()) {
           return '';
         }
         $mime[] = $this->LE.$this->LE;
       } else {
         $mime[] = $this->EncodeFile($path, $encoding);
         if($this->IsError()) {
           return '';
         }
         $mime[] = $this->LE.$this->LE;
       }
     }
 
     $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
 
     return join('', $mime);
   }
 
   /**
    * Encodes attachment in requested format.
    * Returns an empty string on failure.
    * @param string $path The full path to the file
    * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
    * @see EncodeFile()
    * @access private
    * @return string
    */
   private function EncodeFile($path, $encoding = 'base64') {
     try {
       if (!is_readable($path)) {
         throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
       }
       if (function_exists('get_magic_quotes')) {
         function get_magic_quotes() {
           return false;
         }
       }
       if (PHP_VERSION < 6) {
         $magic_quotes = get_magic_quotes_runtime();
         set_magic_quotes_runtime(0);
       }
       $file_buffer  = file_get_contents($path);
       $file_buffer  = $this->EncodeString($file_buffer, $encoding);
       if (PHP_VERSION < 6) { set_magic_quotes_runtime($magic_quotes); }
       return $file_buffer;
     } catch (Exception $e) {
       $this->SetError($e->getMessage());
       return '';
     }
   }
 
   /**
    * Encodes string to requested format.
    * Returns an empty string on failure.
    * @param string $str The text to encode
    * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
    * @access public
    * @return string
    */
   public function EncodeString ($str, $encoding = 'base64') {
     $encoded = '';
     switch(strtolower($encoding)) {
       case 'base64':
         $encoded = chunk_split(base64_encode($str), 76, $this->LE);
         break;
       case '7bit':
       case '8bit':
         $encoded = $this->FixEOL($str);
         //Make sure it ends with a line break
         if (substr($encoded, -(strlen($this->LE))) != $this->LE)
           $encoded .= $this->LE;
         break;
       case 'binary':
         $encoded = $str;
         break;
       case 'quoted-printable':
         $encoded = $this->EncodeQP($str);
         break;
       default:
         $this->SetError($this->Lang('encoding') . $encoding);
         break;
     }
     return $encoded;
   }
 
   /**
    * Encode a header string to best (shortest) of Q, B, quoted or none.
    * @access public
    * @return string
    */
   public function EncodeHeader($str, $position = 'text') {
     $x = 0;
 
     switch (strtolower($position)) {
       case 'phrase':
         if (!preg_match('/[\200-\377]/', $str)) {
           // Can't use addslashes as we don't know what value has magic_quotes_sybase
           $encoded = addcslashes($str, "\0..\37\177\\\"");
           if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
             return ($encoded);
           } else {
             return ("\"$encoded\"");
           }
         }
         $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
         break;
       case 'comment':
         $x = preg_match_all('/[()"]/', $str, $matches);
         // Fall-through
       case 'text':
       default:
         $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
         break;
     }
 
     if ($x == 0) {
       return ($str);
     }
 
     $maxlen = 75 - 7 - strlen($this->CharSet);
     // Try to select the encoding which should produce the shortest output
     if (strlen($str)/3 < $x) {
       $encoding = 'B';
       if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
         // Use a custom function which correctly encodes and wraps long
         // multibyte strings without breaking lines within a character
         $encoded = $this->Base64EncodeWrapMB($str);
       } else {
         $encoded = base64_encode($str);
         $maxlen -= $maxlen % 4;
         $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
       }
     } else {
       $encoding = 'Q';
       $encoded = $this->EncodeQ($str, $position);
       $encoded = $this->WrapText($encoded, $maxlen, true);
       $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
     }
 
     $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
     $encoded = trim(str_replace("\n", $this->LE, $encoded));
 
     return $encoded;
   }
 
   /**
    * Checks if a string contains multibyte characters.
    * @access public
    * @param string $str multi-byte text to wrap encode
    * @return bool
    */
   public function HasMultiBytes($str) {
     if (function_exists('mb_strlen')) {
       return (strlen($str) > mb_strlen($str, $this->CharSet));
     } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
       return false;
     }
   }
 
   /**
    * Correctly encodes and wraps long multibyte strings for mail headers
    * without breaking lines within a character.
    * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php
    * @access public
    * @param string $str multi-byte text to wrap encode
    * @return string
    */
   public function Base64EncodeWrapMB($str) {
     $start = "=?".$this->CharSet."?B?";
     $end = "?=";
     $encoded = "";
 
     $mb_length = mb_strlen($str, $this->CharSet);
     // Each line must have length <= 75, including $start and $end
     $length = 75 - strlen($start) - strlen($end);
     // Average multi-byte ratio
     $ratio = $mb_length / strlen($str);
     // Base64 has a 4:3 ratio
     $offset = $avgLength = floor($length * $ratio * .75);
 
     for ($i = 0; $i < $mb_length; $i += $offset) {
       $lookBack = 0;
 
       do {
         $offset = $avgLength - $lookBack;
         $chunk = mb_substr($str, $i, $offset, $this->CharSet);
         $chunk = base64_encode($chunk);
         $lookBack++;
       }
       while (strlen($chunk) > $length);
 
       $encoded .= $chunk . $this->LE;
     }
 
     // Chomp the last linefeed
     $encoded = substr($encoded, 0, -strlen($this->LE));
     return $encoded;
   }
 
   /**
   * Encode string to quoted-printable.
   * Only uses standard PHP, slow, but will always work
   * @access public
   * @param string $string the text to encode
   * @param integer $line_max Number of chars allowed on a line before wrapping
   * @return string
   */
   public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
     $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
     $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
     $eol = "\r\n";
     $escape = '=';
     $output = '';
     while( list(, $line) = each($lines) ) {
       $linlen = strlen($line);
       $newline = '';
       for($i = 0; $i < $linlen; $i++) {
         $c = substr( $line, $i, 1 );
         $dec = ord( $c );
         if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
           $c = '=2E';
         }
         if ( $dec == 32 ) {
           if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
             $c = '=20';
           } else if ( $space_conv ) {
             $c = '=20';
           }
         } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
           $h2 = floor($dec/16);
           $h1 = floor($dec%16);
           $c = $escape.$hex[$h2].$hex[$h1];
         }
         if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
           $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
           $newline = '';
           // check if newline first character will be point or not
           if ( $dec == 46 ) {
             $c = '=2E';
           }
         }
         $newline .= $c;
       } // end of for
       $output .= $newline.$eol;
     } // end of while
     return $output;
   }
 
   /**
   * Encode string to RFC2045 (6.7) quoted-printable format
   * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
   * Also results in same content as you started with after decoding
   * @see EncodeQPphp()
   * @access public
   * @param string $string the text to encode
   * @param integer $line_max Number of chars allowed on a line before wrapping
   * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
   * @return string
   * @author Marcus Bointon
   */
   public function EncodeQP($string, $line_max = 76, $space_conv = false) {
     if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
       return quoted_printable_encode($string);
     }
     $filters = stream_get_filters();
     if (!in_array('convert.*', $filters)) { //Got convert stream filter?
       return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
     }
     $fp = fopen('php://temp/', 'r+');
     $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks
     $params = array('line-length' => $line_max, 'line-break-chars' => $this->LE);
     $s = stream_filter_append($fp, 'convert.quoted-printable-encode', STREAM_FILTER_READ, $params);
     fputs($fp, $string);
     rewind($fp);
     $out = stream_get_contents($fp);
     stream_filter_remove($s);
     $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange
     fclose($fp);
     return $out;
   }
 
   /**
    * Encode string to q encoding.
    * @link http://tools.ietf.org/html/rfc2047
    * @param string $str the text to encode
    * @param string $position Where the text is going to be used, see the RFC for what that means
    * @access public
    * @return string
    */
   public function EncodeQ ($str, $position = 'text') {
     // There should not be any EOL in the string
     $encoded = preg_replace('/[\r\n]*/', '', $str);
 
     switch (strtolower($position)) {
       case 'phrase':
         $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
         break;
       case 'comment':
         $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
       case 'text':
       default:
         // Replace every high ascii, control =, ? and _ characters
         //TODO using /e (equivalent to eval()) is probably not a good idea
         $encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
               "'='.sprintf('%02X', ord('\\1'))", $encoded);
         break;
     }
 
     // Replace every spaces to _ (more readable than =20)
     $encoded = str_replace(' ', '_', $encoded);
 
     return $encoded;
   }
 
   /**
    * Adds a string or binary attachment (non-filesystem) to the list.
    * This method can be used to attach ascii or binary data,
    * such as a BLOB record from a database.
    * @param string $string String attachment data.
    * @param string $filename Name of the attachment.
    * @param string $encoding File encoding (see $Encoding).
    * @param string $type File extension (MIME) type.
    * @return void
    */
   public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
     // Append to $attachment array
     $this->attachment[] = array(
       0 => $string,
       1 => $filename,
       2 => basename($filename),
       3 => $encoding,
       4 => $type,
       5 => true,  // isStringAttachment
       6 => 'attachment',
       7 => 0
     );
   }
 
   /**
    * Adds an embedded attachment.  This can include images, sounds, and
    * just about any other document.  Make sure to set the $type to an
    * image type.  For JPEG images use "image/jpeg" and for GIF images
    * use "image/gif".
    * @param string $path Path to the attachment.
    * @param string $cid Content ID of the attachment.  Use this to identify
    *        the Id for accessing the image in an HTML form.
    * @param string $name Overrides the attachment name.
    * @param string $encoding File encoding (see $Encoding).
    * @param string $type File extension (MIME) type.
    * @return bool
    */
   public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
 
     if ( !@is_file($path) ) {
       $this->SetError($this->Lang('file_access') . $path);
       return false;
     }
 
     $filename = basename($path);
     if ( $name == '' ) {
       $name = $filename;
     }
 
     // Append to $attachment array
     $this->attachment[] = array(
       0 => $path,
       1 => $filename,
       2 => $name,
       3 => $encoding,
       4 => $type,
       5 => false,  // isStringAttachment
       6 => 'inline',
       7 => $cid
     );
 
     return true;
   }
 
   /**
    * Returns true if an inline attachment is present.
    * @access public
    * @return bool
    */
   public function InlineImageExists() {
     foreach($this->attachment as $attachment) {
       if ($attachment[6] == 'inline') {
         return true;
       }
     }
     return false;
   }
 
   /////////////////////////////////////////////////
   // CLASS METHODS, MESSAGE RESET
   /////////////////////////////////////////////////
 
   /**
    * Clears all recipients assigned in the TO array.  Returns void.
    * @return void
    */
   public function ClearAddresses() {
     foreach($this->to as $to) {
       unset($this->all_recipients[strtolower($to[0])]);
     }
     $this->to = array();
   }
 
   /**
    * Clears all recipients assigned in the CC array.  Returns void.
    * @return void
    */
   public function ClearCCs() {
     foreach($this->cc as $cc) {
       unset($this->all_recipients[strtolower($cc[0])]);
     }
     $this->cc = array();
   }
 
   /**
    * Clears all recipients assigned in the BCC array.  Returns void.
    * @return void
    */
   public function ClearBCCs() {
     foreach($this->bcc as $bcc) {
       unset($this->all_recipients[strtolower($bcc[0])]);
     }
     $this->bcc = array();
   }
 
   /**
    * Clears all recipients assigned in the ReplyTo array.  Returns void.
    * @return void
    */
   public function ClearReplyTos() {
     $this->ReplyTo = array();
   }
 
   /**
    * Clears all recipients assigned in the TO, CC and BCC
    * array.  Returns void.
    * @return void
    */
   public function ClearAllRecipients() {
     $this->to = array();
     $this->cc = array();
     $this->bcc = array();
     $this->all_recipients = array();
   }
 
   /**
    * Clears all previously set filesystem, string, and binary
    * attachments.  Returns void.
    * @return void
    */
   public function ClearAttachments() {
     $this->attachment = array();
   }
 
   /**
    * Clears all custom headers.  Returns void.
    * @return void
    */
   public function ClearCustomHeaders() {
     $this->CustomHeader = array();
   }
 
   /////////////////////////////////////////////////
   // CLASS METHODS, MISCELLANEOUS
   /////////////////////////////////////////////////
 
   /**
    * Adds the error message to the error container.
    * @access protected
    * @return void
    */
   protected function SetError($msg) {
     $this->error_count++;
     $this->ErrorInfo = $msg;
   }
 
   /**
    * Returns the proper RFC 822 formatted date.
    * @access public
    * @return string
    * @static
    */
   public static function RFCDate() {
     $tz = date('Z');
     $tzs = ($tz < 0) ? '-' : '+';
     $tz = abs($tz);
     $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
     $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
 
     return $result;
   }
 
   /**
    * Returns the server hostname or 'localhost.localdomain' if unknown.
    * @access private
    * @return string
    */
   private function ServerHostname() {
     if (!empty($this->Hostname)) {
       $result = $this->Hostname;
     } elseif (isset($_SERVER['SERVER_NAME'])) {
       $result = $_SERVER['SERVER_NAME'];
     } else {
       $result = 'localhost.localdomain';
     }
 
     return $result;
   }
 
   /**
    * Returns a message in the appropriate language.
    * @access private
    * @return string
    */
   private function Lang($key) {
     if(count($this->language) < 1) {
       $this->SetLanguage('en'); // set the default language
     }
 
     if(isset($this->language[$key])) {
       return $this->language[$key];
     } else {
       return 'Language string failed to load: ' . $key;
     }
   }
 
   /**
    * Returns true if an error occurred.
    * @access public
    * @return bool
    */
   public function IsError() {
     return ($this->error_count > 0);
   }
 
   /**
    * Changes every end of line from CR or LF to CRLF.
    * @access private
    * @return string
    */
   private function FixEOL($str) {
     $str = str_replace("\r\n", "\n", $str);
     $str = str_replace("\r", "\n", $str);
     $str = str_replace("\n", $this->LE, $str);
     return $str;
   }
 
   /**
    * Adds a custom header.
    * @access public
    * @return void
    */
   public function AddCustomHeader($custom_header) {
     $this->CustomHeader[] = explode(':', $custom_header, 2);
   }
 
   /**
    * Evaluates the message and returns modifications for inline images and backgrounds
    * @access public
    * @return $message
    */
   public function MsgHTML($message, $basedir = '') {
     preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
     if(isset($images[2])) {
       foreach($images[2] as $i => $url) {
         // do not change urls for absolute images (thanks to corvuscorax)
         if (!preg_match('#^[A-z]+://#',$url)) {
           $filename = basename($url);
           $directory = dirname($url);
           ($directory == '.')?$directory='':'';
           $cid = 'cid:' . md5($filename);
           $ext = pathinfo($filename, PATHINFO_EXTENSION);
           $mimeType  = self::_mime_types($ext);
           if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
           if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
           if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
             $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
           }
         }
       }
     }
     $this->IsHTML(true);
     $this->Body = $message;
     $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
     if (!empty($textMsg) && empty($this->AltBody)) {
       $this->AltBody = html_entity_decode($textMsg);
     }
     if (empty($this->AltBody)) {
       $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
     }
   }
 
   /**
    * Gets the MIME type of the embedded or inline image
    * @param string File extension
    * @access public
    * @return string MIME type of ext
    * @static
    */
   public static function _mime_types($ext = '') {
     $mimes = array(
       'hqx'   =>  'application/mac-binhex40',
       'cpt'   =>  'application/mac-compactpro',
       'doc'   =>  'application/msword',
       'bin'   =>  'application/macbinary',
       'dms'   =>  'application/octet-stream',
       'lha'   =>  'application/octet-stream',
       'lzh'   =>  'application/octet-stream',
       'exe'   =>  'application/octet-stream',
       'class' =>  'application/octet-stream',
       'psd'   =>  'application/octet-stream',
       'so'    =>  'application/octet-stream',
       'sea'   =>  'application/octet-stream',
       'dll'   =>  'application/octet-stream',
       'oda'   =>  'application/oda',
       'pdf'   =>  'application/pdf',
       'ai'    =>  'application/postscript',
       'eps'   =>  'application/postscript',
       'ps'    =>  'application/postscript',
       'smi'   =>  'application/smil',
       'smil'  =>  'application/smil',
       'mif'   =>  'application/vnd.mif',
       'xls'   =>  'application/vnd.ms-excel',
       'ppt'   =>  'application/vnd.ms-powerpoint',
       'wbxml' =>  'application/vnd.wap.wbxml',
       'wmlc'  =>  'application/vnd.wap.wmlc',
       'dcr'   =>  'application/x-director',
       'dir'   =>  'application/x-director',
       'dxr'   =>  'application/x-director',
       'dvi'   =>  'application/x-dvi',
       'gtar'  =>  'application/x-gtar',
       'php'   =>  'application/x-httpd-php',
       'php4'  =>  'application/x-httpd-php',
       'php3'  =>  'application/x-httpd-php',
       'phtml' =>  'application/x-httpd-php',
       'phps'  =>  'application/x-httpd-php-source',
       'js'    =>  'application/x-javascript',
       'swf'   =>  'application/x-shockwave-flash',
       'sit'   =>  'application/x-stuffit',
       'tar'   =>  'application/x-tar',
       'tgz'   =>  'application/x-tar',
       'xhtml' =>  'application/xhtml+xml',
       'xht'   =>  'application/xhtml+xml',
       'zip'   =>  'application/zip',
       'mid'   =>  'audio/midi',
       'midi'  =>  'audio/midi',
       'mpga'  =>  'audio/mpeg',
       'mp2'   =>  'audio/mpeg',
       'mp3'   =>  'audio/mpeg',
       'aif'   =>  'audio/x-aiff',
       'aiff'  =>  'audio/x-aiff',
       'aifc'  =>  'audio/x-aiff',
       'ram'   =>  'audio/x-pn-realaudio',
       'rm'    =>  'audio/x-pn-realaudio',
       'rpm'   =>  'audio/x-pn-realaudio-plugin',
       'ra'    =>  'audio/x-realaudio',
       'rv'    =>  'video/vnd.rn-realvideo',
       'wav'   =>  'audio/x-wav',
       'bmp'   =>  'image/bmp',
       'gif'   =>  'image/gif',
       'jpeg'  =>  'image/jpeg',
       'jpg'   =>  'image/jpeg',
       'jpe'   =>  'image/jpeg',
       'png'   =>  'image/png',
       'tiff'  =>  'image/tiff',
       'tif'   =>  'image/tiff',
       'css'   =>  'text/css',
       'html'  =>  'text/html',
       'htm'   =>  'text/html',
       'shtml' =>  'text/html',
       'txt'   =>  'text/plain',
       'text'  =>  'text/plain',
       'log'   =>  'text/plain',
       'rtx'   =>  'text/richtext',
       'rtf'   =>  'text/rtf',
       'xml'   =>  'text/xml',
       'xsl'   =>  'text/xml',
       'mpeg'  =>  'video/mpeg',
       'mpg'   =>  'video/mpeg',
       'mpe'   =>  'video/mpeg',
       'qt'    =>  'video/quicktime',
       'mov'   =>  'video/quicktime',
       'avi'   =>  'video/x-msvideo',
       'movie' =>  'video/x-sgi-movie',
       'doc'   =>  'application/msword',
       'word'  =>  'application/msword',
       'xl'    =>  'application/excel',
       'eml'   =>  'message/rfc822'
     );
     return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
   }
 
   /**
   * Set (or reset) Class Objects (variables)
   *
   * Usage Example:
   * $page->set('X-Priority', '3');
   *
   * @access public
   * @param string $name Parameter Name
   * @param mixed $value Parameter Value
   * NOTE: will not work with arrays, there are no arrays to set/reset
   * @todo Should this not be using __set() magic function?
   */
   public function set($name, $value = '') {
     try {
       if (isset($this->$name) ) {
         $this->$name = $value;
       } else {
         throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
       }
     } catch (Exception $e) {
       $this->SetError($e->getMessage());
       if ($e->getCode() == self::STOP_CRITICAL) {
         return false;
       }
     }
     return true;
   }
 
   /**
    * Strips newlines to prevent header injection.
    * @access public
    * @param string $str String
    * @return string
    */
   public function SecureHeader($str) {
     $str = str_replace("\r", '', $str);
     $str = str_replace("\n", '', $str);
     return trim($str);
   }
 
   /**
    * Set the private key file and password to sign the message.
    *
    * @access public
    * @param string $key_filename Parameter File Name
    * @param string $key_pass Password for private key
    */
   public function Sign($cert_filename, $key_filename, $key_pass) {
     $this->sign_cert_file = $cert_filename;
     $this->sign_key_file = $key_filename;
     $this->sign_key_pass = $key_pass;
   }
 
   /**
    * Set the private key file and password to sign the message.
    *
    * @access public
    * @param string $key_filename Parameter File Name
    * @param string $key_pass Password for private key
    */
   public function DKIM_QP($txt) {
     $tmp="";
     $line="";
     for ($i=0;$i<strlen($txt);$i++) {
       $ord=ord($txt[$i]);
       if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
         $line.=$txt[$i];
       } else {
         $line.="=".sprintf("%02X",$ord);
       }
     }
     return $line;
   }
 
   /**
    * Generate DKIM signature
    *
    * @access public
    * @param string $s Header
    */
   public function DKIM_Sign($s) {
     $privKeyStr = file_get_contents($this->DKIM_private);
     if ($this->DKIM_passphrase!='') {
       $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
     } else {
       $privKey = $privKeyStr;
     }
     if (openssl_sign($s, $signature, $privKey)) {
       return base64_encode($signature);
     }
   }
 
   /**
    * Generate DKIM Canonicalization Header
    *
    * @access public
    * @param string $s Header
    */
   public function DKIM_HeaderC($s) {
     $s=preg_replace("/\r\n\s+/"," ",$s);
     $lines=explode("\r\n",$s);
     foreach ($lines as $key=>$line) {
       list($heading,$value)=explode(":",$line,2);
       $heading=strtolower($heading);
       $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
       $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
     }
     $s=implode("\r\n",$lines);
     return $s;
   }
 
   /**
    * Generate DKIM Canonicalization Body
    *
    * @access public
    * @param string $body Message Body
    */
   public function DKIM_BodyC($body) {
     if ($body == '') return "\r\n";
     // stabilize line endings
     $body=str_replace("\r\n","\n",$body);
     $body=str_replace("\n","\r\n",$body);
     // END stabilize line endings
     while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
       $body=substr($body,0,strlen($body)-2);
     }
     return $body;
   }
 
   /**
    * Create the DKIM header, body, as new header
    *
    * @access public
    * @param string $headers_line Header lines
    * @param string $subject Subject
    * @param string $body Body
    */
   public function DKIM_Add($headers_line,$subject,$body) {
     $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
     $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
     $DKIMquery            = 'dns/txt'; // Query method
     $DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
     $subject_header       = "Subject: $subject";
     $headers              = explode("\r\n",$headers_line);
     foreach($headers as $header) {
       if (strpos($header,'From:') === 0) {
         $from_header=$header;
       } elseif (strpos($header,'To:') === 0) {
         $to_header=$header;
       }
     }
     $from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
     $to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
     $subject  = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
     $body     = $this->DKIM_BodyC($body);
     $DKIMlen  = strlen($body) ; // Length of body
     $DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
     $ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
     $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
                 "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
                 "\th=From:To:Subject;\r\n".
                 "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
                 "\tz=$from\r\n".
                 "\t|$to\r\n".
                 "\t|$subject;\r\n".
                 "\tbh=" . $DKIMb64 . ";\r\n".
                 "\tb=";
     $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
     $signed   = $this->DKIM_Sign($toSign);
     return "X-PHPMAILER-DKIM: phpmailer.sourceforge.net\r\n".$dkimhdrs.$signed."\r\n";
   }
 
   protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
     if (!empty($this->action_function) && function_exists($this->action_function)) {
       $params = array($isSent,$to,$cc,$bcc,$subject,$body);
       call_user_func_array($this->action_function,$params);
     }
   }
 }
 
 class phpmailerException extends Exception {
   public function errorMessage() {
     $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
     return $errorMsg;
   }
 }
 ?>
diff --git a/src/applications/metamta/adapter/amazonses/PhabricatorMailImplementationAmazonSESAdapter.php b/src/applications/metamta/adapter/amazonses/PhabricatorMailImplementationAmazonSESAdapter.php
index aa73909f11..32f3be948c 100644
--- a/src/applications/metamta/adapter/amazonses/PhabricatorMailImplementationAmazonSESAdapter.php
+++ b/src/applications/metamta/adapter/amazonses/PhabricatorMailImplementationAmazonSESAdapter.php
@@ -1,94 +1,43 @@
 <?php
 
 /*
  * Copyright 2011 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 class PhabricatorMailImplementationAmazonSESAdapter
-  extends PhabricatorMailImplementationAdapter {
+  extends PhabricatorMailImplementationPHPMailerLiteAdapter {
 
   private $message;
   private $isHTML;
 
   public function __construct() {
-    $root = phutil_get_library_root('phabricator');
-    $root = dirname($root);
-    require_once $root.'/externals/amazon-ses/ses.php';
-    $this->message = newv('SimpleEmailServiceMessage', array());
-  }
-
-  public function setFrom($email) {
-    $this->message->setFrom($email);
-    return $this;
-  }
-
-  public function addReplyTo($email) {
-    $this->message->addReplyTo($email);
-    return $this;
-  }
-
-  public function addTos(array $emails) {
-    foreach ($emails as $email) {
-      $this->message->addTo($email);
-    }
-    return $this;
-  }
-
-  public function addCCs(array $emails) {
-    foreach ($emails as $email) {
-      $this->message->addCC($email);
-    }
-    return $this;
-  }
-
-  public function addHeader($header_name, $header_value) {
-    // SES does not currently support custom headers.
-    return $this;
+    parent::__construct();
+    $this->mailer->Mailer = 'amazon-ses';
+    $this->mailer->customMailer = $this;
   }
 
-  public function setBody($body) {
-    $this->body = $body;
-    return $this;
-  }
-
-  public function setSubject($subject) {
-    $this->message->setSubject($subject);
-    return $this;
-  }
-
-  public function setIsHTML($is_html) {
-    $this->isHTML = true;
-    return $this;
-  }
-
-  public function hasValidRecipients() {
-    return true;
-  }
-
-  public function send() {
-    if ($this->isHTML) {
-      $this->message->setMessageFromString($this->body, $this->body);
-    } else {
-      $this->message->setMessageFromString($this->body);
-    }
-
+  public function executeSend($body) {    
     $key = PhabricatorEnv::getEnvConfig('amazon-ses.access-key');
     $secret = PhabricatorEnv::getEnvConfig('amazon-ses.secret-key');
 
+    $root = phutil_get_library_root('phabricator');
+    $root = dirname($root);
+    require_once $root.'/externals/amazon-ses/ses.php';
+
     $service = new SimpleEmailService($key, $secret);
-    return $service->sendEmail($this->message);
+    return $service->sendRawEmail($body);
   }
 
 }
diff --git a/src/applications/metamta/adapter/phpmailerlite/PhabricatorMailImplementationPHPMailerLiteAdapter.php b/src/applications/metamta/adapter/phpmailerlite/PhabricatorMailImplementationPHPMailerLiteAdapter.php
index b7484c01aa..822ee8e32e 100644
--- a/src/applications/metamta/adapter/phpmailerlite/PhabricatorMailImplementationPHPMailerLiteAdapter.php
+++ b/src/applications/metamta/adapter/phpmailerlite/PhabricatorMailImplementationPHPMailerLiteAdapter.php
@@ -1,81 +1,81 @@
 <?php
 
 /*
  * Copyright 2011 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 class PhabricatorMailImplementationPHPMailerLiteAdapter
   extends PhabricatorMailImplementationAdapter {
 
   public function __construct() {
     $root = phutil_get_library_root('phabricator');
     $root = dirname($root);
     require_once $root.'/externals/phpmailer/class.phpmailer-lite.php';
     $this->mailer = newv('PHPMailerLite', array($use_exceptions = true));
   }
 
   public function setFrom($email) {
-    $this->mailer->SetFrom($email);
+    $this->mailer->SetFrom($email, '', $crazy_side_effects = false);
     return $this;
   }
 
   public function addReplyTo($email) {
     $this->mailer->AddReplyTo($email);
     return $this;
   }
 
   public function addTos(array $emails) {
     foreach ($emails as $email) {
       $this->mailer->AddAddress($email);
     }
     return $this;
   }
 
   public function addCCs(array $emails) {
     foreach ($emails as $email) {
       $this->mailer->AddCC($email);
     }
     return $this;
   }
 
   public function addHeader($header_name, $header_value) {
     $this->mailer->AddCustomHeader($header_name.': '.$header_value);
     return $this;
   }
 
   public function setBody($body) {
     $this->mailer->Body = $body;
     return $this;
   }
 
   public function setSubject($subject) {
     $this->mailer->Subject = $subject;
     return $this;
   }
 
   public function setIsHTML($is_html) {
     $this->mailer->IsHTML(true);
     return $this;
   }
 
   public function hasValidRecipients() {
     return true;
   }
 
   public function send() {
     return $this->mailer->Send();
   }
 
 }