diff --git a/app/Config/Email.php b/app/Config/Email.php
index d9ca1420f6..41415a2f79 100644
--- a/app/Config/Email.php
+++ b/app/Config/Email.php
@@ -1,10 +1,11 @@
 <?php
 namespace Config;
 
-use CodeIgniter\Config\BaseConfig;
-
-class Email extends BaseConfig
+class Email
 {
+	//-------------------------------------------------------
+	// Boilerplate properties for a new email
+	//-------------------------------------------------------
 
 	/**
 	 * @var string
@@ -16,81 +17,6 @@ class Email extends BaseConfig
 	 */
 	public $fromName;
 
-	/**
-	 * @var string
-	 */
-	public $recipients;
-
-	/**
-	 * The "user agent"
-	 *
-	 * @var string
-	 */
-	public $userAgent = 'CodeIgniter';
-
-	/**
-	 * The mail sending protocol: mail, sendmail, smtp
-	 *
-	 * @var string
-	 */
-	public $protocol = 'mail';
-
-	/**
-	 * The server path to Sendmail.
-	 *
-	 * @var string
-	 */
-	public $mailPath = '/usr/sbin/sendmail';
-
-	/**
-	 * SMTP Server Address
-	 *
-	 * @var string
-	 */
-	public $SMTPHost;
-
-	/**
-	 * SMTP Username
-	 *
-	 * @var string
-	 */
-	public $SMTPUser;
-
-	/**
-	 * SMTP Password
-	 *
-	 * @var string
-	 */
-	public $SMTPPass;
-
-	/**
-	 * SMTP Port
-	 *
-	 * @var integer
-	 */
-	public $SMTPPort = 25;
-
-	/**
-	 * SMTP Timeout (in seconds)
-	 *
-	 * @var integer
-	 */
-	public $SMTPTimeout = 5;
-
-	/**
-	 * Enable persistent SMTP connections
-	 *
-	 * @var boolean
-	 */
-	public $SMTPKeepAlive = false;
-
-	/**
-	 * SMTP Encryption. Either tls or ssl
-	 *
-	 * @var string
-	 */
-	public $SMTPCrypto = 'tls';
-
 	/**
 	 * Enable word-wrap
 	 *
@@ -168,4 +94,78 @@ class Email extends BaseConfig
 	 */
 	public $DSN = false;
 
+	//-------------------------------------------------------
+	// Email transporter properties
+	//-------------------------------------------------------
+
+	/**
+	 * The "user agent"
+	 *
+	 * @var string
+	 */
+	public $userAgent = 'CodeIgniter';
+
+	/**
+	 * The mail sending protocol: mail, sendmail, smtp
+	 *
+	 * @var string
+	 */
+	public $protocol = 'mail';
+
+	/**
+	 * The server path to Sendmail.
+	 *
+	 * @var string
+	 */
+	public $mailPath = '/usr/sbin/sendmail';
+
+	/**
+	 * SMTP Server Address
+	 *
+	 * @var string
+	 */
+	public $SMTPHost;
+
+	/**
+	 * SMTP Username
+	 *
+	 * @var string
+	 */
+	public $SMTPUser;
+
+	/**
+	 * SMTP Password
+	 *
+	 * @var string
+	 */
+	public $SMTPPass;
+
+	/**
+	 * SMTP Port
+	 *
+	 * @var integer
+	 */
+	public $SMTPPort = 25;
+
+	/**
+	 * SMTP Timeout (in seconds)
+	 *
+	 * @var integer
+	 */
+	public $SMTPTimeout = 5;
+
+	/**
+	 * Enable persistent SMTP connections
+	 *
+	 * @var boolean
+	 */
+	public $SMTPKeepAlive = false;
+
+	/**
+	 * SMTP Encryption. Either tls or ssl
+	 *
+	 * @var string
+	 */
+	public $SMTPCrypto = 'tls';
+
 }
diff --git a/system/Config/Services.php b/system/Config/Services.php
index 615739d68b..728db8a40f 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -206,26 +206,36 @@ class Services extends BaseService
 	//--------------------------------------------------------------------
 
 	/**
-	 * The Email class allows you to send email via mail, sendmail, SMTP.
+	 * The Email Transporter class lets you send email via mail, sendmail, SMTP.
 	 *
-	 * @param \Config\Email|array|null $config
-	 * @param boolean                  $getShared
+	 * @param null    $config
+	 * @param boolean $getShared
 	 *
-	 * @return \CodeIgniter\Email\Email|mixed
+	 * @return \CodeIgniter\Email\TransporterInterface
 	 */
-	public static function email($config = null, bool $getShared = true)
+	public static function transporter($config = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
-			return static::getSharedInstance('email', $config);
+			return static::getSharedInstance('transporter', $config);
 		}
 
-		if (empty($config) || ! (is_array($config) || $config instanceof EmailConfig))
+		if (empty($config))
 		{
-			$config = config('Email');
+			$config = new \Config\Email();
 		}
 
-		return new Email($config);
+		$protocolMap = [
+			'mail'     => 'MailHandler',
+			'sendmail' => 'SendmailHandler',
+			'smtp'     => 'SMTPHandler',
+		];
+
+		$handler     = '\\CodeIgniter\\Email\\Handlers\\' . ($protocolMap[$config->protocol ?? 'mail'] );
+		$transporter = new $handler($config);
+		$transporter->setLogger(static::logger(true));
+
+		return $transporter;
 	}
 
 	/**
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 2c69e879ae..8a2bf3414a 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace CodeIgniter\Email;
+
 /**
  * CodeIgniter
  *
@@ -7,7 +8,6 @@
  * This content is released under the MIT License (MIT)
  *
  * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
- * Copyright (c) 2019-2020 CodeIgniter Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,117 +30,44 @@
  * @package    CodeIgniter
  * @author     EllisLab Dev Team
  * @copyright  Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright  Copyright (c) 2014 - 2019, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright  Copyright (c) 2014 - 2020, British Columbia Institute of Technology (http://bcit.ca/)
  * @license    http://opensource.org/licenses/MIT    MIT License
  * @link       https://codeigniter.com
  * @since      Version 1.0.0
  * @filesource
  */
 
-namespace CodeIgniter\Email;
-
-use CodeIgniter\Events\Events;
+use CodeIgniter\Config\Services;
+use CodeIgniter\Email\Exceptions\EmailException;
 use Config\Mimes;
+use Psr\Log\LoggerAwareTrait;
 
 /**
  * CodeIgniter Email Class
  *
- * Permits email to be sent using Mail, Sendmail, or SMTP.
- *
- * @package    CodeIgniter
- * @subpackage Libraries
- * @category   Libraries
- * @author     EllisLab Dev Team
- * @link       https://codeigniter.com/user_guide/libraries/email.html
+ * Object model for an email to be sent using Mail, Sendmail, or SMTP.
  */
 class Email
 {
-	/**
-	 * Properties from the last successful send.
-	 *
-	 * @var array|null
-	 */
-	public $archive;
-	/**
-	 * Properties to be added to the next archive.
-	 *
-	 * @var array
-	 */
-	protected $tmpArchive = [];
+	use LoggerAwareTrait;
+
 	/**
 	 * @var string
 	 */
 	public $fromEmail;
+
 	/**
 	 * @var string
 	 */
 	public $fromName;
-	/**
-	 * Used as the User-Agent and X-Mailer headers' value.
-	 *
-	 * @var string
-	 */
-	public $userAgent = 'CodeIgniter';
-	/**
-	 * Path to the Sendmail binary.
-	 *
-	 * @var string
-	 */
-	public $mailPath = '/usr/sbin/sendmail';    // Sendmail path
-	/**
-	 * Which method to use for sending e-mails.
-	 *
-	 * @var string 'mail', 'sendmail' or 'smtp'
-	 */
-	public $protocol = 'mail';        // mail/sendmail/smtp
-	/**
-	 * STMP Server host
-	 *
-	 * @var string
-	 */
-	public $SMTPHost = '';
-	/**
-	 * SMTP Username
-	 *
-	 * @var string
-	 */
-	public $SMTPUser = '';
-	/**
-	 * SMTP Password
-	 *
-	 * @var string
-	 */
-	public $SMTPPass = '';
-	/**
-	 * SMTP Server port
-	 *
-	 * @var integer
-	 */
-	public $SMTPPort = 25;
-	/**
-	 * SMTP connection timeout in seconds
-	 *
-	 * @var integer
-	 */
-	public $SMTPTimeout = 5;
-	/**
-	 * SMTP persistent connection
-	 *
-	 * @var boolean
-	 */
-	public $SMTPKeepAlive = false;
-	/**
-	 * SMTP Encryption
-	 *
-	 * @var string Empty, 'tls' or 'ssl'
-	 */
-	public $SMTPCrypto = '';
+
 	/**
 	 * Whether to apply word-wrapping to the message body.
 	 *
 	 * @var boolean
 	 */
 	public $wordWrap = true;
+
 	/**
 	 * Number of characters to wrap at.
 	 *
@@ -148,36 +75,42 @@ class Email
 	 * @var integer
 	 */
 	public $wrapChars = 76;
+
 	/**
 	 * Message format.
 	 *
 	 * @var string 'text' or 'html'
 	 */
 	public $mailType = 'text';
+
 	/**
 	 * Character set (default: utf-8)
 	 *
 	 * @var string
 	 */
 	public $charset = 'utf-8';
+
 	/**
 	 * Alternative message (for HTML messages only)
 	 *
 	 * @var string
 	 */
 	public $altMessage = '';
+
 	/**
 	 * Whether to validate e-mail addresses.
 	 *
 	 * @var boolean
 	 */
 	public $validate = true;
+
 	/**
 	 * X-Priority header value.
 	 *
 	 * @var integer 1-5
 	 */
-	public $priority = 3;            // Default priority (1 - 5)
+	public $priority = 3;   // Default priority (1 - 5)
+
 	/**
 	 * Newline character sequence.
 	 * Use "\r\n" to comply with RFC 822.
@@ -185,7 +118,8 @@ class Email
 	 * @link http://www.ietf.org/rfc/rfc822.txt
 	 * @var  string "\r\n" or "\n"
 	 */
-	public $newline = "\n";            // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
+	public $newline = "\n";   // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
+
 	/**
 	 * CRLF character sequence
 	 *
@@ -199,12 +133,14 @@ class Email
 	 * @var  string
 	 */
 	public $CRLF = "\n";
+
 	/**
 	 * Whether to use Delivery Status Notification.
 	 *
 	 * @var boolean
 	 */
 	public $DSN = false;
+
 	/**
 	 * Whether to send multipart alternatives.
 	 * Yahoo! doesn't seem to like these.
@@ -212,68 +148,51 @@ class Email
 	 * @var boolean
 	 */
 	public $sendMultipart = true;
-	/**
-	 * Whether to send messages to BCC recipients in batches.
-	 *
-	 * @var boolean
-	 */
-	public $BCCBatchMode = false;
-	/**
-	 * BCC Batch max number size.
-	 *
-	 * @see Email::$BCCBatchMode
-	 * @var integer|string
-	 */
-	public $BCCBatchSize = 200;
+
 	//--------------------------------------------------------------------
+
 	/**
 	 * Subject header
 	 *
 	 * @var string
 	 */
 	protected $subject = '';
+
 	/**
 	 * Message body
 	 *
 	 * @var string
 	 */
 	protected $body = '';
+
 	/**
 	 * Final message body to be sent.
 	 *
 	 * @var string
 	 */
 	protected $finalBody = '';
+
 	/**
 	 * Final headers to send
 	 *
 	 * @var string
 	 */
 	protected $headerStr = '';
-	/**
-	 * SMTP Connection socket placeholder
-	 *
-	 * @var resource
-	 */
-	protected $SMTPConnect;
+
 	/**
 	 * Mail encoding
 	 *
 	 * @var string '8bit' or '7bit'
 	 */
 	protected $encoding = '8bit';
-	/**
-	 * Whether to perform SMTP authentication
-	 *
-	 * @var boolean
-	 */
-	protected $SMTPAuth = false;
+
 	/**
 	 * Whether to send a Reply-To header
 	 *
 	 * @var boolean
 	 */
 	protected $replyToFlag = false;
+
 	/**
 	 * Debug messages
 	 *
@@ -281,36 +200,49 @@ class Email
 	 * @var array
 	 */
 	protected $debugMessage = [];
+
 	/**
 	 * Recipients
 	 *
 	 * @var array
 	 */
 	protected $recipients = [];
+
 	/**
 	 * CC Recipients
 	 *
 	 * @var array
 	 */
 	protected $CCArray = [];
+
 	/**
 	 * BCC Recipients
 	 *
 	 * @var array
 	 */
 	protected $BCCArray = [];
+
 	/**
 	 * Message headers
 	 *
 	 * @var array
 	 */
 	protected $headers = [];
+
 	/**
 	 * Attachment data
 	 *
 	 * @var array
 	 */
 	protected $attachments = [];
+
+	/**
+	 * Which protocol are we using?
+	 *
+	 * @var string
+	 */
+	protected $protocol = 'mail';
+
 	/**
 	 * Valid $protocol values
 	 *
@@ -322,6 +254,7 @@ class Email
 		'sendmail',
 		'smtp',
 	];
+
 	/**
 	 * Base charsets
 	 *
@@ -334,6 +267,7 @@ class Email
 		'us-ascii',
 		'iso-2022-',
 	];
+
 	/**
 	 * Bit depths
 	 *
@@ -346,6 +280,7 @@ class Email
 		'7bit',
 		'8bit',
 	];
+
 	/**
 	 * $priority translations
 	 *
@@ -360,13 +295,30 @@ class Email
 		4 => '4 (Low)',
 		5 => '5 (Lowest)',
 	];
+
 	/**
-	 * mbstring.func_overload flag
+	 * Logger instance to record error messages and awarnings.
 	 *
-	 * @var boolean
+	 * @var \PSR\Log\LoggerInterface
 	 */
-	protected static $func_overload;
+	protected $logger;
+
+	/**
+	 * Email transporter that this email is bound to
+	 *
+	 * @var \CodeIgniter\Email\TransporterInterface
+	 */
+	protected $handler;
+
+	/**
+	 * Config settings, used if protocol changed.
+	 *
+	 * @var Config\Email
+	 */
+	protected $config = null;
+
 	//--------------------------------------------------------------------
+
 	/**
 	 * Constructor - Sets Email Preferences
 	 *
@@ -376,10 +328,25 @@ class Email
 	 */
 	public function __construct($config = null)
 	{
+		if ($config === null)
+		{
+			$config       = new \Config\Email();
+			$this->config = $config;
+		}
+		else if (is_array($config))
+		{
+			$mergedConfig = new \Config\Email();
+			foreach ($config as $key => $value)
+			{
+				$mergedConfig->$key = $value;
+			}
+			$this->config = $mergedConfig;
+		}
 		$this->initialize($config);
-		isset(static::$func_overload) || static::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
 	}
+
 	//--------------------------------------------------------------------
+
 	/**
 	 * Initialize preferences
 	 *
@@ -394,11 +361,13 @@ class Email
 		{
 			$config = get_object_vars($config);
 		}
+
 		foreach (get_class_vars(get_class($this)) as $key => $value)
 		{
 			if (property_exists($this, $key) && isset($config[$key]))
 			{
 				$method = 'set' . ucfirst($key);
+
 				if (method_exists($this, $method))
 				{
 					$this->$method($config[$key]);
@@ -409,11 +378,50 @@ class Email
 				}
 			}
 		}
-		$this->charset  = strtoupper($this->charset);
-		$this->SMTPAuth = isset($this->SMTPUser[0], $this->SMTPPass[0]);
+
+		$this->charset = strtoupper($this->charset);
+		$this->handler = Services::transporter($config);
+
 		return $this;
 	}
+
 	//--------------------------------------------------------------------
+
+	/**
+	 * Set the email protocol to use.
+	 * If valid, get an appropriate handler for it.
+	 *
+	 * @param string $protocol
+	 *
+	 * @returns Email
+	 */
+	public function setProtocol(string $protocol = 'mail')
+	{
+		if (! in_array($protocol, $this->protocols))
+		{
+			throw EmailException::forInvalidProtocol($protocol);
+		}
+
+		$this->protocol         = $protocol;
+		$this->config->protocol = $protocol; // update config too
+		$this->handler          = Services::transporter($this->config, false);
+
+		return $this;
+	}
+
+	/**
+	 * Get the protocol our handler is using.
+	 * Note: the protocol property here is only the requested one.
+	 *
+	 * @return string
+	 */
+	public function getProtocol(): string
+	{
+		return $this->handler->getProtocol();
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Initialize the Email Data
 	 *
@@ -423,24 +431,28 @@ class Email
 	 */
 	public function clear($clearAttachments = false)
 	{
-		$this->subject      = '';
-		$this->body         = '';
-		$this->finalBody    = '';
-		$this->headerStr    = '';
-		$this->replyToFlag  = false;
-		$this->recipients   = [];
-		$this->CCArray      = [];
-		$this->BCCArray     = [];
-		$this->headers      = [];
-		$this->debugMessage = [];
+		$this->subject     = '';
+		$this->body        = '';
+		$this->finalBody   = '';
+		$this->headerStr   = '';
+		$this->replyToFlag = false;
+		$this->recipients  = [];
+		$this->CCArray     = [];
+		$this->BCCArray    = [];
+		$this->headers     = [];
+
 		$this->setHeader('Date', $this->setDate());
+
 		if ($clearAttachments !== false)
 		{
 			$this->attachments = [];
 		}
+
 		return $this;
 	}
+
 	//--------------------------------------------------------------------
+
 	/**
 	 * Set FROM
 	 *
@@ -456,19 +468,16 @@ class Email
 		{
 			$from = $match[1];
 		}
+
 		if ($this->validate)
 		{
-			$this->validateEmail($this->stringToArray($from));
+			$this->validateEmail($from);
 			if ($returnPath)
 			{
-				$this->validateEmail($this->stringToArray($returnPath));
+				$this->validateEmail($returnPath);
 			}
 		}
 
-		// Store the plain text values
-		$this->tmpArchive['fromEmail'] = $from;
-		$this->tmpArchive['fromName']  = $name;
-
 		// prepare the display name
 		if ($name !== '')
 		{
@@ -483,991 +492,16 @@ class Email
 				$name = $this->prepQEncoding($name);
 			}
 		}
+
 		$this->setHeader('From', $name . ' <' . $from . '>');
 		isset($returnPath) || $returnPath = $from;
 		$this->setHeader('Return-Path', '<' . $returnPath . '>');
-		$this->tmpArchive['returnPath'] = $returnPath;
 
 		return $this;
 	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set Reply-to
-	 *
-	 * @param string $replyto
-	 * @param string $name
-	 *
-	 * @return Email
-	 */
-	public function setReplyTo($replyto, $name = '')
-	{
-		if (preg_match('/\<(.*)\>/', $replyto, $match))
-		{
-			$replyto = $match[1];
-		}
-		if ($this->validate)
-		{
-			$this->validateEmail($this->stringToArray($replyto));
-		}
-		if ($name !== '')
-		{
-			$this->tmpArchive['replyName'] = $name;
 
-			// only use Q encoding if there are characters that would require it
-			if (! preg_match('/[\200-\377]/', $name))
-			{
-				// add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
-				$name = '"' . addcslashes($name, "\0..\37\177'\"\\") . '"';
-			}
-			else
-			{
-				$name = $this->prepQEncoding($name);
-			}
-		}
-		$this->setHeader('Reply-To', $name . ' <' . $replyto . '>');
-		$this->replyToFlag           = true;
-		$this->tmpArchive['replyTo'] = $replyto;
+	//--------------------------------------------------------------------
 
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set Recipients
-	 *
-	 * @param string|array $to
-	 *
-	 * @return Email
-	 */
-	public function setTo($to)
-	{
-		$to = $this->stringToArray($to);
-		$to = $this->cleanEmail($to);
-		if ($this->validate)
-		{
-			$this->validateEmail($to);
-		}
-		if ($this->getProtocol() !== 'mail')
-		{
-			$this->setHeader('To', implode(', ', $to));
-		}
-		$this->recipients = $to;
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set CC
-	 *
-	 * @param string $cc
-	 *
-	 * @return Email
-	 */
-	public function setCC($cc)
-	{
-		$cc = $this->cleanEmail($this->stringToArray($cc));
-		if ($this->validate)
-		{
-			$this->validateEmail($cc);
-		}
-		$this->setHeader('Cc', implode(', ', $cc));
-		if ($this->getProtocol() === 'smtp')
-		{
-			$this->CCArray = $cc;
-		}
-		$this->tmpArchive['CCArray'] = $cc;
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set BCC
-	 *
-	 * @param string $bcc
-	 * @param string $limit
-	 *
-	 * @return Email
-	 */
-	public function setBCC($bcc, $limit = '')
-	{
-		if ($limit !== '' && is_numeric($limit))
-		{
-			$this->BCCBatchMode = true;
-			$this->BCCBatchSize = $limit;
-		}
-		$bcc = $this->cleanEmail($this->stringToArray($bcc));
-		if ($this->validate)
-		{
-			$this->validateEmail($bcc);
-		}
-		if ($this->getProtocol() === 'smtp' || ($this->BCCBatchMode && count($bcc) > $this->BCCBatchSize))
-		{
-			$this->BCCArray = $bcc;
-		}
-		else
-		{
-			$this->setHeader('Bcc', implode(', ', $bcc));
-			$this->tmpArchive['BCCArray'] = $bcc;
-		}
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set Email Subject
-	 *
-	 * @param string $subject
-	 *
-	 * @return Email
-	 */
-	public function setSubject($subject)
-	{
-		$this->tmpArchive['subject'] = $subject;
-
-		$subject = $this->prepQEncoding($subject);
-		$this->setHeader('Subject', $subject);
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set Body
-	 *
-	 * @param string $body
-	 *
-	 * @return Email
-	 */
-	public function setMessage($body)
-	{
-		$this->body = rtrim(str_replace("\r", '', $body));
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Assign file attachments
-	 *
-	 * @param string      $file        Can be local path, URL or buffered content
-	 * @param string      $disposition 'attachment'
-	 * @param string|null $newname
-	 * @param string      $mime
-	 *
-	 * @return Email|boolean
-	 */
-	public function attach($file, $disposition = '', $newname = null, $mime = '')
-	{
-		if ($mime === '')
-		{
-			if (strpos($file, '://') === false && ! is_file($file))
-			{
-				$this->setErrorMessage(lang('Email.attachmentMissing', [$file]));
-				return false;
-			}
-			if (! $fp = @fopen($file, 'rb'))
-			{
-				$this->setErrorMessage(lang('Email.attachmentUnreadable', [$file]));
-				return false;
-			}
-			$fileContent = stream_get_contents($fp);
-			$mime        = $this->mimeTypes(pathinfo($file, PATHINFO_EXTENSION));
-			fclose($fp);
-		}
-		else
-		{
-			$fileContent = & $file; // buffered file
-		}
-		// declare names on their own, to make phpcbf happy
-		$namesAttached       = [
-			$file,
-			$newname,
-		];
-		$this->attachments[] = [
-			'name'        => $namesAttached,
-			'disposition' => empty($disposition) ? 'attachment' : $disposition,
-		// Can also be 'inline'  Not sure if it matters
-			'type'        => $mime,
-			'content'     => chunk_split(base64_encode($fileContent)),
-			'multipart'   => 'mixed',
-		];
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set and return attachment Content-ID
-	 *
-	 * Useful for attached inline pictures
-	 *
-	 * @param string $filename
-	 *
-	 * @return string|boolean
-	 */
-	public function setAttachmentCID($filename)
-	{
-		for ($i = 0, $c = count($this->attachments); $i < $c; $i ++)
-		{
-			if ($this->attachments[$i]['name'][0] === $filename)
-			{
-				$this->attachments[$i]['multipart'] = 'related';
-				$this->attachments[$i]['cid']       = uniqid(basename($this->attachments[$i]['name'][0]) . '@', true);
-				return $this->attachments[$i]['cid'];
-			}
-		}
-		return false;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Add a Header Item
-	 *
-	 * @param string $header
-	 * @param string $value
-	 *
-	 * @return Email
-	 */
-	public function setHeader($header, $value)
-	{
-		$this->headers[$header] = str_replace(["\n", "\r"], '', $value);
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Convert a String to an Array
-	 *
-	 * @param string $email
-	 *
-	 * @return array
-	 */
-	protected function stringToArray($email)
-	{
-		if (! is_array($email))
-		{
-			return (strpos($email, ',') !== false) ? preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY) : (array) trim($email);
-		}
-		return $email;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set Multipart Value
-	 *
-	 * @param string $str
-	 *
-	 * @return Email
-	 */
-	public function setAltMessage($str)
-	{
-		$this->altMessage = (string) $str;
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set Mailtype
-	 *
-	 * @param string $type
-	 *
-	 * @return Email
-	 */
-	public function setMailType($type = 'text')
-	{
-		$this->mailType = ($type === 'html') ? 'html' : 'text';
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set Wordwrap
-	 *
-	 * @param boolean $wordWrap
-	 *
-	 * @return Email
-	 */
-	public function setWordWrap($wordWrap = true)
-	{
-		$this->wordWrap = (bool) $wordWrap;
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set Protocol
-	 *
-	 * @param string $protocol
-	 *
-	 * @return Email
-	 */
-	public function setProtocol($protocol = 'mail')
-	{
-		$this->protocol = in_array($protocol, $this->protocols, true) ? strtolower($protocol) : 'mail';
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set Priority
-	 *
-	 * @param integer $n
-	 *
-	 * @return Email
-	 */
-	public function setPriority($n = 3)
-	{
-		$this->priority = preg_match('/^[1-5]$/', $n) ? (int) $n : 3;
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set Newline Character
-	 *
-	 * @param string $newline
-	 *
-	 * @return Email
-	 */
-	public function setNewline($newline = "\n")
-	{
-		$this->newline = in_array($newline, ["\n", "\r\n", "\r"]) ? $newline : "\n";
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set CRLF
-	 *
-	 * @param string $CRLF
-	 *
-	 * @return Email
-	 */
-	public function setCRLF($CRLF = "\n")
-	{
-		$this->CRLF = ($CRLF !== "\n" && $CRLF !== "\r\n" && $CRLF !== "\r") ? "\n" : $CRLF;
-		return $this;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Get the Message ID
-	 *
-	 * @return string
-	 */
-	protected function getMessageID()
-	{
-		$from = str_replace(['>', '<'], '', $this->headers['Return-Path']);
-		return '<' . uniqid('', true) . strstr($from, '@') . '>';
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Get Mail Protocol
-	 *
-	 * @return string
-	 */
-	protected function getProtocol()
-	{
-		$this->protocol                                                      = strtolower($this->protocol);
-		in_array($this->protocol, $this->protocols, true) || $this->protocol = 'mail';
-		return $this->protocol;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Get Mail Encoding
-	 *
-	 * @return string
-	 */
-	protected function getEncoding()
-	{
-		in_array($this->encoding, $this->bitDepths) || $this->encoding = '8bit';
-		foreach ($this->baseCharsets as $charset)
-		{
-			if (strpos($this->charset, $charset) === 0)
-			{
-				$this->encoding = '7bit';
-				break;
-			}
-		}
-		return $this->encoding;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Get content type (text/html/attachment)
-	 *
-	 * @return string
-	 */
-	protected function getContentType()
-	{
-		if ($this->mailType === 'html')
-		{
-			return empty($this->attachments) ? 'html' : 'html-attach';
-		}
-		elseif ($this->mailType === 'text' && ! empty($this->attachments))
-		{
-			return 'plain-attach';
-		}
-		else
-		{
-			return 'plain';
-		}
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set RFC 822 Date
-	 *
-	 * @return string
-	 */
-	protected function setDate()
-	{
-		$timezone = date('Z');
-		$operator = ($timezone[0] === '-') ? '-' : '+';
-		$timezone = abs($timezone);
-		$timezone = floor($timezone / 3600) * 100 + ($timezone % 3600) / 60;
-		return sprintf('%s %s%04d', date('D, j M Y H:i:s'), $operator, $timezone);
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Mime message
-	 *
-	 * @return string
-	 */
-	protected function getMimeMessage()
-	{
-		return 'This is a multi-part message in MIME format.' . $this->newline . 'Your email application may not support this format.';
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Validate Email Address
-	 *
-	 * @param string|array $email
-	 *
-	 * @return boolean
-	 */
-	public function validateEmail($email)
-	{
-		if (! is_array($email))
-		{
-			$this->setErrorMessage(lang('Email.mustBeArray'));
-			return false;
-		}
-		foreach ($email as $val)
-		{
-			if (! $this->isValidEmail($val))
-			{
-				$this->setErrorMessage(lang('Email.invalidAddress', [$val]));
-				return false;
-			}
-		}
-		return true;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Email Validation
-	 *
-	 * @param string $email
-	 *
-	 * @return boolean
-	 */
-	public function isValidEmail($email)
-	{
-		if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && $atpos = strpos($email, '@'))
-		{
-			$email = static::substr($email, 0, ++ $atpos) . idn_to_ascii(
-							static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46
-			);
-		}
-		return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Clean Extended Email Address: Joe Smith <joe@smith.com>
-	 *
-	 * @param string|array $email
-	 *
-	 * @return array
-	 */
-	public function cleanEmail($email)
-	{
-		if (! is_array($email))
-		{
-			return preg_match('/\<(.*)\>/', $email, $match) ? $match[1] : $email;
-		}
-		$cleanEmail = [];
-		foreach ($email as $addy)
-		{
-			$cleanEmail[] = preg_match('/\<(.*)\>/', $addy, $match) ? $match[1] : $addy;
-		}
-		return $cleanEmail;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Build alternative plain text message
-	 *
-	 * Provides the raw message for use in plain-text headers of
-	 * HTML-formatted emails.
-	 * If the user hasn't specified his own alternative message
-	 * it creates one by stripping the HTML
-	 *
-	 * @return string
-	 */
-	protected function getAltMessage()
-	{
-		if (! empty($this->altMessage))
-		{
-			return ($this->wordWrap) ? $this->wordWrap($this->altMessage, 76) : $this->altMessage;
-		}
-		$body = preg_match('/\<body.*?\>(.*)\<\/body\>/si', $this->body, $match) ? $match[1] : $this->body;
-		$body = str_replace("\t", '', preg_replace('#<!--(.*)--\>#', '', trim(strip_tags($body))));
-		for ($i = 20; $i >= 3; $i --)
-		{
-			$body = str_replace(str_repeat("\n", $i), "\n\n", $body);
-		}
-		// Reduce multiple spaces
-		$body = preg_replace('| +|', ' ', $body);
-		return ($this->wordWrap) ? $this->wordWrap($body, 76) : $body;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Word Wrap
-	 *
-	 * @param string       $str
-	 * @param integer|null $charlim Line-length limit
-	 *
-	 * @return string
-	 */
-	public function wordWrap($str, $charlim = null)
-	{
-		// Set the character limit, if not already present
-		if (empty($charlim))
-		{
-			$charlim = empty($this->wrapChars) ? 76 : $this->wrapChars;
-		}
-		// Standardize newlines
-		if (strpos($str, "\r") !== false)
-		{
-			$str = str_replace(["\r\n", "\r"], "\n", $str);
-		}
-		// Reduce multiple spaces at end of line
-		$str = preg_replace('| +\n|', "\n", $str);
-		// If the current word is surrounded by {unwrap} tags we'll
-		// strip the entire chunk and replace it with a marker.
-		$unwrap = [];
-		if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches))
-		{
-			for ($i = 0, $c = count($matches[0]); $i < $c; $i ++)
-			{
-				$unwrap[] = $matches[1][$i];
-				$str      = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
-			}
-		}
-		// Use PHP's native function to do the initial wordwrap.
-		// We set the cut flag to FALSE so that any individual words that are
-		// too long get left alone. In the next step we'll deal with them.
-		$str = wordwrap($str, $charlim, "\n", false);
-		// Split the string into individual lines of text and cycle through them
-		$output = '';
-		foreach (explode("\n", $str) as $line)
-		{
-			// Is the line within the allowed character count?
-			// If so we'll join it to the output and continue
-			if (static::strlen($line) <= $charlim)
-			{
-				$output .= $line . $this->newline;
-				continue;
-			}
-			$temp = '';
-			do
-			{
-				// If the over-length word is a URL we won't wrap it
-				if (preg_match('!\[url.+\]|://|www\.!', $line))
-				{
-					break;
-				}
-				// Trim the word down
-				$temp .= static::substr($line, 0, $charlim - 1);
-				$line  = static::substr($line, $charlim - 1);
-			}
-			while (static::strlen($line) > $charlim);
-			// If $temp contains data it means we had to split up an over-length
-			// word into smaller chunks so we'll add it back to our current line
-			if ($temp !== '')
-			{
-				$output .= $temp . $this->newline;
-			}
-			$output .= $line . $this->newline;
-		}
-		// Put our markers back
-		if ($unwrap)
-		{
-			foreach ($unwrap as $key => $val)
-			{
-				$output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
-			}
-		}
-		return $output;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Build final headers
-	 */
-	protected function buildHeaders()
-	{
-		$this->setHeader('User-Agent', $this->userAgent);
-		$this->setHeader('X-Sender', $this->cleanEmail($this->headers['From']));
-		$this->setHeader('X-Mailer', $this->userAgent);
-		$this->setHeader('X-Priority', $this->priorities[$this->priority]);
-		$this->setHeader('Message-ID', $this->getMessageID());
-		$this->setHeader('Mime-Version', '1.0');
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Write Headers as a string
-	 */
-	protected function writeHeaders()
-	{
-		if ($this->protocol === 'mail')
-		{
-			if (isset($this->headers['Subject']))
-			{
-				$this->subject = $this->headers['Subject'];
-				unset($this->headers['Subject']);
-			}
-		}
-		reset($this->headers);
-		$this->headerStr = '';
-		foreach ($this->headers as $key => $val)
-		{
-			$val = trim($val);
-			if ($val !== '')
-			{
-				$this->headerStr .= $key . ': ' . $val . $this->newline;
-			}
-		}
-		if ($this->getProtocol() === 'mail')
-		{
-			$this->headerStr = rtrim($this->headerStr);
-		}
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Build Final Body and attachments
-	 */
-	protected function buildMessage()
-	{
-		if ($this->wordWrap === true && $this->mailType !== 'html')
-		{
-			$this->body = $this->wordWrap($this->body);
-		}
-		$this->writeHeaders();
-		$hdr  = ($this->getProtocol() === 'mail') ? $this->newline : '';
-		$body = '';
-		switch ($this->getContentType())
-		{
-			case 'plain':
-				$hdr .= 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
-						. 'Content-Transfer-Encoding: ' . $this->getEncoding();
-				if ($this->getProtocol() === 'mail')
-				{
-					$this->headerStr .= $hdr;
-					$this->finalBody  = $this->body;
-				}
-				else
-				{
-					$this->finalBody = $hdr . $this->newline . $this->newline . $this->body;
-				}
-			return;
-			case 'html':
-				if ($this->sendMultipart === false)
-				{
-					$hdr .= 'Content-Type: text/html; charset=' . $this->charset . $this->newline
-							. 'Content-Transfer-Encoding: quoted-printable';
-				}
-				else
-				{
-					$boundary = uniqid('B_ALT_', true);
-					$hdr     .= 'Content-Type: multipart/alternative; boundary="' . $boundary . '"';
-					$body    .= $this->getMimeMessage() . $this->newline . $this->newline
-							. '--' . $boundary . $this->newline
-							. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
-							. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
-							. $this->getAltMessage() . $this->newline . $this->newline
-							. '--' . $boundary . $this->newline
-							. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
-							. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline;
-				}
-				$this->finalBody = $body . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline;
-				if ($this->getProtocol() === 'mail')
-				{
-					  $this->headerStr .= $hdr;
-				}
-				else
-				{
-					$this->finalBody = $hdr . $this->newline . $this->newline . $this->finalBody;
-				}
-				if ($this->sendMultipart !== false)
-				{
-					$this->finalBody .= '--' . $boundary . '--'; // @phpstan-ignore-line
-				}
-			return;
-			case 'plain-attach':
-				$boundary = uniqid('B_ATC_', true);
-				$hdr     .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"';
-				if ($this->getProtocol() === 'mail')
-				{
-					  $this->headerStr .= $hdr;
-				}
-				$body .= $this->getMimeMessage() . $this->newline
-						. $this->newline
-						. '--' . $boundary . $this->newline
-						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
-						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline
-						. $this->newline
-						. $this->body . $this->newline . $this->newline;
-				$this->appendAttachments($body, $boundary);
-			break;
-			case 'html-attach':
-				$alt_boundary  = uniqid('B_ALT_', true);
-				$last_boundary = null;
-				if ($this->attachmentsHaveMultipart('mixed'))
-				{
-					$atc_boundary  = uniqid('B_ATC_', true);
-					$hdr          .= 'Content-Type: multipart/mixed; boundary="' . $atc_boundary . '"';
-					$last_boundary = $atc_boundary;
-				}
-				if ($this->attachmentsHaveMultipart('related'))
-				{
-					$rel_boundary        = uniqid('B_REL_', true);
-					$rel_boundary_header = 'Content-Type: multipart/related; boundary="' . $rel_boundary . '"';
-					if (isset($last_boundary))
-					{
-						$body .= '--' . $last_boundary . $this->newline . $rel_boundary_header;
-					}
-					else
-					{
-						$hdr .= $rel_boundary_header;
-					}
-					$last_boundary = $rel_boundary;
-				}
-				if ($this->getProtocol() === 'mail')
-				{
-					  $this->headerStr .= $hdr;
-				}
-				static::strlen($body) && $body .= $this->newline . $this->newline;
-				$body                          .= $this->getMimeMessage() . $this->newline . $this->newline
-						. '--' . $last_boundary . $this->newline
-						. 'Content-Type: multipart/alternative; boundary="' . $alt_boundary . '"' . $this->newline . $this->newline
-						. '--' . $alt_boundary . $this->newline
-						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
-						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
-						. $this->getAltMessage() . $this->newline . $this->newline
-						. '--' . $alt_boundary . $this->newline
-						. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
-						. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline
-						. $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
-						. '--' . $alt_boundary . '--' . $this->newline . $this->newline;
-				if (! empty($rel_boundary))
-				{
-					$body .= $this->newline . $this->newline;
-					$this->appendAttachments($body, $rel_boundary, 'related');
-				}
-				// multipart/mixed attachments
-				if (! empty($atc_boundary))
-				{
-					$body .= $this->newline . $this->newline;
-					$this->appendAttachments($body, $atc_boundary, 'mixed');
-				}
-			break;
-		}
-		$this->finalBody = ($this->getProtocol() === 'mail') ? $body : $hdr . $this->newline . $this->newline . $body;
-	}
-	//--------------------------------------------------------------------
-	protected function attachmentsHaveMultipart($type)
-	{
-		foreach ($this->attachments as &$attachment)
-		{
-			if ($attachment['multipart'] === $type)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Prepares attachment string
-	 *
-	 * @param string      $body      Message body to append to
-	 * @param string      $boundary  Multipart boundary
-	 * @param string|null $multipart When provided, only attachments of this type will be processed
-	 *
-	 * @return void
-	 */
-	protected function appendAttachments(&$body, $boundary, $multipart = null)
-	{
-		for ($i = 0, $c = count($this->attachments); $i < $c; $i ++)
-		{
-			if (isset($multipart) && $this->attachments[$i]['multipart'] !== $multipart)
-			{
-				continue;
-			}
-			$name  = isset($this->attachments[$i]['name'][1]) ? $this->attachments[$i]['name'][1] : basename($this->attachments[$i]['name'][0]);
-			$body .= '--' . $boundary . $this->newline
-					. 'Content-Type: ' . $this->attachments[$i]['type'] . '; name="' . $name . '"' . $this->newline
-					. 'Content-Disposition: ' . $this->attachments[$i]['disposition'] . ';' . $this->newline
-					. 'Content-Transfer-Encoding: base64' . $this->newline
-					. (empty($this->attachments[$i]['cid']) ? '' : 'Content-ID: <' . $this->attachments[$i]['cid'] . '>' . $this->newline)
-					. $this->newline
-					. $this->attachments[$i]['content'] . $this->newline;
-		}
-		// $name won't be set if no attachments were appended,
-		// and therefore a boundary wouldn't be necessary
-		empty($name) || $body .= '--' . $boundary . '--';
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Prep Quoted Printable
-	 *
-	 * Prepares string for Quoted-Printable Content-Transfer-Encoding
-	 * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt
-	 *
-	 * @param string $str
-	 *
-	 * @return string
-	 */
-	protected function prepQuotedPrintable($str)
-	{
-		// ASCII code numbers for "safe" characters that can always be
-		// used literally, without encoding, as described in RFC 2049.
-		// http://www.ietf.org/rfc/rfc2049.txt
-		static $ascii_safe_chars = [
-		// ' (  )   +   ,   -   .   /   :   =   ?
-			39,
-			40,
-			41,
-			43,
-			44,
-			45,
-			46,
-			47,
-			58,
-			61,
-			63,
-		// numbers
-			48,
-			49,
-			50,
-			51,
-			52,
-			53,
-			54,
-			55,
-			56,
-			57,
-		// upper-case letters
-			65,
-			66,
-			67,
-			68,
-			69,
-			70,
-			71,
-			72,
-			73,
-			74,
-			75,
-			76,
-			77,
-			78,
-			79,
-			80,
-			81,
-			82,
-			83,
-			84,
-			85,
-			86,
-			87,
-			88,
-			89,
-			90,
-		// lower-case letters
-			97,
-			98,
-			99,
-			100,
-			101,
-			102,
-			103,
-			104,
-			105,
-			106,
-			107,
-			108,
-			109,
-			110,
-			111,
-			112,
-			113,
-			114,
-			115,
-			116,
-			117,
-			118,
-			119,
-			120,
-			121,
-			122,
-		];
-		// We are intentionally wrapping so mail servers will encode characters
-		// properly and MUAs will behave, so {unwrap} must go!
-		$str = str_replace(['{unwrap}', '{/unwrap}'], '', $str);
-		// RFC 2045 specifies CRLF as "\r\n".
-		// However, many developers choose to override that and violate
-		// the RFC rules due to (apparently) a bug in MS Exchange,
-		// which only works with "\n".
-		if ($this->CRLF === "\r\n")
-		{
-			return quoted_printable_encode($str);
-		}
-		// Reduce multiple spaces & remove nulls
-		$str = preg_replace(['| +|', '/\x00+/'], [' ', ''], $str);
-		// Standardize newlines
-		if (strpos($str, "\r") !== false)
-		{
-			$str = str_replace(["\r\n", "\r"], "\n", $str);
-		}
-		$escape = '=';
-		$output = '';
-		foreach (explode("\n", $str) as $line)
-		{
-			$length = static::strlen($line);
-			$temp   = '';
-			// Loop through each character in the line to add soft-wrap
-			// characters at the end of a line " =\r\n" and add the newly
-			// processed line(s) to the output (see comment on $crlf class property)
-			for ($i = 0; $i < $length; $i ++)
-			{
-				// Grab the next character
-				$char  = $line[$i];
-				$ascii = ord($char);
-				// Convert spaces and tabs but only if it's the end of the line
-				if ($ascii === 32 || $ascii === 9)
-				{
-					if ($i === ($length - 1))
-					{
-						$char = $escape . sprintf('%02s', dechex($ascii));
-					}
-				}
-				// DO NOT move this below the $ascii_safe_chars line!
-				//
-				// = (equals) signs are allowed by RFC2049, but must be encoded
-				// as they are the encoding delimiter!
-				elseif ($ascii === 61)
-				{
-					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
-				}
-				elseif (! in_array($ascii, $ascii_safe_chars, true))
-				{
-					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));
-				}
-				// If we're at the character limit, add the line to the output,
-				// reset our temp variable, and keep on chuggin'
-				if ((static::strlen($temp) + static::strlen($char)) >= 76)
-				{
-					$output .= $temp . $escape . $this->CRLF;
-					$temp    = '';
-				}
-				// Add the character to our temporary line
-				$temp .= $char;
-			}
-			// Add our completed line to the output
-			$output .= $temp . $this->CRLF;
-		}
-		// get rid of extra CRLF tacked onto the end
-		return static::substr($output, 0, static::strlen($this->CRLF) * -1);
-	}
-	//--------------------------------------------------------------------
 	/**
 	 * Prep Q Encoding
 	 *
@@ -1482,6 +516,7 @@ class Email
 	protected function prepQEncoding($str)
 	{
 		$str = str_replace(["\r", "\n"], '', $str);
+
 		if ($this->charset === 'UTF-8')
 		{
 			// Note: We used to have mb_encode_mimeheader() as the first choice
@@ -1497,14 +532,16 @@ class Email
 									'output-charset'   => $this->charset,
 									'line-break-chars' => $this->CRLF,
 								]);
+
 				// There are reports that iconv_mime_encode() might fail and return FALSE
 				if ($output !== false)
 				{
-						  // iconv_mime_encode() will always put a header field name.
-						  // We've passed it an empty one, but it still prepends our
-						  // encoded string with ': ', so we need to strip it.
-						  return static::substr($output, 2);
+					// iconv_mime_encode() will always put a header field name.
+					// We've passed it an empty one, but it still prepends our
+					// encoded string with ': ', so we need to strip it.
+					return mb_substr($output, 2);
 				}
+
 				$chars = iconv_strlen($str, 'UTF-8');
 			}
 			elseif (extension_loaded('mbstring'))
@@ -1512,19 +549,22 @@ class Email
 				$chars = mb_strlen($str, 'UTF-8');
 			}
 		}
+
 		// We might already have this set for UTF-8
-		isset($chars) || $chars = static::strlen($str);
-		$output                 = '=?' . $this->charset . '?Q?';
-		for ($i = 0, $length = static::strlen($output); $i < $chars; $i ++) // @phpstan-ignore-line
+		isset($chars) || $chars = mb_strlen($str);
+
+		$output = '=?' . $this->charset . '?Q?';
+		for ($i = 0, $length = mb_strlen($output); $i < $chars; $i ++)
 		{
-			$chr = ($this->charset === 'UTF-8' && extension_loaded('iconv')) ? '=' . implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2)) : '=' . strtoupper(bin2hex($str[$i]));
+			$chr = ($this->charset === 'UTF-8' && ICONV_ENABLED === true) ? '=' . implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2)) : '=' . strtoupper(bin2hex($str[$i]));
+
 			// RFC 2045 sets a limit of 76 characters per line.
 			// We'll append ?= to the end of each line though.
-			if ($length + ($l = static::strlen($chr)) > 74)
+			if ($length + ($l = mb_strlen($chr)) > 74)
 			{
 				$output .= '?=' . $this->CRLF // EOL
 						. ' =?' . $this->charset . '?Q?' . $chr; // New line
-				$length  = 6 + static::strlen($this->charset) + $l; // Reset the length for the new line
+				$length  = 6 + mb_strlen($this->charset) + $l; // Reset the length for the new line
 			}
 			else
 			{
@@ -1532,603 +572,575 @@ class Email
 				$length += $l;
 			}
 		}
+
 		// End the header
 		return $output . '?=';
 	}
+
 	//--------------------------------------------------------------------
+
 	/**
-	 * Send Email
+	 * Set Reply-to
 	 *
-	 * @param boolean $autoClear
+	 * @param string $replyto
+	 * @param string $name
 	 *
-	 * @return boolean
+	 * @return Email
 	 */
-	public function send($autoClear = true)
+	public function setReplyTo($replyto, $name = '')
 	{
-		if (! isset($this->headers['From']) && ! empty($this->fromEmail))
+		if (preg_match('/\<(.*)\>/', $replyto, $match))
 		{
-			$this->setFrom($this->fromEmail, $this->fromName);
-		}
-		if (! isset($this->headers['From']))
-		{
-			$this->setErrorMessage(lang('Email.noFrom'));
-			return false;
-		}
-		if ($this->replyToFlag === false)
-		{
-			$this->setReplyTo($this->headers['From']);
-		}
-		if (empty($this->recipients) && ! isset($this->headers['To']) && empty($this->BCCArray) && ! isset($this->headers['Bcc']) && ! isset($this->headers['Cc']))
-		{
-			$this->setErrorMessage(lang('Email.noRecipients'));
-			return false;
-		}
-		$this->buildHeaders();
-		if ($this->BCCBatchMode && count($this->BCCArray) > $this->BCCBatchSize)
-		{
-			$this->batchBCCSend();
-			if ($autoClear)
-			{
-				$this->clear();
-			}
-			return true;
-		}
-		$this->buildMessage();
-		$result = $this->spoolEmail();
-		if ($result)
-		{
-			$this->setArchiveValues();
-
-			if ($autoClear)
-			{
-				$this->clear();
-			}
-
-			Events::trigger('email', $this->archive);
+			$replyto = $match[1];
 		}
 
-		return $result;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Batch Bcc Send. Sends groups of BCCs in batches
-	 */
-	public function batchBCCSend()
-	{
-		$float = $this->BCCBatchSize - 1;
-		$set   = '';
-		$chunk = [];
-		for ($i = 0, $c = count($this->BCCArray); $i < $c; $i ++)
+		if ($this->validate)
 		{
-			if (isset($this->BCCArray[$i]))
-			{
-				$set .= ', ' . $this->BCCArray[$i];
-			}
-			if ($i === $float)
-			{
-				$chunk[] = static::substr($set, 1);
-				$float  += $this->BCCBatchSize;
-				$set     = '';
-			}
-			if ($i === $c - 1)
-			{
-				$chunk[] = static::substr($set, 1);
-			}
+			$this->validateEmail($this->stringToArray($replyto));
 		}
-		for ($i = 0, $c = count($chunk); $i < $c; $i ++)
+
+		if ($name !== '')
 		{
-			unset($this->headers['Bcc']);
-			$bcc = $this->cleanEmail($this->stringToArray($chunk[$i]));
-			if ($this->protocol !== 'smtp')
+			// only use Q encoding if there are characters that would require it
+			if (! preg_match('/[\200-\377]/', $name))
 			{
-				$this->setHeader('Bcc', implode(', ', $bcc));
+				// add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
+				$name = '"' . addcslashes($name, "\0..\37\177'\"\\") . '"';
 			}
 			else
 			{
-				$this->BCCArray = $bcc;
+				$name = $this->prepQEncoding($name);
 			}
-			$this->buildMessage();
-			$this->spoolEmail();
 		}
 
-		// Update the archive
-		$this->setArchiveValues();
-		Events::trigger('email', $this->archive);
+		$this->setHeader('Reply-To', $name . ' <' . $replyto . '>');
+		$this->replyToFlag = true;
+
+		return $this;
 	}
+
 	//--------------------------------------------------------------------
+
 	/**
-	 * Unwrap special elements
-	 */
-	protected function unwrapSpecials()
-	{
-		$this->finalBody = preg_replace_callback(
-				'/\{unwrap\}(.*?)\{\/unwrap\}/si', [
-					$this,
-					'removeNLCallback',
-				], $this->finalBody
-		);
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Strip line-breaks via callback
+	 * Set Recipients
 	 *
-	 * @param string $matches
+	 * @param string|array $to One or more recipients
+	 *
+	 * @return Email
+	 */
+	public function setTo($to)
+	{
+		$to = $this->stringToArray($to);
+		$to = $this->cleanEmail($to);
+
+		if ($this->validate)
+		{
+			$this->validateEmail($to);
+		}
+
+		if ($this->handler->getProtocol() !== 'mail')
+		{
+			$this->setHeader('To', implode(', ', $to));
+		}
+
+		$this->recipients = $to;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set CC
+	 *
+	 * @param string|array $cc
+	 *
+	 * @return Email
+	 */
+	public function setCC($cc)
+	{
+		$cc = $this->cleanEmail($this->stringToArray($cc));
+
+		if ($this->validate)
+		{
+			$this->validateEmail($cc);
+		}
+
+		$this->setHeader('Cc', implode(', ', $cc));
+
+		//      if ($this->handler->getProtocol() === 'smtp')
+		//      {
+		$this->CCArray = $cc;
+		//      }
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set BCC
+	 *
+	 * @param string|array $bcc
+	 * @param integer|null $limit
+	 *
+	 * @return Email
+	 */
+	public function setBCC($bcc, int $limit = null)
+	{
+		if ($limit !== null)
+		{
+			$this->BCCBatchMode = true;
+			$this->BCCBatchSize = $limit;
+		}
+
+		$bcc = $this->cleanEmail($this->stringToArray($bcc));
+
+		if ($this->validate)
+		{
+			$this->validateEmail($bcc);
+		}
+
+		//      if ($this->handler->getProtocol() === 'smtp' ||
+		//              if ($this->BCCBatchMode && count($bcc) > $this->BCCBatchSize)
+		//      {
+		$this->BCCArray = $bcc;
+		//      }
+		//      else
+		//      {
+		$this->setHeader('Bcc', implode(', ', $bcc));
+		//      }
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set Email Subject
+	 *
+	 * @param string $subject
+	 *
+	 * @return Email
+	 */
+	public function setSubject($subject)
+	{
+		$subject = $this->prepQEncoding($subject);
+		$this->setHeader('Subject', $subject);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set Body
+	 *
+	 * @param string $body
+	 *
+	 * @return Email
+	 */
+	public function setMessage($body)
+	{
+		$this->body = rtrim(str_replace("\r", '', $body));
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Assign file attachments
+	 *
+	 * @param string $file        Can be local path, URL or buffered content
+	 * @param string $disposition 'attachment'
+	 * @param string $newName
+	 * @param string $mime        Not-empty if $file is buffered content
+	 *
+	 * @return Email
+	 */
+	public function attach(string $file, string $disposition = '', string $newName = '', string $mime = '')
+	{
+		if ($mime === '')
+		{
+			if (strpos($file, '://') === false && ! is_file($file))
+			{
+				throw EmailException::forAttachmentMissing($file);
+			}
+
+			if (! $fp = @fopen($file, 'rb'))
+			{
+				throw EmailException::forAttachmentUnreadable($file);
+			}
+
+			$fileContent = stream_get_contents($fp);
+			$mime        = $this->mimeTypes(pathinfo($file, PATHINFO_EXTENSION));
+			fclose($fp);
+		}
+		else
+		{
+			$fileContent = & $file; // buffered file
+		}
+
+		// declare names on their own, to make phpcbf happy
+		$namesAttached       = [
+			$file,
+			$newName,
+		];
+		$this->attachments[] = [
+			'name'        => $namesAttached,
+			'disposition' => empty($disposition) ? 'attachment' : $disposition,
+			// Can also be 'inline'  Not sure if it matters
+			'type'        => $mime,
+			'content'     => chunk_split(base64_encode($fileContent)),
+			'multipart'   => 'mixed',
+		];
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Add a Header Item
+	 *
+	 * @param string $header
+	 * @param string $value
+	 *
+	 * @return Email
+	 */
+	public function setHeader($header, $value)
+	{
+		$this->headers[$header] = str_replace(["\n", "\r"], '', $value);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Convert a String to an Array
+	 *
+	 * @param string $email
+	 *
+	 * @return array
+	 */
+	protected function stringToArray($email)
+	{
+		if (! is_array($email))
+		{
+			return (strpos($email, ',') !== false) ? preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY) : (array) trim($email);
+		}
+
+		return $email;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set Multipart Value
+	 *
+	 * @param string $str
+	 *
+	 * @return Email
+	 */
+	public function setAltMessage($str)
+	{
+		$this->altMessage = (string) $str;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set Mailtype
+	 *
+	 * @param string $type
+	 *
+	 * @return Email
+	 */
+	public function setMailType($type = 'text')
+	{
+		$this->mailType = ($type === 'html') ? 'html' : 'text';
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set Wordwrap
+	 *
+	 * @param boolean $wordWrap
+	 *
+	 * @return Email
+	 */
+	public function setWordWrap($wordWrap = true)
+	{
+		$this->wordWrap = (bool) $wordWrap;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set Priority
+	 *
+	 * @param integer $n
+	 *
+	 * @return Email
+	 */
+	public function setPriority($n = 3)
+	{
+		$this->priority = preg_match('/^[1-5]$/', $n) ? (int) $n : 3;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set Newline Character
+	 *
+	 * @param string $newline
+	 *
+	 * @return Email
+	 */
+	public function setNewline($newline = "\n")
+	{
+		$this->newline = in_array($newline, ["\n", "\r\n", "\r"]) ? $newline : "\n";
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set CRLF
+	 *
+	 * @param string $CRLF
+	 *
+	 * @return Email
+	 */
+	public function setCRLF($CRLF = "\n")
+	{
+		$this->CRLF = ($CRLF !== "\n" && $CRLF !== "\r\n" && $CRLF !== "\r") ? "\n" : $CRLF;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set RFC 822 Date
 	 *
 	 * @return string
 	 */
-	protected function removeNLCallback($matches)
+	protected function setDate()
 	{
-		if (strpos($matches[1], "\r") !== false || strpos($matches[1], "\n") !== false)
-		{
-			$matches[1] = str_replace(["\r\n", "\r", "\n"], '', $matches[1]);
-		}
-		return $matches[1];
+		$timezone = date('Z');
+		$operator = ($timezone[0] === '-') ? '-' : '+';
+		$timezone = abs($timezone);
+		$timezone = floor($timezone / 3600) * 100 + ($timezone % 3600) / 60;
+
+		return sprintf('%s %s%04d', date('D, j M Y H:i:s'), $operator, $timezone);
 	}
+
 	//--------------------------------------------------------------------
+
 	/**
-	 * Spool mail to the mail server
+	 * Validate Email Address(es)
+	 *
+	 * @param string|array $email
 	 *
 	 * @return boolean
 	 */
-	protected function spoolEmail()
+	public function validateEmail($email)
 	{
-		$this->unwrapSpecials();
-		$protocol = $this->getProtocol();
-		$method   = 'sendWith' . ucfirst($protocol);
-		try
+		if (! is_array($email))
 		{
-			$success = $this->$method();
+			$email = [$email];
 		}
-		catch (\ErrorException $e)
+
+		foreach ($email as $val)
 		{
-			$success = false;
-			log_message('error', 'Email: ' . $method . ' throwed ' . $e->getMessage());
+			if (! $this->isValidEmail($val))
+			{
+				throw EmailException::forInvalidAddress($val);
+			}
 		}
-		if (! $success)
-		{
-			$this->setErrorMessage(lang('Email.sendFailure' . ($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol))));
-			return false;
-		}
-		$this->setErrorMessage(lang('Email.sent', [$protocol]));
+
 		return true;
 	}
+
 	//--------------------------------------------------------------------
+
 	/**
-	 * Validate email for shell
-	 *
-	 * Applies stricter, shell-safe validation to email addresses.
-	 * Introduced to prevent RCE via sendmail's -f option.
-	 *
-	 * @see     https://github.com/codeigniter4/CodeIgniter/issues/4963
-	 * @see     https://gist.github.com/Zenexer/40d02da5e07f151adeaeeaa11af9ab36
-	 * @license https://creativecommons.org/publicdomain/zero/1.0/    CC0 1.0, Public Domain
-	 *
-	 * Credits for the base concept go to Paul Buonopane <paul@namepros.com>
+	 * Email Validation
 	 *
 	 * @param string $email
 	 *
 	 * @return boolean
 	 */
-	protected function validateEmailForShell(&$email)
+	public function isValidEmail($email)
 	{
-		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
-		{
-			$email = static::substr($email, 0, ++ $atpos) . idn_to_ascii(
-							static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46
-			);
-		}
-		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Send using mail()
-	 *
-	 * @return boolean
-	 */
-	protected function sendWithMail()
-	{
-		$recipients = is_array($this->recipients) ? implode(', ', $this->recipients) : $this->recipients;
+		$email = $this->cleanEMail($email);
 
-		// _validate_email_for_shell() below accepts by reference,
-		// so this needs to be assigned to a variable
-		$from = $this->cleanEmail($this->headers['Return-Path']);
-		if (! $this->validateEmailForShell($from))
-		{
-			return mail($recipients, $this->subject, $this->finalBody, $this->headerStr);
-		}
-		// most documentation of sendmail using the "-f" flag lacks a space after it, however
-		// we've encountered servers that seem to require it to be in place.
-		return mail($recipients, $this->subject, $this->finalBody, $this->headerStr, '-f ' . $from);
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Send using Sendmail
-	 *
-	 * @return boolean
-	 */
-	protected function sendWithSendmail()
-	{
-		// _validate_email_for_shell() below accepts by reference,
-		// so this needs to be assigned to a variable
-		$from = $this->cleanEmail($this->headers['From']);
-		if ($this->validateEmailForShell($from))
-		{
-			$from = '-f ' . $from;
-		}
-		else
-		{
-			$from = '';
-		}
-		// is popen() enabled?
-		if (! function_usable('popen') || false === ($fp = @popen($this->mailPath . ' -oi ' . $from . ' -t', 'w')))
-		{
-			// server probably has popen disabled, so nothing we can do to get a verbose error.
-			return false;
-		}
-		fputs($fp, $this->headerStr);
-		fputs($fp, $this->finalBody);
-		$status = pclose($fp);
-		if ($status !== 0)
-		{
-			$this->setErrorMessage(lang('Email.exitStatus', [$status]));
-			$this->setErrorMessage(lang('Email.nosocket'));
-			return false;
-		}
-		return true;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Send using SMTP
-	 *
-	 * @return boolean
-	 */
-	protected function sendWithSmtp()
-	{
-		if ($this->SMTPHost === '')
-		{
-			$this->setErrorMessage(lang('Email.noHostname'));
-			return false;
-		}
-		if (! $this->SMTPConnect() || ! $this->SMTPAuthenticate())
-		{
-			return false;
-		}
-		if (! $this->sendCommand('from', $this->cleanEmail($this->headers['From'])))
-		{
-			$this->SMTPEnd();
-			return false;
-		}
-		foreach ($this->recipients as $val)
-		{
-			if (! $this->sendCommand('to', $val))
-			{
-				$this->SMTPEnd();
-				return false;
-			}
-		}
-		foreach ($this->CCArray as $val)
-		{
-			if ($val !== '' && ! $this->sendCommand('to', $val))
-			{
-				$this->SMTPEnd();
-				return false;
-			}
-		}
-		foreach ($this->BCCArray as $val)
-		{
-			if ($val !== '' && ! $this->sendCommand('to', $val))
-			{
-				$this->SMTPEnd();
-				return false;
-			}
-		}
-		if (! $this->sendCommand('data'))
-		{
-			$this->SMTPEnd();
-			return false;
-		}
-		// perform dot transformation on any lines that begin with a dot
-		$this->sendData($this->headerStr . preg_replace('/^\./m', '..$1', $this->finalBody));
-		$this->sendData($this->newline . '.');
-		$reply = $this->getSMTPData();
-		$this->setErrorMessage($reply);
-		$this->SMTPEnd();
-		if (strpos($reply, '250') !== 0)
-		{
-			$this->setErrorMessage(lang('Email.SMTPError', [$reply]));
-			return false;
-		}
-		return true;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * SMTP End
-	 *
-	 * Shortcut to send RSET or QUIT depending on keep-alive
-	 */
-	protected function SMTPEnd()
-	{
-		$this->sendCommand($this->SMTPKeepAlive ? 'reset' : 'quit');
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * SMTP Connect
-	 *
-	 * @return string|boolean
-	 */
-	protected function SMTPConnect()
-	{
-		if (is_resource($this->SMTPConnect))
-		{
-			return true;
-		}
-
-		$ssl = '';
-		if ($this->SMTPPort === 465)
-		{
-			$ssl = 'tls://';
-		}
-		elseif ($this->SMTPCrypto === 'ssl')
-		{
-			$ssl = 'ssl://';
-		}
-
-		$this->SMTPConnect = fsockopen(
-				$ssl . $this->SMTPHost, $this->SMTPPort, $errno, $errstr, $this->SMTPTimeout
+		// sanitize the domain name
+		$atpos = strpos($email, '@');
+		$email = mb_substr($email, 0, ++ $atpos, '8bit') . idn_to_ascii(
+						mb_substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46
 		);
-		if (! is_resource($this->SMTPConnect))
+
+		return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Clean Extended Email Address: Joe Smith <joe@smith.com>
+	 *
+	 * @param string|array $email An email string, or array of them
+	 *
+	 * @return string|array The "clean" email-only address(es)
+	 */
+	public function cleanEmail($email)
+	{
+		if (! is_array($email))
 		{
-			$this->setErrorMessage(lang('Email.SMTPError', [$errno . ' ' . $errstr]));
-			return false;
+			return preg_match('/\<(.*)\>/', $email, $match) ? $match[1] : $email;
 		}
-		stream_set_timeout($this->SMTPConnect, $this->SMTPTimeout);
-		$this->setErrorMessage($this->getSMTPData());
-		if ($this->SMTPCrypto === 'tls')
+
+		$cleanEmail = [];
+
+		foreach ($email as $addy)
 		{
-			$this->sendCommand('hello');
-			$this->sendCommand('starttls');
-			$crypto = stream_socket_enable_crypto($this->SMTPConnect, true, STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT |
-				STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
-			if ($crypto !== true)
+			$cleanEmail[] = preg_match('/\<(.*)\>/', $addy, $match) ? $match[1] : $addy;
+		}
+
+		return $cleanEmail;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Word Wrap
+	 *
+	 * @param string       $str
+	 * @param integer|null $charlim Line-length limit
+	 *
+	 * @return string
+	 */
+	public function wordWrap($str, $charlim = null)
+	{
+		// Set the character limit, if not already present
+		if (empty($charlim))
+		{
+			$charlim = empty($this->wrapChars) ? 76 : $this->wrapChars;
+		}
+
+		// Standardize newlines
+		if (strpos($str, "\r") !== false)
+		{
+			$str = str_replace(["\r\n", "\r"], "\n", $str);
+		}
+
+		// Reduce multiple spaces at end of line
+		$str = preg_replace('| +\n|', "\n", $str);
+
+		// If the current word is surrounded by {unwrap} tags we'll
+		// strip the entire chunk and replace it with a marker.
+		$unwrap = [];
+		if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches))
+		{
+			for ($i = 0, $c = count($matches[0]); $i < $c; $i ++)
 			{
-				$this->setErrorMessage(lang('Email.SMTPError', $this->getSMTPData()));
-				return false;
+				$unwrap[] = $matches[1][$i];
+				$str      = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
 			}
 		}
-		return $this->sendCommand('hello');
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Send SMTP command
-	 *
-	 * @param string $cmd
-	 * @param string $data
-	 *
-	 * @return boolean
-	 */
-	protected function sendCommand($cmd, $data = '')
-	{
-		switch ($cmd)
+
+		// Use PHP's native function to do the initial wordwrap.
+		// We set the cut flag to FALSE so that any individual words that are
+		// too long get left alone. In the next step we'll deal with them.
+		$str = wordwrap($str, $charlim, "\n", false);
+
+		// Split the string into individual lines of text and cycle through them
+		$output = '';
+		foreach (explode("\n", $str) as $line)
 		{
-			case 'hello':
-				if ($this->SMTPAuth || $this->getEncoding() === '8bit')
-				{
-					$this->sendData('EHLO ' . $this->getHostname());
-				}
-				else
-				{
-					$this->sendData('HELO ' . $this->getHostname());
-				}
-				$resp = 250;
-			break;
-			case 'starttls':
-				$this->sendData('STARTTLS');
-				$resp = 220;
-			break;
-			case 'from':
-				$this->sendData('MAIL FROM:<' . $data . '>');
-				$resp = 250;
-			break;
-			case 'to':
-				if ($this->DSN)
-				{
-					$this->sendData('RCPT TO:<' . $data . '> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;' . $data);
-				}
-				else
-				{
-					$this->sendData('RCPT TO:<' . $data . '>');
-				}
-				$resp = 250;
-			break;
-			case 'data':
-				$this->sendData('DATA');
-				$resp = 354;
-			break;
-			case 'reset':
-				$this->sendData('RSET');
-				$resp = 250;
-			break;
-			case 'quit':
-				$this->sendData('QUIT');
-				$resp = 221;
-			break;
-		}
-		$reply                = $this->getSMTPData();
-		$this->debugMessage[] = '<pre>' . $cmd . ': ' . $reply . '</pre>';
-		if ((int) static::substr($reply, 0, 3) !== $resp) // @phpstan-ignore-line
-		{
-			$this->setErrorMessage(lang('Email.SMTPError', [$reply]));
-			return false;
-		}
-		if ($cmd === 'quit')
-		{
-			fclose($this->SMTPConnect);
-		}
-		return true;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * SMTP Authenticate
-	 *
-	 * @return boolean
-	 */
-	protected function SMTPAuthenticate()
-	{
-		if (! $this->SMTPAuth)
-		{
-			return true;
-		}
-		if ($this->SMTPUser === '' && $this->SMTPPass === '')
-		{
-			$this->setErrorMessage(lang('lang:email.noSMTPAuth'));
-			return false;
-		}
-		$this->sendData('AUTH LOGIN');
-		$reply = $this->getSMTPData();
-		if (strpos($reply, '503') === 0)    // Already authenticated
-		{
-			return true;
-		}
-		elseif (strpos($reply, '334') !== 0)
-		{
-			$this->setErrorMessage(lang('Email.failedSMTPLogin', [$reply]));
-			return false;
-		}
-		$this->sendData(base64_encode($this->SMTPUser));
-		$reply = $this->getSMTPData();
-		if (strpos($reply, '334') !== 0)
-		{
-			$this->setErrorMessage(lang('Email.SMTPAuthUsername', [$reply]));
-			return false;
-		}
-		$this->sendData(base64_encode($this->SMTPPass));
-		$reply = $this->getSMTPData();
-		if (strpos($reply, '235') !== 0)
-		{
-			$this->setErrorMessage(lang('Email.SMTPAuthPassword', [$reply]));
-			return false;
-		}
-		if ($this->SMTPKeepAlive)
-		{
-			$this->SMTPAuth = false;
-		}
-		return true;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Send SMTP data
-	 *
-	 * @param string $data
-	 *
-	 * @return boolean
-	 */
-	protected function sendData($data)
-	{
-		$data .= $this->newline;
-		for ($written = $timestamp = 0, $length = static::strlen($data); $written < $length; $written += $result)
-		{
-			if (($result = fwrite($this->SMTPConnect, static::substr($data, $written))) === false)
+			// Is the line within the allowed character count?
+			// If so we'll join it to the output and continue
+			if (mb_strlen($line) <= $charlim)
 			{
-				break;
-			}
-			// See https://bugs.php.net/bug.php?id=39598 and http://php.net/manual/en/function.fwrite.php#96951
-			elseif ($result === 0)
-			{
-				if ($timestamp === 0)
-				{
-					$timestamp = time();
-				}
-				elseif ($timestamp < (time() - $this->SMTPTimeout))
-				{
-					$result = false;
-					break;
-				}
-				usleep(250000);
+				$output .= $line . $this->newline;
 				continue;
 			}
-			else
+
+			$temp = '';
+			do
 			{
-				$timestamp = 0;
+				// If the over-length word is a URL we won't wrap it
+				if (preg_match('!\[url.+\]|://|www\.!', $line))
+				{
+					break;
+				}
+
+				// Trim the word down
+				$temp .= mb_substr($line, 0, $charlim - 1, '8bit');
+				$line  = mb_substr($line, $charlim - 1);
+			}
+			while (mb_strlen($line) > $charlim);
+
+			// If $temp contains data it means we had to split up an over-length
+			// word into smaller chunks so we'll add it back to our current line
+			if ($temp !== '')
+			{
+				$output .= $temp . $this->newline;
+			}
+
+			$output .= $line . $this->newline;
+		}
+
+		// Put our markers back
+		if ($unwrap)
+		{
+			foreach ($unwrap as $key => $val)
+			{
+				$output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
 			}
 		}
-		if ($result === false) // @phpstan-ignore-line
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send Email
+	 *
+	 * @param boolean $autoClear
+	 * @param boolean $reallySend
+	 *
+	 * @return boolean
+	 */
+	public function send($autoClear = true, bool $reallySend = true)
+	{
+		// our decision here, whether to send or fake it
+		$result = $reallySend ? $this->handler->send($this, $autoClear) : true;
+
+		if ($result && $autoClear)
 		{
-			$this->setErrorMessage(lang('Email.SMTPDataFailure', $data));
-			return false;
+			$this->clear();
 		}
-		return true;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Get SMTP data
-	 *
-	 * @return string
-	 */
-	protected function getSMTPData()
-	{
-		$data = '';
-		while ($str = fgets($this->SMTPConnect, 512))
-		{
-			$data .= $str;
-			if ($str[3] === ' ')
-			{
-				break;
-			}
-		}
-		return $data;
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Get Hostname
-	 *
-	 * There are only two legal types of hostname - either a fully
-	 * qualified domain name (eg: "mail.example.com") or an IP literal
-	 * (eg: "[1.2.3.4]").
-	 *
-	 * @link https://tools.ietf.org/html/rfc5321#section-2.3.5
-	 * @link http://cbl.abuseat.org/namingproblems.html
-	 *
-	 * @return string
-	 */
-	protected function getHostname()
-	{
-		if (isset($_SERVER['SERVER_NAME']))
-		{
-			return $_SERVER['SERVER_NAME'];
-		}
-		return isset($_SERVER['SERVER_ADDR']) ? '[' . $_SERVER['SERVER_ADDR'] . ']' : '[127.0.0.1]';
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Get Debug Message
-	 *
-	 * @param array $include List of raw data chunks to include in the output
-	 *                       Valid options are: 'headers', 'subject', 'body'
-	 *
-	 * @return string
-	 */
-	public function printDebugger($include = ['headers', 'subject', 'body'])
-	{
-		$msg = implode('', $this->debugMessage);
-		// Determine which parts of our raw data needs to be printed
-		$raw_data                                         = '';
-		is_array($include) || $include                    = [$include];
-		in_array('headers', $include, true) && $raw_data  = htmlspecialchars($this->headerStr) . "\n";
-		in_array('subject', $include, true) && $raw_data .= htmlspecialchars($this->subject) . "\n";
-		in_array('body', $include, true) && $raw_data    .= htmlspecialchars($this->finalBody);
-		return $msg . ($raw_data === '' ? '' : '<pre>' . $raw_data . '</pre>');
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Set Message
-	 *
-	 * @param string $msg
-	 */
-	protected function setErrorMessage($msg)
-	{
-		$this->debugMessage[] = $msg . '<br />';
+
+		return $result;
 	}
+
 	//--------------------------------------------------------------------
+
 	/**
 	 * Mime Types
 	 *
@@ -2139,61 +1151,69 @@ class Email
 	protected function mimeTypes($ext = '')
 	{
 		$mime = Mimes::guessTypeFromExtension(strtolower($ext));
+
 		return ! empty($mime) ? $mime : 'application/x-unknown-content-type';
 	}
+
 	//--------------------------------------------------------------------
+
 	/**
-	 * Destructor
+	 * Lookup an email header and return its value.
+	 *
+	 * @param string $key
+	 *
+	 * @return string|null
 	 */
-	public function __destruct()
+	public function getHeader(string $key = ''): ?string
 	{
-		is_resource($this->SMTPConnect) && $this->sendCommand('quit');
+		return $this->headers[$key] ?? null;
 	}
+
 	//--------------------------------------------------------------------
+
 	/**
-	 * Byte-safe strlen()
+	 * Magic method to all protected/private class properties to be easily set,
+	 * if a property has a setter method.
 	 *
-	 * @param string $str
+	 * @param string $key
+	 * @param null   $value
 	 *
-	 * @return integer
+	 * @return $this
 	 */
-	protected static function strlen($str)
+	public function __set(string $key, $value = null)
 	{
-		return (static::$func_overload) ? mb_strlen($str, '8bit') : strlen($str);
-	}
-	//--------------------------------------------------------------------
-	/**
-	 * Byte-safe substr()
-	 *
-	 * @param string       $str
-	 * @param integer      $start
-	 * @param integer|null $length
-	 *
-	 * @return string
-	 */
-	protected static function substr($str, $start, $length = null)
-	{
-		if (static::$func_overload)
+		$method = 'set' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
+		if (method_exists($this, $method))
 		{
-			return mb_substr($str, $start, $length, '8bit');
+			$this->$method($value);
 		}
-		return isset($length) ? substr($str, $start, $length) : substr($str, $start);
+
+		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
-	 * Determines the values that should be stored in $archive.
+	 * Magic method to allow retrieval of protected
+	 * class properties either by their name, or through a `getCamelCasedProperty()`
+	 * method.
 	 *
-	 * @return array The updated archive values
+	 * @param string $key
+	 *
+	 * @return mixed
 	 */
-	protected function setArchiveValues(): array
+	public function __get(string $key)
 	{
-		// Get property values and add anything prepped in tmpArchive
-		$this->archive = array_merge(get_object_vars($this), $this->tmpArchive);
-		unset($this->archive['archive']);
+		// Convert to CamelCase for the method
+		$method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
+		if (method_exists($this, $method))
+		{
+			$result = $this->$method();
+		}
+		else if (property_exists($this, $key))
+		{
+			$result = $this->$key;
+		}
 
-		// Clear tmpArchive for next run
-		$this->tmpArchive = [];
-
-		return $this->archive;
+		return $result ?? null;
 	}
+
 }
diff --git a/system/Email/Exceptions/EmailException.php b/system/Email/Exceptions/EmailException.php
new file mode 100644
index 0000000000..eff2976af1
--- /dev/null
+++ b/system/Email/Exceptions/EmailException.php
@@ -0,0 +1,90 @@
+<?php
+namespace CodeIgniter\Email\Exceptions;
+
+use CodeIgniter\Exceptions\ExceptionInterface;
+
+class EmailException extends \RuntimeException implements ExceptionInterface
+{
+
+	public static function forAttachmentMissing(string $file = null)
+	{
+		return new static(lang('Email.attachmentMissing', [$file]));
+	}
+
+	public static function forAttachmentUnreadable(string $file = null)
+	{
+		return new static(lang('Email.attachmentUnreadable', [$file]));
+	}
+
+	public static function forMustBeArray()
+	{
+		return new static(lang('Email.mustBeArray', []));
+	}
+
+	public static function forInvalidAddress(string $value = null)
+	{
+		return new static(lang('Email.invalidAddress', [$value]));
+	}
+
+	public static function forInvalidProtocol(string $value = null)
+	{
+		return new static(lang('Email.invalidProtocolRequested', [$value]));
+	}
+
+	public static function forNoFrom()
+	{
+		return new static(lang('Email.noFrom', []));
+	}
+
+	public static function forNoRecipients()
+	{
+		return new static(lang('Email.noRecipients', []));
+	}
+
+	public static function forSendFailure(string $protocol = '?')
+	{
+		return new static(lang('Email.SendFailure', [$protocol]));
+	}
+
+	public static function forNosocket(string $status = '?')
+	{
+		return new static(lang('Email.exitStatus', [$status]) .
+				lang('Email.nosocket', []));
+	}
+
+	public static function forNoHostname()
+	{
+		return new static(lang('Email.noHostname', []));
+	}
+
+	public static function forSMTPError(string $reply = '?')
+	{
+		return new static(lang('Email.SMTPError', [$reply]));
+	}
+
+	public static function forNoSMTPAuth()
+	{
+		return new static(lang('Email.noSMTPAuth', []));
+	}
+
+	public static function forFailedSMTPLogin(string $reply = '?')
+	{
+		return new static(lang('Email.failedSMTPLogin', [$reply]));
+	}
+
+	public static function forSMTPAuthUsername(string $reply = '?')
+	{
+		return new static(lang('Email.SMTPAuthUsername', [$reply]));
+	}
+
+	public static function forSMTPAuthPassword(string $reply = '?')
+	{
+		return new static(lang('Email.SMTPAuthPassword', [$reply]));
+	}
+
+	public static function forSMTPDataFailure(string $data = '?')
+	{
+		return new static(lang('Email.SMTPDataFailure', [$data]));
+	}
+
+}
diff --git a/system/Email/Handlers/BaseHandler.php b/system/Email/Handlers/BaseHandler.php
new file mode 100644
index 0000000000..8e784eb5ce
--- /dev/null
+++ b/system/Email/Handlers/BaseHandler.php
@@ -0,0 +1,1675 @@
+<?php
+namespace CodeIgniter\Email\Handlers;
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014 - 2018, British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     EllisLab Dev Team
+ * @copyright  Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright  Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license    http://opensource.org/licenses/MIT    MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 1.0.0
+ * @filesource
+ */
+
+use CodeIgniter\Email\Exceptions\EmailException;
+use CodeIgniter\Email\TransporterInterface;
+use CodeIgniter\Email\Email;
+use Config\Mimes;
+use Psr\Log\LoggerAwareTrait;
+use Psr\Log\LoggerInterface;
+
+/**
+ * CodeIgniter Email Class
+ *
+ * Permits email to be sent using Mail, Sendmail, or SMTP.
+ *
+ * @package    CodeIgniter
+ * @subpackage Libraries
+ * @category   Libraries
+ * @author     EllisLab Dev Team
+ * @link       https://codeigniter.com/user_guide/libraries/email.html
+ */
+class BaseHandler implements TransporterInterface
+{
+
+	public $protocol = 'none';
+
+	/**
+	 * Message format.
+	 *
+	 * @var string 'text' or 'html'
+	 */
+	public $mailType = 'text';
+
+	/**
+	 * Character set (default: utf-8)
+	 *
+	 * @var string
+	 */
+	public $charset = 'utf-8';
+
+	/**
+	 * Alternative message (for HTML messages only)
+	 *
+	 * @var string
+	 */
+	public $altMessage = '';
+
+	/**
+	 * Whether to validate e-mail addresses.
+	 *
+	 * @var boolean
+	 */
+	public $validate = true;
+
+	/**
+	 * X-Priority header value.
+	 *
+	 * @var integer 1-5
+	 */
+	public $priority = 3;            // Default priority (1 - 5)
+
+	/**
+	 * Newline character sequence.
+	 * Use "\r\n" to comply with RFC 822.
+	 *
+	 * @link http://www.ietf.org/rfc/rfc822.txt
+	 * @var  string "\r\n" or "\n"
+	 */
+	public $newline = "\n";            // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
+
+	/**
+	 * CRLF character sequence
+	 *
+	 * RFC 2045 specifies that for 'quoted-printable' encoding,
+	 * "\r\n" must be used. However, it appears that some servers
+	 * (even on the receiving end) don't handle it properly and
+	 * switching to "\n", while improper, is the only solution
+	 * that seems to work for all environments.
+	 *
+	 * @link http://www.ietf.org/rfc/rfc822.txt
+	 * @var  string
+	 */
+	public $CRLF = "\n";
+
+	/**
+	 * Whether to use Delivery Status Notification.
+	 *
+	 * @var boolean
+	 */
+	public $DSN = false;
+
+	/**
+	 * Whether to send multipart alternatives.
+	 * Yahoo! doesn't seem to like these.
+	 *
+	 * @var boolean
+	 */
+	public $sendMultipart = true;
+
+	/**
+	 * Whether to send messages to BCC recipients in batches.
+	 *
+	 * @var boolean
+	 */
+	public $BCCBatchMode = false;
+
+	/**
+	 * BCC Batch max number size.
+	 *
+	 * @see Email::$BCCBatchMode
+	 * @var integer
+	 */
+	public $BCCBatchSize = 200;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Subject header
+	 *
+	 * @var string
+	 */
+	protected $subject = '';
+
+	/**
+	 * Message body
+	 *
+	 * @var string
+	 */
+	protected $body = '';
+
+	/**
+	 * Final message body to be sent.
+	 *
+	 * @var string
+	 */
+	protected $finalBody = '';
+
+	/**
+	 * Final headers to send
+	 *
+	 * @var string
+	 */
+	protected $headerStr = '';
+
+	/**
+	 * SMTP Connection socket placeholder
+	 *
+	 * @var resource
+	 */
+	protected $SMTPConnect = '';
+
+	/**
+	 * Mail encoding
+	 *
+	 * @var string '8bit' or '7bit'
+	 */
+	protected $encoding = '8bit';
+
+	/**
+	 * Whether to send a Reply-To header
+	 *
+	 * @var boolean
+	 */
+	protected $replyToFlag = false;
+
+	/**
+	 * Debug messages
+	 *
+	 * @see Email::printDebugger()
+	 * @var array
+	 */
+	protected $debugMessage = [];
+
+	/**
+	 * Recipients
+	 *
+	 * @var array
+	 */
+	protected $recipients = [];
+
+	/**
+	 * CC Recipients
+	 *
+	 * @var array
+	 */
+	protected $CCArray = [];
+
+	/**
+	 * BCC Recipients
+	 *
+	 * @var array
+	 */
+	protected $BCCArray = [];
+
+	/**
+	 * Message headers
+	 *
+	 * @var array
+	 */
+	protected $headers = [];
+
+	/**
+	 * Attachment data
+	 *
+	 * @var array
+	 */
+	protected $attachments = [];
+
+	/**
+	 * Valid $protocol values
+	 *
+	 * @see Email::$protocol
+	 * @var array
+	 */
+	protected $protocols = [
+		'mail',
+		'sendmail',
+		'smtp',
+	];
+
+	/**
+	 * Base charsets
+	 *
+	 * Character sets valid for 7-bit encoding,
+	 * excluding language suffix.
+	 *
+	 * @var array
+	 */
+	protected $baseCharsets = [
+		'us-ascii',
+		'iso-2022-',
+	];
+
+	/**
+	 * Bit depths
+	 *
+	 * Valid mail encodings
+	 *
+	 * @see Email::$encoding
+	 * @var array
+	 */
+	protected $bitDepths = [
+		'7bit',
+		'8bit',
+	];
+
+	/**
+	 * $priority translations
+	 *
+	 * Actual values to send with the X-Priority header
+	 *
+	 * @var array
+	 */
+	protected $priorities = [
+		1 => '1 (Highest)',
+		2 => '2 (High)',
+		3 => '3 (Normal)',
+		4 => '4 (Low)',
+		5 => '5 (Lowest)',
+	];
+
+	/**
+	 * mbstring.func_overload flag
+	 *
+	 * @var boolean
+	 */
+	protected static $func_overload;
+
+	/**
+	 * Logger instance to record error messages and awarnings.
+	 *
+	 * @var \PSR\Log\LoggerInterface
+	 */
+	protected $logger;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor - Sets Email Preferences
+	 *
+	 * The constructor can be passed an array of config values
+	 *
+	 * @param array|null $config
+	 */
+	public function __construct($config = null)
+	{
+		$this->initialize($config);
+
+		log_message('info', 'Email Class Initialized');
+	}
+
+	public function getProtocol() : string
+	{
+		return $this->protocol;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Initialize preferences
+	 *
+	 * @param array|\Config\Email $config
+	 *
+	 * @return Email
+	 */
+	public function initialize($config)
+	{
+		$this->clear();
+
+		if ($config instanceof \Config\Email)
+		{
+			$config = get_object_vars($config);
+		}
+
+		foreach (get_class_vars(get_class($this)) as $key => $value)
+		{
+			if (property_exists($this, $key) && isset($config[$key]))
+			{
+				$method = 'set' . ucfirst($key);
+
+				if (method_exists($this, $method))
+				{
+					$this->$method($config[$key]);
+				}
+			}
+		}
+
+		$this->charset  = strtoupper($this->charset);
+		$this->SMTPAuth = isset($this->SMTPUser[0], $this->SMTPPass[0]);
+
+		return $this;
+	}
+
+	public function setLogger(LoggerInterface $logger)
+	{
+		$this->logger = $logger;
+	}
+	//--------------------------------------------------------------------
+
+	/**
+	 * Initialize the Email Data
+	 *
+	 * @param boolean $clearAttachments
+	 *
+	 * @return Email
+	 */
+	public function clear($clearAttachments = false)
+	{
+		$this->subject      = '';
+		$this->body         = '';
+		$this->finalBody    = '';
+		$this->headerStr    = '';
+		$this->replyToFlag  = false;
+		$this->recipients   = [];
+		$this->CCArray      = [];
+		$this->BCCArray     = [];
+		$this->headers      = [];
+		$this->debugMessage = [];
+
+		$this->setHeader('Date', $this->setDate());
+
+		if ($clearAttachments !== false)
+		{
+			$this->attachments = [];
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Build final headers
+	 */
+	protected function buildHeaders()
+	{
+		$this->setHeader('User-Agent', $this->userAgent);
+		$this->setHeader('X-Sender', $this->cleanEmail($this->headers['From']));
+		$this->setHeader('X-Mailer', $this->userAgent);
+		$this->setHeader('X-Priority', $this->priorities[$this->priority]);
+		$this->setHeader('Message-ID', $this->getMessageID());
+		$this->setHeader('Mime-Version', '1.0');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Write Headers as a string
+	 */
+	protected function writeHeaders()
+	{
+		if ($this->protocol === 'mail')
+		{
+			if (isset($this->headers['Subject']))
+			{
+				$this->subject = $this->headers['Subject'];
+				unset($this->headers['Subject']);
+			}
+		}
+
+		reset($this->headers);
+		$this->headerStr = '';
+
+		foreach ($this->headers as $key => $val)
+		{
+			$val = trim($val);
+
+			if ($val !== '')
+			{
+				$this->headerStr .= $key . ': ' . $val . $this->newline;
+			}
+		}
+
+		if ($this->getProtocol() === 'mail')
+		{
+			$this->headerStr = rtrim($this->headerStr);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Build Final Body and attachments
+	 */
+	protected function buildMessage()
+	{
+		if ($this->wordWrap === true && $this->mailType !== 'html')
+		{
+			$this->body = $this->wordWrap($this->body);
+		}
+
+		$this->writeHeaders();
+
+		$hdr  = ($this->getProtocol() === 'mail') ? $this->newline : '';
+		$body = '';
+
+		switch ($this->getContentType())
+		{
+			case 'plain':
+
+				$hdr .= 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding();
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+					$this->finalBody  = $this->body;
+				}
+				else
+				{
+					$this->finalBody = $hdr . $this->newline . $this->newline . $this->body;
+				}
+
+				return;
+
+			case 'html':
+
+				if ($this->sendMultipart === false)
+				{
+					$hdr .= 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: quoted-printable';
+				}
+				else
+				{
+					$boundary = uniqid('B_ALT_', true);
+					$hdr     .= 'Content-Type: multipart/alternative; boundary="' . $boundary . '"';
+
+					$body .= $this->getMimeMessage() . $this->newline . $this->newline
+							. '--' . $boundary . $this->newline
+							. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+							. $this->getAltMessage() . $this->newline . $this->newline
+							. '--' . $boundary . $this->newline
+							. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline;
+				}
+
+				$this->finalBody = $body . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline;
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+				else
+				{
+					$this->finalBody = $hdr . $this->newline . $this->newline . $this->finalBody;
+				}
+
+				if ($this->sendMultipart !== false)
+				{
+					$this->finalBody .= '--' . $boundary . '--';
+				}
+
+				return;
+
+			case 'plain-attach':
+
+				$boundary = uniqid('B_ATC_', true);
+				$hdr     .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"';
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+
+				$body .= $this->getMimeMessage() . $this->newline
+						. $this->newline
+						. '--' . $boundary . $this->newline
+						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline
+						. $this->newline
+						. $this->body . $this->newline . $this->newline;
+
+				$this->appendAttachments($body, $boundary);
+
+				break;
+			case 'html-attach':
+
+				$alt_boundary  = uniqid('B_ALT_', true);
+				$last_boundary = null;
+
+				if ($this->attachmentsHaveMultipart('mixed'))
+				{
+					$atc_boundary  = uniqid('B_ATC_', true);
+					$hdr          .= 'Content-Type: multipart/mixed; boundary="' . $atc_boundary . '"';
+					$last_boundary = $atc_boundary;
+				}
+
+				if ($this->attachmentsHaveMultipart('related'))
+				{
+					$rel_boundary        = uniqid('B_REL_', true);
+					$rel_boundary_header = 'Content-Type: multipart/related; boundary="' . $rel_boundary . '"';
+
+					if (isset($last_boundary))
+					{
+						$body .= '--' . $last_boundary . $this->newline . $rel_boundary_header;
+					}
+					else
+					{
+						$hdr .= $rel_boundary_header;
+					}
+
+					$last_boundary = $rel_boundary;
+				}
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+
+				static::strlen($body) && $body .= $this->newline . $this->newline;
+				$body                          .= $this->getMimeMessage() . $this->newline . $this->newline
+						. '--' . $last_boundary . $this->newline
+						. 'Content-Type: multipart/alternative; boundary="' . $alt_boundary . '"' . $this->newline . $this->newline
+						. '--' . $alt_boundary . $this->newline
+						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+						. $this->getAltMessage() . $this->newline . $this->newline
+						. '--' . $alt_boundary . $this->newline
+						. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline
+						. $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
+						. '--' . $alt_boundary . '--' . $this->newline . $this->newline;
+
+				if (! empty($rel_boundary))
+				{
+					$body .= $this->newline . $this->newline;
+					$this->appendAttachments($body, $rel_boundary, 'related');
+				}
+
+				// multipart/mixed attachments
+				if (! empty($atc_boundary))
+				{
+					$body .= $this->newline . $this->newline;
+					$this->appendAttachments($body, $atc_boundary, 'mixed');
+				}
+
+				break;
+		}
+
+		$this->finalBody = ($this->getProtocol() === 'mail') ? $body : $hdr . $this->newline . $this->newline . $body;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepares attachment string
+	 *
+	 * @param string      &$body     Message body to append to
+	 * @param string      $boundary  Multipart boundary
+	 * @param string|null $multipart When provided, only attachments of this type will be processed
+	 *
+	 * @return string
+	 */
+	protected function appendAttachments(&$body, $boundary, $multipart = null)
+	{
+		for ($i = 0, $c = count($this->attachments); $i < $c; $i ++)
+		{
+			if (isset($multipart) && $this->attachments[$i]['multipart'] !== $multipart)
+			{
+				continue;
+			}
+
+			$name = isset($this->attachments[$i]['name'][1]) ? $this->attachments[$i]['name'][1] : basename($this->attachments[$i]['name'][0]);
+
+			$body .= '--' . $boundary . $this->newline
+					. 'Content-Type: ' . $this->attachments[$i]['type'] . '; name="' . $name . '"' . $this->newline
+					. 'Content-Disposition: ' . $this->attachments[$i]['disposition'] . ';' . $this->newline
+					. 'Content-Transfer-Encoding: base64' . $this->newline
+					. (empty($this->attachments[$i]['cid']) ? '' : 'Content-ID: <' . $this->attachments[$i]['cid'] . '>' . $this->newline)
+					. $this->newline
+					. $this->attachments[$i]['content'] . $this->newline;
+		}
+
+		// $name won't be set if no attachments were appended,
+		// and therefore a boundary wouldn't be necessary
+		empty($name) || $body .= '--' . $boundary . '--';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prep Quoted Printable
+	 *
+	 * Prepares string for Quoted-Printable Content-Transfer-Encoding
+	 * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	protected function prepQuotedPrintable($str)
+	{
+		// ASCII code numbers for "safe" characters that can always be
+		// used literally, without encoding, as described in RFC 2049.
+		// http://www.ietf.org/rfc/rfc2049.txt
+		static $ascii_safe_chars = [
+			// ' (  )   +   ,   -   .   /   :   =   ?
+			39,
+			40,
+			41,
+			43,
+			44,
+			45,
+			46,
+			47,
+			58,
+			61,
+			63,
+			// numbers
+			48,
+			49,
+			50,
+			51,
+			52,
+			53,
+			54,
+			55,
+			56,
+			57,
+			// upper-case letters
+			65,
+			66,
+			67,
+			68,
+			69,
+			70,
+			71,
+			72,
+			73,
+			74,
+			75,
+			76,
+			77,
+			78,
+			79,
+			80,
+			81,
+			82,
+			83,
+			84,
+			85,
+			86,
+			87,
+			88,
+			89,
+			90,
+			// lower-case letters
+			97,
+			98,
+			99,
+			100,
+			101,
+			102,
+			103,
+			104,
+			105,
+			106,
+			107,
+			108,
+			109,
+			110,
+			111,
+			112,
+			113,
+			114,
+			115,
+			116,
+			117,
+			118,
+			119,
+			120,
+			121,
+			122,
+		];
+
+		// We are intentionally wrapping so mail servers will encode characters
+		// properly and MUAs will behave, so {unwrap} must go!
+		$str = str_replace(['{unwrap}', '{/unwrap}'], '', $str);
+
+		// RFC 2045 specifies CRLF as "\r\n".
+		// However, many developers choose to override that and violate
+		// the RFC rules due to (apparently) a bug in MS Exchange,
+		// which only works with "\n".
+		if ($this->CRLF === "\r\n")
+		{
+			return quoted_printable_encode($str);
+		}
+
+		// Reduce multiple spaces & remove nulls
+		$str = preg_replace(['| +|', '/\x00+/'], [' ', ''], $str);
+
+		// Standardize newlines
+		if (strpos($str, "\r") !== false)
+		{
+			$str = str_replace(["\r\n", "\r"], "\n", $str);
+		}
+
+		$escape = '=';
+		$output = '';
+
+		foreach (explode("\n", $str) as $line)
+		{
+			$length = static::strlen($line);
+			$temp   = '';
+
+			// Loop through each character in the line to add soft-wrap
+			// characters at the end of a line " =\r\n" and add the newly
+			// processed line(s) to the output (see comment on $crlf class property)
+			for ($i = 0; $i < $length; $i ++)
+			{
+				// Grab the next character
+				$char  = $line[$i];
+				$ascii = ord($char);
+
+				// Convert spaces and tabs but only if it's the end of the line
+				if ($ascii === 32 || $ascii === 9)
+				{
+					if ($i === ($length - 1))
+					{
+						$char = $escape . sprintf('%02s', dechex($ascii));
+					}
+				}
+				// DO NOT move this below the $ascii_safe_chars line!
+				//
+				// = (equals) signs are allowed by RFC2049, but must be encoded
+				// as they are the encoding delimiter!
+				elseif ($ascii === 61)
+				{
+					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
+				}
+				elseif (! in_array($ascii, $ascii_safe_chars, true))
+				{
+					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));
+				}
+
+				// If we're at the character limit, add the line to the output,
+				// reset our temp variable, and keep on chuggin'
+				if ((static::strlen($temp) + static::strlen($char)) >= 76)
+				{
+					$output .= $temp . $escape . $this->CRLF;
+					$temp    = '';
+				}
+
+				// Add the character to our temporary line
+				$temp .= $char;
+			}
+
+			// Add our completed line to the output
+			$output .= $temp . $this->CRLF;
+		}
+
+		// get rid of extra CRLF tacked onto the end
+		return static::substr($output, 0, static::strlen($this->CRLF) * -1);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send Email
+	 *
+	 * @param boolean $autoClear
+	 * @param boolean $reallySend
+	 *
+	 * @return boolean
+	 */
+	public function send(Email $email, bool $autoClear = true, bool $reallySend = true)
+	{
+		if (! isset($this->headers['From']) && ! empty($this->fromEmail))
+		{
+			$this->setFrom($this->fromEmail, $this->fromName);
+		}
+
+		if (! isset($this->headers['From']))
+		{
+				throw EmailException::forNoFrom();
+		}
+
+		if ($this->replyToFlag === false)
+		{
+			$this->setReplyTo($this->headers['From']);
+		}
+
+		if (empty($this->recipients) && ! isset($this->headers['To']) && empty($this->BCCArray) && ! isset($this->headers['Bcc']) && ! isset($this->headers['Cc'])
+		)
+		{
+				throw EmailException::forNoRecipients();
+		}
+
+		$this->buildHeaders();
+
+		if ($this->BCCBatchMode && count($this->BCCArray) > $this->BCCBatchSize)
+		{
+			$this->batchBCCSend();
+
+			if ($autoClear)
+			{
+				$this->clear();
+			}
+
+			return true;
+		}
+
+		$this->buildMessage();
+		$result = $this->spoolEmail();
+
+		if ($result && $autoClear)
+		{
+			$this->clear();
+		}
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Batch Bcc Send. Sends groups of BCCs in batches
+	 */
+	public function batchBCCSend()
+	{
+		$float = $this->BCCBatchSize - 1;
+		$set   = '';
+		$chunk = [];
+
+		for ($i = 0, $c = count($this->BCCArray); $i < $c; $i ++)
+		{
+			if (isset($this->BCCArray[$i]))
+			{
+				$set .= ', ' . $this->BCCArray[$i];
+			}
+
+			if ($i === $float)
+			{
+				$chunk[] = static::substr($set, 1);
+				$float  += $this->BCCBatchSize;
+				$set     = '';
+			}
+
+			if ($i === $c - 1)
+			{
+				$chunk[] = static::substr($set, 1);
+			}
+		}
+
+		for ($i = 0, $c = count($chunk); $i < $c; $i ++)
+		{
+			unset($this->headers['Bcc']);
+
+			$bcc = $this->cleanEmail($this->stringToArray($chunk[$i]));
+
+			if ($this->protocol !== 'smtp')
+			{
+				$this->setHeader('Bcc', implode(', ', $bcc));
+			}
+			else
+			{
+				$this->BCCArray = $bcc;
+			}
+
+			$this->buildMessage();
+			$this->spoolEmail();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Unwrap special elements
+	 */
+	protected function unwrapSpecials()
+	{
+		$this->finalBody = preg_replace_callback(
+				'/\{unwrap\}(.*?)\{\/unwrap\}/si', [
+					$this,
+					'removeNLCallback',
+				], $this->finalBody
+		);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Strip line-breaks via callback
+	 *
+	 * @param string $matches
+	 *
+	 * @return string
+	 */
+	protected function removeNLCallback($matches)
+	{
+		if (strpos($matches[1], "\r") !== false || strpos($matches[1], "\n") !== false)
+		{
+			$matches[1] = str_replace(["\r\n", "\r", "\n"], '', $matches[1]);
+		}
+
+		return $matches[1];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Spool mail to the mail server
+	 *
+	 * @return boolean
+	 */
+	protected function spoolEmail()
+	{
+		$this->unwrapSpecials();
+
+		$protocol = $this->getProtocol();
+		$method   = 'sendWith' . ucfirst($protocol);
+		try
+		{
+			$success = $this->$method();
+		}
+		catch (\ErrorException $e)
+		{
+			$success = false;
+			$this->logger->error('Email: ' . $method . ' throwed ' . $e->getMessage());
+		}
+
+		if (! $success)
+		{
+				throw EmailException::forSendFailure($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol));
+		}
+
+		$this->setErrorMessage(lang('Email.sent', [$protocol]));
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Validate email for shell
+	 *
+	 * Applies stricter, shell-safe validation to email addresses.
+	 * Introduced to prevent RCE via sendmail's -f option.
+	 *
+	 * @see     https://github.com/codeigniter4/CodeIgniter/issues/4963
+	 * @see     https://gist.github.com/Zenexer/40d02da5e07f151adeaeeaa11af9ab36
+	 * @license https://creativecommons.org/publicdomain/zero/1.0/    CC0 1.0, Public Domain
+	 *
+	 * Credits for the base concept go to Paul Buonopane <paul@namepros.com>
+	 *
+	 * @param string &$email
+	 *
+	 * @return boolean
+	 */
+	protected function validateEmailForShell(&$email)
+	{
+		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
+		{
+			$email = static::substr($email, 0, ++ $atpos) . idn_to_ascii(
+							static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46
+			);
+		}
+
+		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send using mail()
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithMail()
+	{
+		if (is_array($this->recipients))
+		{
+			$this->recipients = implode(', ', $this->recipients);
+		}
+
+		// _validate_email_for_shell() below accepts by reference,
+		// so this needs to be assigned to a variable
+		$from = $this->cleanEmail($this->headers['Return-Path']);
+
+		if (! $this->validateEmailForShell($from))
+		{
+			return mail($this->recipients, $this->subject, $this->finalBody, $this->headerStr);
+		}
+
+		// most documentation of sendmail using the "-f" flag lacks a space after it, however
+		// we've encountered servers that seem to require it to be in place.
+		return mail($this->recipients, $this->subject, $this->finalBody, $this->headerStr, '-f ' . $from);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send using Sendmail
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithSendmail()
+	{
+		// _validate_email_for_shell() below accepts by reference,
+		// so this needs to be assigned to a variable
+		$from = $this->cleanEmail($this->headers['From']);
+		if ($this->validateEmailForShell($from))
+		{
+			$from = '-f ' . $from;
+		}
+		else
+		{
+			$from = '';
+		}
+
+		// is popen() enabled?
+		if (! function_usable('popen') || false === ($fp = @popen($this->mailPath . ' -oi ' . $from . ' -t', 'w')))
+		{
+			// server probably has popen disabled, so nothing we can do to get a verbose error.
+			return false;
+		}
+
+		fputs($fp, $this->headerStr);
+		fputs($fp, $this->finalBody);
+
+		$status = pclose($fp);
+
+		if ($status !== 0)
+		{
+				throw EmailException::forNosocket($status);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send using SMTP
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithSmtp()
+	{
+		if ($this->SMTPHost === '')
+		{
+				throw EmailException::forNoHostname();
+		}
+
+		if (! $this->SMTPConnect() || ! $this->SMTPAuthenticate())
+		{
+			return false;
+		}
+
+		if (! $this->sendCommand('from', $this->cleanEmail($this->headers['From'])))
+		{
+			$this->SMTPEnd();
+
+			return false;
+		}
+
+		foreach ($this->recipients as $val)
+		{
+			if (! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		foreach ($this->CCArray as $val)
+		{
+			if ($val !== '' && ! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		foreach ($this->BCCArray as $val)
+		{
+			if ($val !== '' && ! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		if (! $this->sendCommand('data'))
+		{
+			$this->SMTPEnd();
+
+			return false;
+		}
+
+		// perform dot transformation on any lines that begin with a dot
+		$this->sendData($this->headerStr . preg_replace('/^\./m', '..$1', $this->finalBody));
+
+		$this->sendData('.');
+		$reply = $this->getSMTPData();
+		$this->setErrorMessage($reply);
+
+		$this->SMTPEnd();
+
+		if (strpos($reply, '250') !== 0)
+		{
+				throw EmailException::forSMTPError($reply);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SMTP End
+	 *
+	 * Shortcut to send RSET or QUIT depending on keep-alive
+	 */
+	protected function SMTPEnd()
+	{
+		$this->sendCommand($this->SMTPKeepAlive ? 'reset' : 'quit');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SMTP Connect
+	 *
+	 * @return string
+	 */
+	protected function SMTPConnect()
+	{
+		if (is_resource($this->SMTPConnect))
+		{
+			return true;
+		}
+
+		$ssl = ($this->SMTPCrypto === 'ssl') ? 'ssl://' : '';
+
+		$this->SMTPConnect = fsockopen(
+				$ssl . $this->SMTPHost, $this->SMTPPort, $errno, $errstr, $this->SMTPTimeout
+		);
+
+		if (! is_resource($this->SMTPConnect))
+		{
+				throw EmailException::forSMTPError($errno . ' ' . $errstr);
+		}
+
+		stream_set_timeout($this->SMTPConnect, $this->SMTPTimeout);
+		$this->setErrorMessage($this->getSMTPData());
+
+		if ($this->SMTPCrypto === 'tls')
+		{
+			$this->sendCommand('hello');
+			$this->sendCommand('starttls');
+
+			$crypto = stream_socket_enable_crypto($this->SMTPConnect, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+
+			if ($crypto !== true)
+			{
+				throw EmailException::forSMTPError($this->getSMTPData());
+			}
+		}
+
+		return $this->sendCommand('hello');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send SMTP command
+	 *
+	 * @param string $cmd
+	 * @param string $data
+	 *
+	 * @return boolean
+	 */
+	protected function sendCommand($cmd, $data = '')
+	{
+		switch ($cmd)
+		{
+			case 'hello':
+				if ($this->SMTPAuth || $this->getEncoding() === '8bit')
+				{
+					$this->sendData('EHLO ' . $this->getHostname());
+				}
+				else
+				{
+					$this->sendData('HELO ' . $this->getHostname());
+				}
+
+				$resp = 250;
+				break;
+			case 'starttls':
+				$this->sendData('STARTTLS');
+				$resp = 220;
+				break;
+			case 'from':
+				$this->sendData('MAIL FROM:<' . $data . '>');
+				$resp = 250;
+				break;
+			case 'to':
+				if ($this->DSN)
+				{
+					$this->sendData('RCPT TO:<' . $data . '> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;' . $data);
+				}
+				else
+				{
+					$this->sendData('RCPT TO:<' . $data . '>');
+				}
+				$resp = 250;
+				break;
+			case 'data':
+				$this->sendData('DATA');
+				$resp = 354;
+				break;
+			case 'reset':
+				$this->sendData('RSET');
+				$resp = 250;
+				break;
+			case 'quit':
+				$this->sendData('QUIT');
+				$resp = 221;
+				break;
+		}
+
+		$reply = $this->getSMTPData();
+
+		$this->debugMessage[] = '<pre>' . $cmd . ': ' . $reply . '</pre>';
+
+		if ((int) static::substr($reply, 0, 3) !== $resp)
+		{
+				throw EmailException::forSMTPError($reply);
+		}
+
+		if ($cmd === 'quit')
+		{
+			fclose($this->SMTPConnect);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SMTP Authenticate
+	 *
+	 * @return boolean
+	 */
+	protected function SMTPAuthenticate()
+	{
+		if (! $this->SMTPAuth)
+		{
+			return true;
+		}
+
+		if ($this->SMTPUser === '' && $this->SMTPPass === '')
+		{
+				throw EmailException::forNoSMTPAuth();
+		}
+
+		$this->sendData('AUTH LOGIN');
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '503') === 0)    // Already authenticated
+		{
+			return true;
+		}
+		elseif (strpos($reply, '334') !== 0)
+		{
+				throw EmailException::forFailedSMTPLogin($reply);
+		}
+
+		$this->sendData(base64_encode($this->SMTPUser));
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '334') !== 0)
+		{
+				throw EmailException::forSMTPAuthUsername($reply);
+		}
+
+		$this->sendData(base64_encode($this->SMTPPass));
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '235') !== 0)
+		{
+				throw EmailException::forSMTPAuthPassword($reply);
+		}
+
+		if ($this->SMTPKeepAlive)
+		{
+			$this->SMTPAuth = false;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send SMTP data
+	 *
+	 * @param string $data
+	 *
+	 * @return boolean
+	 */
+	protected function sendData($data)
+	{
+		$data .= $this->newline;
+		for ($written = $timestamp = 0, $length = static::strlen($data); $written < $length; $written += $result)
+		{
+			if (($result = fwrite($this->SMTPConnect, static::substr($data, $written))) === false)
+			{
+				break;
+			}
+			// See https://bugs.php.net/bug.php?id=39598 and http://php.net/manual/en/function.fwrite.php#96951
+			elseif ($result === 0)
+			{
+				if ($timestamp === 0)
+				{
+					$timestamp = time();
+				}
+				elseif ($timestamp < (time() - $this->SMTPTimeout))
+				{
+					$result = false;
+					break;
+				}
+
+				usleep(250000);
+				continue;
+			}
+			else
+			{
+				$timestamp = 0;
+			}
+		}
+
+		if ($result === false)
+		{
+				throw EmailException::forSMTPDataFailure($data);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get SMTP data
+	 *
+	 * @return string
+	 */
+	protected function getSMTPData()
+	{
+		$data = '';
+
+		while ($str = fgets($this->SMTPConnect, 512))
+		{
+			$data .= $str;
+
+			if ($str[3] === ' ')
+			{
+				break;
+			}
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Hostname
+	 *
+	 * There are only two legal types of hostname - either a fully
+	 * qualified domain name (eg: "mail.example.com") or an IP literal
+	 * (eg: "[1.2.3.4]").
+	 *
+	 * @link https://tools.ietf.org/html/rfc5321#section-2.3.5
+	 * @link http://cbl.abuseat.org/namingproblems.html
+	 *
+	 * @return string
+	 */
+	protected function getHostname()
+	{
+		if (isset($_SERVER['SERVER_NAME']))
+		{
+			return $_SERVER['SERVER_NAME'];
+		}
+
+		return isset($_SERVER['SERVER_ADDR']) ? '[' . $_SERVER['SERVER_ADDR'] . ']' : '[127.0.0.1]';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Debug Message
+	 *
+	 * @param array $include List of raw data chunks to include in the output
+	 *                       Valid options are: 'headers', 'subject', 'body'
+	 *
+	 * @return string
+	 */
+	public function printDebugger($include = ['headers', 'subject', 'body'])
+	{
+		$msg = implode('', $this->debugMessage);
+
+		// Determine which parts of our raw data needs to be printed
+		$raw_data                      = '';
+		is_array($include) || $include = [$include];
+
+		in_array('headers', $include, true) && $raw_data  = htmlspecialchars($this->headerStr) . "\n";
+		in_array('subject', $include, true) && $raw_data .= htmlspecialchars($this->subject) . "\n";
+		in_array('body', $include, true) && $raw_data    .= htmlspecialchars($this->finalBody);
+
+		return $msg . ($raw_data === '' ? '' : '<pre>' . $raw_data . '</pre>');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set Message
+	 *
+	 * @param string $msg
+	 */
+	protected function setErrorMessage($msg)
+	{
+		$this->debugMessage[] = $msg . '<br />';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Mime Types
+	 *
+	 * @param string $ext
+	 *
+	 * @return string
+	 */
+	protected function mimeTypes($ext = '')
+	{
+		$mime = Mimes::guessTypeFromExtension(strtolower($ext));
+
+		return ! empty($mime) ? $mime : 'application/x-unknown-content-type';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get the Message ID
+	 *
+	 * @return string
+	 */
+	protected function getMessageID()
+	{
+		$from = str_replace(['>', '<'], '', $this->headers['Return-Path']);
+
+		return '<' . uniqid('', true) . strstr($from, '@') . '>';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Mail Encoding
+	 *
+	 * @return string
+	 */
+	protected function getEncoding()
+	{
+		in_array($this->encoding, $this->bitDepths) || $this->encoding = '8bit';
+
+		foreach ($this->baseCharsets as $charset)
+		{
+			if (strpos($this->charset, $charset) === 0)
+			{
+				$this->encoding = '7bit';
+				break;
+			}
+		}
+
+		return $this->encoding;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get content type (text/html/attachment)
+	 *
+	 * @return string
+	 */
+	protected function getContentType()
+	{
+		if ($this->mailType === 'html')
+		{
+			return empty($this->attachments) ? 'html' : 'html-attach';
+		}
+		elseif ($this->mailType === 'text' && ! empty($this->attachments))
+		{
+			return 'plain-attach';
+		}
+		else
+		{
+			return 'plain';
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Mime message
+	 *
+	 * @return string
+	 */
+	protected function getMimeMessage()
+	{
+		return 'This is a multi-part message in MIME format.' . $this->newline . 'Your email application may not support this format.';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Build alternative plain text message
+	 *
+	 * Provides the raw message for use in plain-text headers of
+	 * HTML-formatted emails.
+	 * If the user hasn't specified his own alternative message
+	 * it creates one by stripping the HTML
+	 *
+	 * @return string
+	 */
+	protected function getAltMessage()
+	{
+		if (! empty($this->altMessage))
+		{
+			return ($this->wordWrap) ? $this->wordWrap($this->altMessage, 76) : $this->altMessage;
+		}
+
+		$body = preg_match('/\<body.*?\>(.*)\<\/body\>/si', $this->body, $match) ? $match[1] : $this->body;
+		$body = str_replace("\t", '', preg_replace('#<!--(.*)--\>#', '', trim(strip_tags($body))));
+
+		for ($i = 20; $i >= 3; $i --)
+		{
+			$body = str_replace(str_repeat("\n", $i), "\n\n", $body);
+		}
+
+		// Reduce multiple spaces
+		$body = preg_replace('| +|', ' ', $body);
+
+		return ($this->wordWrap) ? $this->wordWrap($body, 76) : $body;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Destructor
+	 */
+	public function __destruct()
+	{
+		is_resource($this->SMTPConnect) && $this->sendCommand('quit');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Byte-safe strlen()
+	 *
+	 * @param string $str
+	 *
+	 * @return integer
+	 */
+	protected static function strlen($str)
+	{
+		return (static::$func_overload) ? mb_strlen($str, '8bit') : strlen($str);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Byte-safe substr()
+	 *
+	 * @param string       $str
+	 * @param integer      $start
+	 * @param integer|null $length
+	 *
+	 * @return string
+	 */
+	protected static function substr($str, $start, $length = null)
+	{
+		if (static::$func_overload)
+		{
+			return mb_substr($str, $start, $length, '8bit');
+		}
+
+		return isset($length) ? substr($str, $start, $length) : substr($str, $start);
+	}
+
+}
diff --git a/system/Email/Handlers/MailHandler.php b/system/Email/Handlers/MailHandler.php
new file mode 100644
index 0000000000..420de602cf
--- /dev/null
+++ b/system/Email/Handlers/MailHandler.php
@@ -0,0 +1,1634 @@
+<?php
+namespace CodeIgniter\Email\Handlers;
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014 - 2018, British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     EllisLab Dev Team
+ * @copyright  Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright  Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license    http://opensource.org/licenses/MIT    MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 1.0.0
+ * @filesource
+ */
+
+use CodeIgniter\Email\Email;
+use CodeIgniter\Email\Exceptions\EmailException;
+use Config\Mimes;
+use Psr\Log\LoggerAwareTrait;
+
+/**
+ * CodeIgniter Email Class
+ *
+ * Permits email to be sent using Mail, Sendmail, or SMTP.
+ *
+ * @package    CodeIgniter
+ * @subpackage Libraries
+ * @category   Libraries
+ * @author     EllisLab Dev Team
+ * @link       https://codeigniter.com/user_guide/libraries/email.html
+ */
+class MailHandler extends BaseHandler
+{
+
+	/**
+	 * Message format.
+	 *
+	 * @var string 'text' or 'html'
+	 */
+	public $mailType = 'text';
+
+	/**
+	 * Character set (default: utf-8)
+	 *
+	 * @var string
+	 */
+	public $charset = 'utf-8';
+
+	/**
+	 * Alternative message (for HTML messages only)
+	 *
+	 * @var string
+	 */
+	public $altMessage = '';
+
+	/**
+	 * Whether to validate e-mail addresses.
+	 *
+	 * @var boolean
+	 */
+	public $validate = true;
+
+	/**
+	 * X-Priority header value.
+	 *
+	 * @var integer 1-5
+	 */
+	public $priority = 3;            // Default priority (1 - 5)
+
+	/**
+	 * Newline character sequence.
+	 * Use "\r\n" to comply with RFC 822.
+	 *
+	 * @link http://www.ietf.org/rfc/rfc822.txt
+	 * @var  string "\r\n" or "\n"
+	 */
+	public $newline = "\n";            // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
+
+	/**
+	 * CRLF character sequence
+	 *
+	 * RFC 2045 specifies that for 'quoted-printable' encoding,
+	 * "\r\n" must be used. However, it appears that some servers
+	 * (even on the receiving end) don't handle it properly and
+	 * switching to "\n", while improper, is the only solution
+	 * that seems to work for all environments.
+	 *
+	 * @link http://www.ietf.org/rfc/rfc822.txt
+	 * @var  string
+	 */
+	public $CRLF = "\n";
+
+	/**
+	 * Whether to use Delivery Status Notification.
+	 *
+	 * @var boolean
+	 */
+	public $DSN = false;
+
+	/**
+	 * Whether to send multipart alternatives.
+	 * Yahoo! doesn't seem to like these.
+	 *
+	 * @var boolean
+	 */
+	public $sendMultipart = true;
+
+	/**
+	 * Whether to send messages to BCC recipients in batches.
+	 *
+	 * @var boolean
+	 */
+	public $BCCBatchMode = false;
+
+	/**
+	 * BCC Batch max number size.
+	 *
+	 * @see Email::$BCCBatchMode
+	 * @var integer
+	 */
+	public $BCCBatchSize = 200;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Subject header
+	 *
+	 * @var string
+	 */
+	protected $subject = '';
+
+	/**
+	 * Message body
+	 *
+	 * @var string
+	 */
+	protected $body = '';
+
+	/**
+	 * Final message body to be sent.
+	 *
+	 * @var string
+	 */
+	protected $finalBody = '';
+
+	/**
+	 * Final headers to send
+	 *
+	 * @var string
+	 */
+	protected $headerStr = '';
+
+	/**
+	 * SMTP Connection socket placeholder
+	 *
+	 * @var resource
+	 */
+	protected $SMTPConnect = '';
+
+	/**
+	 * Mail encoding
+	 *
+	 * @var string '8bit' or '7bit'
+	 */
+	protected $encoding = '8bit';
+
+	/**
+	 * Whether to send a Reply-To header
+	 *
+	 * @var boolean
+	 */
+	protected $replyToFlag = false;
+
+	/**
+	 * Debug messages
+	 *
+	 * @see Email::printDebugger()
+	 * @var array
+	 */
+	protected $debugMessage = [];
+
+	/**
+	 * Recipients
+	 *
+	 * @var array
+	 */
+	protected $recipients = [];
+
+	/**
+	 * CC Recipients
+	 *
+	 * @var array
+	 */
+	protected $CCArray = [];
+
+	/**
+	 * BCC Recipients
+	 *
+	 * @var array
+	 */
+	protected $BCCArray = [];
+
+	/**
+	 * Message headers
+	 *
+	 * @var array
+	 */
+	protected $headers = [];
+
+	/**
+	 * Attachment data
+	 *
+	 * @var array
+	 */
+	protected $attachments = [];
+
+	/**
+	 * Valid $protocol values
+	 *
+	 * @see Email::$protocol
+	 * @var array
+	 */
+	protected $protocols = [
+		'mail',
+		'sendmail',
+		'smtp',
+	];
+
+	/**
+	 * Base charsets
+	 *
+	 * Character sets valid for 7-bit encoding,
+	 * excluding language suffix.
+	 *
+	 * @var array
+	 */
+	protected $baseCharsets = [
+		'us-ascii',
+		'iso-2022-',
+	];
+
+	/**
+	 * Bit depths
+	 *
+	 * Valid mail encodings
+	 *
+	 * @see Email::$encoding
+	 * @var array
+	 */
+	protected $bitDepths = [
+		'7bit',
+		'8bit',
+	];
+
+	/**
+	 * $priority translations
+	 *
+	 * Actual values to send with the X-Priority header
+	 *
+	 * @var array
+	 */
+	protected $priorities = [
+		1 => '1 (Highest)',
+		2 => '2 (High)',
+		3 => '3 (Normal)',
+		4 => '4 (Low)',
+		5 => '5 (Lowest)',
+	];
+
+	/**
+	 * mbstring.func_overload flag
+	 *
+	 * @var boolean
+	 */
+	protected static $func_overload;
+
+	/**
+	 * Logger instance to record error messages and awarnings.
+	 *
+	 * @var \PSR\Log\LoggerInterface
+	 */
+	protected $logger;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor - Sets Email Preferences
+	 *
+	 * The constructor can be passed an array of config values
+	 *
+	 * @param array|null $config
+	 */
+	public function __construct($config = null)
+	{
+		$this->protocol = 'mail';
+		$this->initialize($config);
+
+		log_message('info', 'Email Class Initialized');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Initialize preferences
+	 *
+	 * @param array|\Config\Email $config
+	 *
+	 * @return Email
+	 */
+	public function initialize($config)
+	{
+		$this->clear();
+
+		if ($config instanceof \Config\Email)
+		{
+			$config = get_object_vars($config);
+		}
+
+		foreach (get_class_vars(get_class($this)) as $key => $value)
+		{
+			if (property_exists($this, $key) && isset($config[$key]))
+			{
+				$method = 'set' . ucfirst($key);
+
+				if (method_exists($this, $method))
+				{
+					$this->$method($config[$key]);
+				}
+			}
+		}
+
+		$this->charset  = strtoupper($this->charset);
+		$this->SMTPAuth = isset($this->SMTPUser[0], $this->SMTPPass[0]);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Initialize the Email Data
+	 *
+	 * @param boolean $clearAttachments
+	 *
+	 * @return Email
+	 */
+	public function clear($clearAttachments = false)
+	{
+		$this->subject      = '';
+		$this->body         = '';
+		$this->finalBody    = '';
+		$this->headerStr    = '';
+		$this->replyToFlag  = false;
+		$this->recipients   = [];
+		$this->CCArray      = [];
+		$this->BCCArray     = [];
+		$this->headers      = [];
+		$this->debugMessage = [];
+
+		//      $this->setHeader('Date', $this->setDate());
+
+		if ($clearAttachments !== false)
+		{
+			$this->attachments = [];
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Build final headers
+	 */
+	protected function buildHeaders()
+	{
+		$this->setHeader('User-Agent', $this->userAgent);
+		$this->setHeader('X-Sender', $this->cleanEmail($this->headers['From']));
+		$this->setHeader('X-Mailer', $this->userAgent);
+		$this->setHeader('X-Priority', $this->priorities[$this->priority]);
+		$this->setHeader('Message-ID', $this->getMessageID());
+		$this->setHeader('Mime-Version', '1.0');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Write Headers as a string
+	 */
+	protected function writeHeaders()
+	{
+		if ($this->protocol === 'mail')
+		{
+			if (isset($this->headers['Subject']))
+			{
+				$this->subject = $this->headers['Subject'];
+				unset($this->headers['Subject']);
+			}
+		}
+
+		reset($this->headers);
+		$this->headerStr = '';
+
+		foreach ($this->headers as $key => $val)
+		{
+			$val = trim($val);
+
+			if ($val !== '')
+			{
+				$this->headerStr .= $key . ': ' . $val . $this->newline;
+			}
+		}
+
+		if ($this->getProtocol() === 'mail')
+		{
+			$this->headerStr = rtrim($this->headerStr);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Build Final Body and attachments
+	 */
+	protected function buildMessage()
+	{
+		if ($this->wordWrap === true && $this->mailType !== 'html')
+		{
+			$this->body = $this->wordWrap($this->body);
+		}
+
+		$this->writeHeaders();
+
+		$hdr  = ($this->getProtocol() === 'mail') ? $this->newline : '';
+		$body = '';
+
+		switch ($this->getContentType())
+		{
+			case 'plain':
+
+				$hdr .= 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding();
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+					$this->finalBody  = $this->body;
+				}
+				else
+				{
+					$this->finalBody = $hdr . $this->newline . $this->newline . $this->body;
+				}
+
+				return;
+
+			case 'html':
+
+				if ($this->sendMultipart === false)
+				{
+					$hdr .= 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: quoted-printable';
+				}
+				else
+				{
+					$boundary = uniqid('B_ALT_', true);
+					$hdr     .= 'Content-Type: multipart/alternative; boundary="' . $boundary . '"';
+
+					$body .= $this->getMimeMessage() . $this->newline . $this->newline
+							. '--' . $boundary . $this->newline
+							. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+							. $this->getAltMessage() . $this->newline . $this->newline
+							. '--' . $boundary . $this->newline
+							. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline;
+				}
+
+				$this->finalBody = $body . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline;
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+				else
+				{
+					$this->finalBody = $hdr . $this->newline . $this->newline . $this->finalBody;
+				}
+
+				if ($this->sendMultipart !== false)
+				{
+					$this->finalBody .= '--' . $boundary . '--';
+				}
+
+				return;
+
+			case 'plain-attach':
+
+				$boundary = uniqid('B_ATC_', true);
+				$hdr     .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"';
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+
+				$body .= $this->getMimeMessage() . $this->newline
+						. $this->newline
+						. '--' . $boundary . $this->newline
+						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline
+						. $this->newline
+						. $this->body . $this->newline . $this->newline;
+
+				$this->appendAttachments($body, $boundary);
+
+				break;
+			case 'html-attach':
+
+				$alt_boundary  = uniqid('B_ALT_', true);
+				$last_boundary = null;
+
+				if ($this->attachmentsHaveMultipart('mixed'))
+				{
+					$atc_boundary  = uniqid('B_ATC_', true);
+					$hdr          .= 'Content-Type: multipart/mixed; boundary="' . $atc_boundary . '"';
+					$last_boundary = $atc_boundary;
+				}
+
+				if ($this->attachmentsHaveMultipart('related'))
+				{
+					$rel_boundary        = uniqid('B_REL_', true);
+					$rel_boundary_header = 'Content-Type: multipart/related; boundary="' . $rel_boundary . '"';
+
+					if (isset($last_boundary))
+					{
+						$body .= '--' . $last_boundary . $this->newline . $rel_boundary_header;
+					}
+					else
+					{
+						$hdr .= $rel_boundary_header;
+					}
+
+					$last_boundary = $rel_boundary;
+				}
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+
+				static::strlen($body) && $body .= $this->newline . $this->newline;
+				$body                          .= $this->getMimeMessage() . $this->newline . $this->newline
+						. '--' . $last_boundary . $this->newline
+						. 'Content-Type: multipart/alternative; boundary="' . $alt_boundary . '"' . $this->newline . $this->newline
+						. '--' . $alt_boundary . $this->newline
+						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+						. $this->getAltMessage() . $this->newline . $this->newline
+						. '--' . $alt_boundary . $this->newline
+						. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline
+						. $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
+						. '--' . $alt_boundary . '--' . $this->newline . $this->newline;
+
+				if (! empty($rel_boundary))
+				{
+					$body .= $this->newline . $this->newline;
+					$this->appendAttachments($body, $rel_boundary, 'related');
+				}
+
+				// multipart/mixed attachments
+				if (! empty($atc_boundary))
+				{
+					$body .= $this->newline . $this->newline;
+					$this->appendAttachments($body, $atc_boundary, 'mixed');
+				}
+
+				break;
+		}
+
+		$this->finalBody = ($this->getProtocol() === 'mail') ? $body : $hdr . $this->newline . $this->newline . $body;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepares attachment string
+	 *
+	 * @param string      &$body     Message body to append to
+	 * @param string      $boundary  Multipart boundary
+	 * @param string|null $multipart When provided, only attachments of this type will be processed
+	 *
+	 * @return string
+	 */
+	protected function appendAttachments(&$body, $boundary, $multipart = null)
+	{
+		for ($i = 0, $c = count($this->attachments); $i < $c; $i ++)
+		{
+			if (isset($multipart) && $this->attachments[$i]['multipart'] !== $multipart)
+			{
+				continue;
+			}
+
+			$name = isset($this->attachments[$i]['name'][1]) ? $this->attachments[$i]['name'][1] : basename($this->attachments[$i]['name'][0]);
+
+			$body .= '--' . $boundary . $this->newline
+					. 'Content-Type: ' . $this->attachments[$i]['type'] . '; name="' . $name . '"' . $this->newline
+					. 'Content-Disposition: ' . $this->attachments[$i]['disposition'] . ';' . $this->newline
+					. 'Content-Transfer-Encoding: base64' . $this->newline
+					. (empty($this->attachments[$i]['cid']) ? '' : 'Content-ID: <' . $this->attachments[$i]['cid'] . '>' . $this->newline)
+					. $this->newline
+					. $this->attachments[$i]['content'] . $this->newline;
+		}
+
+		// $name won't be set if no attachments were appended,
+		// and therefore a boundary wouldn't be necessary
+		empty($name) || $body .= '--' . $boundary . '--';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prep Quoted Printable
+	 *
+	 * Prepares string for Quoted-Printable Content-Transfer-Encoding
+	 * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	protected function prepQuotedPrintable($str)
+	{
+		// ASCII code numbers for "safe" characters that can always be
+		// used literally, without encoding, as described in RFC 2049.
+		// http://www.ietf.org/rfc/rfc2049.txt
+		static $ascii_safe_chars = [
+			// ' (  )   +   ,   -   .   /   :   =   ?
+			39,
+			40,
+			41,
+			43,
+			44,
+			45,
+			46,
+			47,
+			58,
+			61,
+			63,
+			// numbers
+			48,
+			49,
+			50,
+			51,
+			52,
+			53,
+			54,
+			55,
+			56,
+			57,
+			// upper-case letters
+			65,
+			66,
+			67,
+			68,
+			69,
+			70,
+			71,
+			72,
+			73,
+			74,
+			75,
+			76,
+			77,
+			78,
+			79,
+			80,
+			81,
+			82,
+			83,
+			84,
+			85,
+			86,
+			87,
+			88,
+			89,
+			90,
+			// lower-case letters
+			97,
+			98,
+			99,
+			100,
+			101,
+			102,
+			103,
+			104,
+			105,
+			106,
+			107,
+			108,
+			109,
+			110,
+			111,
+			112,
+			113,
+			114,
+			115,
+			116,
+			117,
+			118,
+			119,
+			120,
+			121,
+			122,
+		];
+
+		// We are intentionally wrapping so mail servers will encode characters
+		// properly and MUAs will behave, so {unwrap} must go!
+		$str = str_replace(['{unwrap}', '{/unwrap}'], '', $str);
+
+		// RFC 2045 specifies CRLF as "\r\n".
+		// However, many developers choose to override that and violate
+		// the RFC rules due to (apparently) a bug in MS Exchange,
+		// which only works with "\n".
+		if ($this->CRLF === "\r\n")
+		{
+			return quoted_printable_encode($str);
+		}
+
+		// Reduce multiple spaces & remove nulls
+		$str = preg_replace(['| +|', '/\x00+/'], [' ', ''], $str);
+
+		// Standardize newlines
+		if (strpos($str, "\r") !== false)
+		{
+			$str = str_replace(["\r\n", "\r"], "\n", $str);
+		}
+
+		$escape = '=';
+		$output = '';
+
+		foreach (explode("\n", $str) as $line)
+		{
+			$length = static::strlen($line);
+			$temp   = '';
+
+			// Loop through each character in the line to add soft-wrap
+			// characters at the end of a line " =\r\n" and add the newly
+			// processed line(s) to the output (see comment on $crlf class property)
+			for ($i = 0; $i < $length; $i ++)
+			{
+				// Grab the next character
+				$char  = $line[$i];
+				$ascii = ord($char);
+
+				// Convert spaces and tabs but only if it's the end of the line
+				if ($ascii === 32 || $ascii === 9)
+				{
+					if ($i === ($length - 1))
+					{
+						$char = $escape . sprintf('%02s', dechex($ascii));
+					}
+				}
+				// DO NOT move this below the $ascii_safe_chars line!
+				//
+				// = (equals) signs are allowed by RFC2049, but must be encoded
+				// as they are the encoding delimiter!
+				elseif ($ascii === 61)
+				{
+					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
+				}
+				elseif (! in_array($ascii, $ascii_safe_chars, true))
+				{
+					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));
+				}
+
+				// If we're at the character limit, add the line to the output,
+				// reset our temp variable, and keep on chuggin'
+				if ((static::strlen($temp) + static::strlen($char)) >= 76)
+				{
+					$output .= $temp . $escape . $this->CRLF;
+					$temp    = '';
+				}
+
+				// Add the character to our temporary line
+				$temp .= $char;
+			}
+
+			// Add our completed line to the output
+			$output .= $temp . $this->CRLF;
+		}
+
+		// get rid of extra CRLF tacked onto the end
+		return static::substr($output, 0, static::strlen($this->CRLF) * -1);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prep Q Encoding
+	 *
+	 * Performs "Q Encoding" on a string for use in email headers.
+	 * It's related but not identical to quoted-printable, so it has its
+	 * own method.
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	protected function prepQEncoding($str)
+	{
+		$str = str_replace(["\r", "\n"], '', $str);
+
+		if ($this->charset === 'UTF-8')
+		{
+			// Note: We used to have mb_encode_mimeheader() as the first choice
+			//       here, but it turned out to be buggy and unreliable. DO NOT
+			//       re-add it! -- Narf
+			if (extension_loaded('iconv'))
+			{
+				$output = @iconv_mime_encode(
+								'', $str, [
+									'scheme'           => 'Q',
+									'line-length'      => 76,
+									'input-charset'    => $this->charset,
+									'output-charset'   => $this->charset,
+									'line-break-chars' => $this->CRLF,
+								]);
+
+				// There are reports that iconv_mime_encode() might fail and return FALSE
+				if ($output !== false)
+				{
+					// iconv_mime_encode() will always put a header field name.
+					// We've passed it an empty one, but it still prepends our
+					// encoded string with ': ', so we need to strip it.
+					return static::substr($output, 2);
+				}
+
+				$chars = iconv_strlen($str, 'UTF-8');
+			}
+			elseif (extension_loaded('mbstring'))
+			{
+				$chars = mb_strlen($str, 'UTF-8');
+			}
+		}
+
+		// We might already have this set for UTF-8
+		isset($chars) || $chars = static::strlen($str);
+
+		$output = '=?' . $this->charset . '?Q?';
+		for ($i = 0, $length = static::strlen($output); $i < $chars; $i ++)
+		{
+			$chr = ($this->charset === 'UTF-8' && ICONV_ENABLED === true) ? '=' . implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2)) : '=' . strtoupper(bin2hex($str[$i]));
+
+			// RFC 2045 sets a limit of 76 characters per line.
+			// We'll append ?= to the end of each line though.
+			if ($length + ($l = static::strlen($chr)) > 74)
+			{
+				$output .= '?=' . $this->CRLF // EOL
+						. ' =?' . $this->charset . '?Q?' . $chr; // New line
+				$length  = 6 + static::strlen($this->charset) + $l; // Reset the length for the new line
+			}
+			else
+			{
+				$output .= $chr;
+				$length += $l;
+			}
+		}
+
+		// End the header
+		return $output . '?=';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send Email
+	 *
+	 * @param boolean $autoClear
+	 *
+	 * @return boolean
+	 */
+	public function send(Email $email, bool $autoClear = true, bool $reallySend = true)
+	{
+		if (! isset($this->headers['From']) && ! empty($this->fromEmail))
+		{
+			$this->setFrom($this->fromEmail, $this->fromName);
+		}
+
+		if (! isset($this->headers['From']))
+		{
+				throw EmailException::forNoFrom();
+		}
+
+		if ($this->replyToFlag === false)
+		{
+			$this->setReplyTo($this->headers['From']);
+		}
+
+		if (empty($this->recipients) && ! isset($this->headers['To']) && empty($this->BCCArray) && ! isset($this->headers['Bcc']) && ! isset($this->headers['Cc'])
+		)
+		{
+				throw EmailException::forNoRecipients();
+		}
+
+		$this->buildHeaders();
+
+		if ($this->BCCBatchMode && count($this->BCCArray) > $this->BCCBatchSize)
+		{
+			$this->batchBCCSend();
+
+			if ($autoClear)
+			{
+				$this->clear();
+			}
+
+			return true;
+		}
+
+		$this->buildMessage();
+		$result = $this->spoolEmail();
+
+		if ($result && $autoClear)
+		{
+			$this->clear();
+		}
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Batch Bcc Send. Sends groups of BCCs in batches
+	 */
+	public function batchBCCSend()
+	{
+		$float = $this->BCCBatchSize - 1;
+		$set   = '';
+		$chunk = [];
+
+		for ($i = 0, $c = count($this->BCCArray); $i < $c; $i ++)
+		{
+			if (isset($this->BCCArray[$i]))
+			{
+				$set .= ', ' . $this->BCCArray[$i];
+			}
+
+			if ($i === $float)
+			{
+				$chunk[] = static::substr($set, 1);
+				$float  += $this->BCCBatchSize;
+				$set     = '';
+			}
+
+			if ($i === $c - 1)
+			{
+				$chunk[] = static::substr($set, 1);
+			}
+		}
+
+		for ($i = 0, $c = count($chunk); $i < $c; $i ++)
+		{
+			unset($this->headers['Bcc']);
+
+			$bcc = $this->cleanEmail($this->stringToArray($chunk[$i]));
+
+			if ($this->protocol !== 'smtp')
+			{
+				$this->setHeader('Bcc', implode(', ', $bcc));
+			}
+			else
+			{
+				$this->BCCArray = $bcc;
+			}
+
+			$this->buildMessage();
+			$this->spoolEmail();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Unwrap special elements
+	 */
+	protected function unwrapSpecials()
+	{
+		$this->finalBody = preg_replace_callback(
+				'/\{unwrap\}(.*?)\{\/unwrap\}/si', [
+					$this,
+					'removeNLCallback',
+				], $this->finalBody
+		);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Strip line-breaks via callback
+	 *
+	 * @param string $matches
+	 *
+	 * @return string
+	 */
+	protected function removeNLCallback($matches)
+	{
+		if (strpos($matches[1], "\r") !== false || strpos($matches[1], "\n") !== false)
+		{
+			$matches[1] = str_replace(["\r\n", "\r", "\n"], '', $matches[1]);
+		}
+
+		return $matches[1];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Spool mail to the mail server
+	 *
+	 * @return boolean
+	 */
+	protected function spoolEmail()
+	{
+		$this->unwrapSpecials();
+
+		$protocol = $this->getProtocol();
+		$method   = 'sendWith' . ucfirst($protocol);
+		try
+		{
+			$success = $this->$method();
+		}
+		catch (\ErrorException $e)
+		{
+			$success = false;
+			$this->logger->error('Email: ' . $method . ' throwed ' . $e->getMessage());
+		}
+
+		if (! $success)
+		{
+				throw EmailException::forSendFailure($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol));
+		}
+
+		$this->setErrorMessage(lang('Email.sent', [$protocol]));
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Validate email for shell
+	 *
+	 * Applies stricter, shell-safe validation to email addresses.
+	 * Introduced to prevent RCE via sendmail's -f option.
+	 *
+	 * @see     https://github.com/codeigniter4/CodeIgniter/issues/4963
+	 * @see     https://gist.github.com/Zenexer/40d02da5e07f151adeaeeaa11af9ab36
+	 * @license https://creativecommons.org/publicdomain/zero/1.0/    CC0 1.0, Public Domain
+	 *
+	 * Credits for the base concept go to Paul Buonopane <paul@namepros.com>
+	 *
+	 * @param string &$email
+	 *
+	 * @return boolean
+	 */
+	protected function validateEmailForShell(&$email)
+	{
+		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
+		{
+			$email = static::substr($email, 0, ++ $atpos) . idn_to_ascii(
+							static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46
+			);
+		}
+
+		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send using mail()
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithMail()
+	{
+		if (is_array($this->recipients))
+		{
+			$this->recipients = implode(', ', $this->recipients);
+		}
+
+		// _validate_email_for_shell() below accepts by reference,
+		// so this needs to be assigned to a variable
+		$from = $this->cleanEmail($this->headers['Return-Path']);
+
+		if (! $this->validateEmailForShell($from))
+		{
+			return mail($this->recipients, $this->subject, $this->finalBody, $this->headerStr);
+		}
+
+		// most documentation of sendmail using the "-f" flag lacks a space after it, however
+		// we've encountered servers that seem to require it to be in place.
+		return mail($this->recipients, $this->subject, $this->finalBody, $this->headerStr, '-f ' . $from);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send using Sendmail
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithSendmail()
+	{
+		// _validate_email_for_shell() below accepts by reference,
+		// so this needs to be assigned to a variable
+		$from = $this->cleanEmail($this->headers['From']);
+		if ($this->validateEmailForShell($from))
+		{
+			$from = '-f ' . $from;
+		}
+		else
+		{
+			$from = '';
+		}
+
+		// is popen() enabled?
+		if (! function_usable('popen') || false === ($fp = @popen($this->mailPath . ' -oi ' . $from . ' -t', 'w')))
+		{
+			// server probably has popen disabled, so nothing we can do to get a verbose error.
+			return false;
+		}
+
+		fputs($fp, $this->headerStr);
+		fputs($fp, $this->finalBody);
+
+		$status = pclose($fp);
+
+		if ($status !== 0)
+		{
+				throw EmailException::forNosocket($status);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send using SMTP
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithSmtp()
+	{
+		if ($this->SMTPHost === '')
+		{
+				throw EmailException::forNoHostname();
+		}
+
+		if (! $this->SMTPConnect() || ! $this->SMTPAuthenticate())
+		{
+			return false;
+		}
+
+		if (! $this->sendCommand('from', $this->cleanEmail($this->headers['From'])))
+		{
+			$this->SMTPEnd();
+
+			return false;
+		}
+
+		foreach ($this->recipients as $val)
+		{
+			if (! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		foreach ($this->CCArray as $val)
+		{
+			if ($val !== '' && ! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		foreach ($this->BCCArray as $val)
+		{
+			if ($val !== '' && ! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		if (! $this->sendCommand('data'))
+		{
+			$this->SMTPEnd();
+
+			return false;
+		}
+
+		// perform dot transformation on any lines that begin with a dot
+		$this->sendData($this->headerStr . preg_replace('/^\./m', '..$1', $this->finalBody));
+
+		$this->sendData('.');
+		$reply = $this->getSMTPData();
+		$this->setErrorMessage($reply);
+
+		$this->SMTPEnd();
+
+		if (strpos($reply, '250') !== 0)
+		{
+				throw EmailException::forSMTPError($reply);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SMTP End
+	 *
+	 * Shortcut to send RSET or QUIT depending on keep-alive
+	 */
+	protected function SMTPEnd()
+	{
+		$this->sendCommand($this->SMTPKeepAlive ? 'reset' : 'quit');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SMTP Connect
+	 *
+	 * @return string
+	 */
+	protected function SMTPConnect()
+	{
+		if (is_resource($this->SMTPConnect))
+		{
+			return true;
+		}
+
+		$ssl = ($this->SMTPCrypto === 'ssl') ? 'ssl://' : '';
+
+		$this->SMTPConnect = fsockopen(
+				$ssl . $this->SMTPHost, $this->SMTPPort, $errno, $errstr, $this->SMTPTimeout
+		);
+
+		if (! is_resource($this->SMTPConnect))
+		{
+				throw EmailException::forSMTPError($errno . ' ' . $errstr);
+		}
+
+		stream_set_timeout($this->SMTPConnect, $this->SMTPTimeout);
+		$this->setErrorMessage($this->getSMTPData());
+
+		if ($this->SMTPCrypto === 'tls')
+		{
+			$this->sendCommand('hello');
+			$this->sendCommand('starttls');
+
+			$crypto = stream_socket_enable_crypto($this->SMTPConnect, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+
+			if ($crypto !== true)
+			{
+				throw EmailException::forSMTPError($this->getSMTPData());
+			}
+		}
+
+		return $this->sendCommand('hello');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send SMTP command
+	 *
+	 * @param string $cmd
+	 * @param string $data
+	 *
+	 * @return boolean
+	 */
+	protected function sendCommand($cmd, $data = '')
+	{
+		switch ($cmd)
+		{
+			case 'hello':
+				if ($this->SMTPAuth || $this->getEncoding() === '8bit')
+				{
+					$this->sendData('EHLO ' . $this->getHostname());
+				}
+				else
+				{
+					$this->sendData('HELO ' . $this->getHostname());
+				}
+
+				$resp = 250;
+				break;
+			case 'starttls':
+				$this->sendData('STARTTLS');
+				$resp = 220;
+				break;
+			case 'from':
+				$this->sendData('MAIL FROM:<' . $data . '>');
+				$resp = 250;
+				break;
+			case 'to':
+				if ($this->DSN)
+				{
+					$this->sendData('RCPT TO:<' . $data . '> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;' . $data);
+				}
+				else
+				{
+					$this->sendData('RCPT TO:<' . $data . '>');
+				}
+				$resp = 250;
+				break;
+			case 'data':
+				$this->sendData('DATA');
+				$resp = 354;
+				break;
+			case 'reset':
+				$this->sendData('RSET');
+				$resp = 250;
+				break;
+			case 'quit':
+				$this->sendData('QUIT');
+				$resp = 221;
+				break;
+		}
+
+		$reply = $this->getSMTPData();
+
+		$this->debugMessage[] = '<pre>' . $cmd . ': ' . $reply . '</pre>';
+
+		if ((int) static::substr($reply, 0, 3) !== $resp)
+		{
+				throw EmailException::forSMTPError($reply);
+		}
+
+		if ($cmd === 'quit')
+		{
+			fclose($this->SMTPConnect);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SMTP Authenticate
+	 *
+	 * @return boolean
+	 */
+	protected function SMTPAuthenticate()
+	{
+		if (! $this->SMTPAuth)
+		{
+			return true;
+		}
+
+		if ($this->SMTPUser === '' && $this->SMTPPass === '')
+		{
+				throw EmailException::forNoSMTPAuth();
+		}
+
+		$this->sendData('AUTH LOGIN');
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '503') === 0)    // Already authenticated
+		{
+			return true;
+		}
+		elseif (strpos($reply, '334') !== 0)
+		{
+				throw EmailException::forFailedSMTPLogin($reply);
+		}
+
+		$this->sendData(base64_encode($this->SMTPUser));
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '334') !== 0)
+		{
+				throw EmailException::forSMTPAuthUsername($reply);
+		}
+
+		$this->sendData(base64_encode($this->SMTPPass));
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '235') !== 0)
+		{
+				throw EmailException::forSMTPAuthPassword($reply);
+		}
+
+		if ($this->SMTPKeepAlive)
+		{
+			$this->SMTPAuth = false;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send SMTP data
+	 *
+	 * @param string $data
+	 *
+	 * @return boolean
+	 */
+	protected function sendData($data)
+	{
+		$data .= $this->newline;
+		for ($written = $timestamp = 0, $length = static::strlen($data); $written < $length; $written += $result)
+		{
+			if (($result = fwrite($this->SMTPConnect, static::substr($data, $written))) === false)
+			{
+				break;
+			}
+			// See https://bugs.php.net/bug.php?id=39598 and http://php.net/manual/en/function.fwrite.php#96951
+			elseif ($result === 0)
+			{
+				if ($timestamp === 0)
+				{
+					$timestamp = time();
+				}
+				elseif ($timestamp < (time() - $this->SMTPTimeout))
+				{
+					$result = false;
+					break;
+				}
+
+				usleep(250000);
+				continue;
+			}
+			else
+			{
+				$timestamp = 0;
+			}
+		}
+
+		if ($result === false)
+		{
+				throw EmailException::forSMTPDataFailure($data);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get SMTP data
+	 *
+	 * @return string
+	 */
+	protected function getSMTPData()
+	{
+		$data = '';
+
+		while ($str = fgets($this->SMTPConnect, 512))
+		{
+			$data .= $str;
+
+			if ($str[3] === ' ')
+			{
+				break;
+			}
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Hostname
+	 *
+	 * There are only two legal types of hostname - either a fully
+	 * qualified domain name (eg: "mail.example.com") or an IP literal
+	 * (eg: "[1.2.3.4]").
+	 *
+	 * @link https://tools.ietf.org/html/rfc5321#section-2.3.5
+	 * @link http://cbl.abuseat.org/namingproblems.html
+	 *
+	 * @return string
+	 */
+	protected function getHostname()
+	{
+		if (isset($_SERVER['SERVER_NAME']))
+		{
+			return $_SERVER['SERVER_NAME'];
+		}
+
+		return isset($_SERVER['SERVER_ADDR']) ? '[' . $_SERVER['SERVER_ADDR'] . ']' : '[127.0.0.1]';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Debug Message
+	 *
+	 * @param array $include List of raw data chunks to include in the output
+	 *                       Valid options are: 'headers', 'subject', 'body'
+	 *
+	 * @return string
+	 */
+	public function printDebugger($include = ['headers', 'subject', 'body'])
+	{
+		$msg = implode('', $this->debugMessage);
+
+		// Determine which parts of our raw data needs to be printed
+		$raw_data                      = '';
+		is_array($include) || $include = [$include];
+
+		in_array('headers', $include, true) && $raw_data  = htmlspecialchars($this->headerStr) . "\n";
+		in_array('subject', $include, true) && $raw_data .= htmlspecialchars($this->subject) . "\n";
+		in_array('body', $include, true) && $raw_data    .= htmlspecialchars($this->finalBody);
+
+		return $msg . ($raw_data === '' ? '' : '<pre>' . $raw_data . '</pre>');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set Message
+	 *
+	 * @param string $msg
+	 */
+	protected function setErrorMessage($msg)
+	{
+		$this->debugMessage[] = $msg . '<br />';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Mime Types
+	 *
+	 * @param string $ext
+	 *
+	 * @return string
+	 */
+	protected function mimeTypes($ext = '')
+	{
+		$mime = Mimes::guessTypeFromExtension(strtolower($ext));
+
+		return ! empty($mime) ? $mime : 'application/x-unknown-content-type';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Destructor
+	 */
+	public function __destruct()
+	{
+		is_resource($this->SMTPConnect) && $this->sendCommand('quit');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Byte-safe strlen()
+	 *
+	 * @param string $str
+	 *
+	 * @return integer
+	 */
+	protected static function strlen($str)
+	{
+		return (static::$func_overload) ? mb_strlen($str, '8bit') : strlen($str);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Byte-safe substr()
+	 *
+	 * @param string       $str
+	 * @param integer      $start
+	 * @param integer|null $length
+	 *
+	 * @return string
+	 */
+	protected static function substr($str, $start, $length = null)
+	{
+		if (static::$func_overload)
+		{
+			return mb_substr($str, $start, $length, '8bit');
+		}
+
+		return isset($length) ? substr($str, $start, $length) : substr($str, $start);
+	}
+
+}
diff --git a/system/Email/Handlers/SMTPHandler.php b/system/Email/Handlers/SMTPHandler.php
new file mode 100644
index 0000000000..74569a1ba0
--- /dev/null
+++ b/system/Email/Handlers/SMTPHandler.php
@@ -0,0 +1,1638 @@
+<?php
+namespace CodeIgniter\Email\Handlers;
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014 - 2018, British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     EllisLab Dev Team
+ * @copyright  Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright  Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license    http://opensource.org/licenses/MIT    MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 1.0.0
+ * @filesource
+ */
+
+use CodeIgniter\Email\Email;
+use CodeIgniter\Email\Exceptions\EmailException;
+use Config\Mimes;
+use Psr\Log\LoggerAwareTrait;
+
+/**
+ * CodeIgniter Email Class
+ *
+ * Permits email to be sent using Mail, Sendmail, or SMTP.
+ *
+ * @package    CodeIgniter
+ * @subpackage Libraries
+ * @category   Libraries
+ * @author     EllisLab Dev Team
+ * @link       https://codeigniter.com/user_guide/libraries/email.html
+ */
+class SMTPHandler extends BaseHandler
+{
+
+	/**
+	 * Message format.
+	 *
+	 * @var string 'text' or 'html'
+	 */
+	public $mailType = 'text';
+
+	/**
+	 * Character set (default: utf-8)
+	 *
+	 * @var string
+	 */
+	public $charset = 'utf-8';
+
+	/**
+	 * Alternative message (for HTML messages only)
+	 *
+	 * @var string
+	 */
+	public $altMessage = '';
+
+	/**
+	 * Whether to validate e-mail addresses.
+	 *
+	 * @var boolean
+	 */
+	public $validate = true;
+
+	/**
+	 * X-Priority header value.
+	 *
+	 * @var integer 1-5
+	 */
+	public $priority = 3;            // Default priority (1 - 5)
+
+	/**
+	 * Newline character sequence.
+	 * Use "\r\n" to comply with RFC 822.
+	 *
+	 * @link http://www.ietf.org/rfc/rfc822.txt
+	 * @var  string "\r\n" or "\n"
+	 */
+	public $newline = "\n";            // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
+
+	/**
+	 * CRLF character sequence
+	 *
+	 * RFC 2045 specifies that for 'quoted-printable' encoding,
+	 * "\r\n" must be used. However, it appears that some servers
+	 * (even on the receiving end) don't handle it properly and
+	 * switching to "\n", while improper, is the only solution
+	 * that seems to work for all environments.
+	 *
+	 * @link http://www.ietf.org/rfc/rfc822.txt
+	 * @var  string
+	 */
+	public $CRLF = "\n";
+
+	/**
+	 * Whether to use Delivery Status Notification.
+	 *
+	 * @var boolean
+	 */
+	public $DSN = false;
+
+	/**
+	 * Whether to send multipart alternatives.
+	 * Yahoo! doesn't seem to like these.
+	 *
+	 * @var boolean
+	 */
+	public $sendMultipart = true;
+
+	/**
+	 * Whether to send messages to BCC recipients in batches.
+	 *
+	 * @var boolean
+	 */
+	public $BCCBatchMode = false;
+
+	/**
+	 * BCC Batch max number size.
+	 *
+	 * @see Email::$BCCBatchMode
+	 * @var integer
+	 */
+	public $BCCBatchSize = 200;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Subject header
+	 *
+	 * @var string
+	 */
+	protected $subject = '';
+
+	/**
+	 * Message body
+	 *
+	 * @var string
+	 */
+	protected $body = '';
+
+	/**
+	 * Final message body to be sent.
+	 *
+	 * @var string
+	 */
+	protected $finalBody = '';
+
+	/**
+	 * Final headers to send
+	 *
+	 * @var string
+	 */
+	protected $headerStr = '';
+
+	/**
+	 * SMTP Connection socket placeholder
+	 *
+	 * @var resource
+	 */
+	protected $SMTPConnect = '';
+
+	/**
+	 * Mail encoding
+	 *
+	 * @var string '8bit' or '7bit'
+	 */
+	protected $encoding = '8bit';
+
+	/**
+	 * Whether to send a Reply-To header
+	 *
+	 * @var boolean
+	 */
+	protected $replyToFlag = false;
+
+	/**
+	 * Debug messages
+	 *
+	 * @see Email::printDebugger()
+	 * @var array
+	 */
+	protected $debugMessage = [];
+
+	/**
+	 * Recipients
+	 *
+	 * @var array
+	 */
+	protected $recipients = [];
+
+	/**
+	 * CC Recipients
+	 *
+	 * @var array
+	 */
+	protected $CCArray = [];
+
+	/**
+	 * BCC Recipients
+	 *
+	 * @var array
+	 */
+	protected $BCCArray = [];
+
+	/**
+	 * Message headers
+	 *
+	 * @var array
+	 */
+	protected $headers = [];
+
+	/**
+	 * Attachment data
+	 *
+	 * @var array
+	 */
+	protected $attachments = [];
+
+	/**
+	 * Valid $protocol values
+	 *
+	 * @see Email::$protocol
+	 * @var array
+	 */
+	protected $protocols = [
+		'mail',
+		'sendmail',
+		'smtp',
+	];
+
+	/**
+	 * Base charsets
+	 *
+	 * Character sets valid for 7-bit encoding,
+	 * excluding language suffix.
+	 *
+	 * @var array
+	 */
+	protected $baseCharsets = [
+		'us-ascii',
+		'iso-2022-',
+	];
+
+	/**
+	 * Bit depths
+	 *
+	 * Valid mail encodings
+	 *
+	 * @see Email::$encoding
+	 * @var array
+	 */
+	protected $bitDepths = [
+		'7bit',
+		'8bit',
+	];
+
+	/**
+	 * $priority translations
+	 *
+	 * Actual values to send with the X-Priority header
+	 *
+	 * @var array
+	 */
+	protected $priorities = [
+		1 => '1 (Highest)',
+		2 => '2 (High)',
+		3 => '3 (Normal)',
+		4 => '4 (Low)',
+		5 => '5 (Lowest)',
+	];
+
+	/**
+	 * mbstring.func_overload flag
+	 *
+	 * @var boolean
+	 */
+	protected static $func_overload;
+
+	/**
+	 * Logger instance to record error messages and awarnings.
+	 *
+	 * @var \PSR\Log\LoggerInterface
+	 */
+	protected $logger;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor - Sets Email Preferences
+	 *
+	 * The constructor can be passed an array of config values
+	 *
+	 * @param array|null $config
+	 */
+	public function __construct($config = null)
+	{
+		$this->protocol = 'smtp';
+		$this->initialize($config);
+
+		log_message('info', 'Email Class Initialized');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Initialize preferences
+	 *
+	 * @param array|\Config\Email $config
+	 *
+	 * @return Email
+	 */
+	public function initialize($config)
+	{
+		$this->clear();
+
+		if ($config instanceof \Config\Email)
+		{
+			$config = get_object_vars($config);
+		}
+
+		foreach (get_class_vars(get_class($this)) as $key => $value)
+		{
+			if (property_exists($this, $key) && isset($config[$key]))
+			{
+				$method = 'set' . ucfirst($key);
+
+				if (method_exists($this, $method))
+				{
+					$this->$method($config[$key]);
+				}
+				else
+				{
+					$this->$key = $config[$key];
+				}
+			}
+		}
+
+		$this->charset  = strtoupper($this->charset);
+		$this->SMTPAuth = isset($this->SMTPUser[0], $this->SMTPPass[0]);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Initialize the Email Data
+	 *
+	 * @param boolean $clearAttachments
+	 *
+	 * @return Email
+	 */
+	public function clear($clearAttachments = false)
+	{
+		$this->subject      = '';
+		$this->body         = '';
+		$this->finalBody    = '';
+		$this->headerStr    = '';
+		$this->replyToFlag  = false;
+		$this->recipients   = [];
+		$this->CCArray      = [];
+		$this->BCCArray     = [];
+		$this->headers      = [];
+		$this->debugMessage = [];
+
+		//      $this->setHeader('Date', $this->setDate());
+
+		if ($clearAttachments !== false)
+		{
+			$this->attachments = [];
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Build final headers
+	 */
+	protected function buildHeaders()
+	{
+		$this->setHeader('User-Agent', $this->userAgent);
+		$this->setHeader('X-Sender', $this->cleanEmail($this->headers['From']));
+		$this->setHeader('X-Mailer', $this->userAgent);
+		$this->setHeader('X-Priority', $this->priorities[$this->priority]);
+		$this->setHeader('Message-ID', $this->getMessageID());
+		$this->setHeader('Mime-Version', '1.0');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Write Headers as a string
+	 */
+	protected function writeHeaders()
+	{
+		if ($this->protocol === 'mail')
+		{
+			if (isset($this->headers['Subject']))
+			{
+				$this->subject = $this->headers['Subject'];
+				unset($this->headers['Subject']);
+			}
+		}
+
+		reset($this->headers);
+		$this->headerStr = '';
+
+		foreach ($this->headers as $key => $val)
+		{
+			$val = trim($val);
+
+			if ($val !== '')
+			{
+				$this->headerStr .= $key . ': ' . $val . $this->newline;
+			}
+		}
+
+		if ($this->getProtocol() === 'mail')
+		{
+			$this->headerStr = rtrim($this->headerStr);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Build Final Body and attachments
+	 */
+	protected function buildMessage()
+	{
+		if ($this->wordWrap === true && $this->mailType !== 'html')
+		{
+			$this->body = $this->wordWrap($this->body);
+		}
+
+		$this->writeHeaders();
+
+		$hdr  = ($this->getProtocol() === 'mail') ? $this->newline : '';
+		$body = '';
+
+		switch ($this->getContentType())
+		{
+			case 'plain':
+
+				$hdr .= 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding();
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+					$this->finalBody  = $this->body;
+				}
+				else
+				{
+					$this->finalBody = $hdr . $this->newline . $this->newline . $this->body;
+				}
+
+				return;
+
+			case 'html':
+
+				if ($this->sendMultipart === false)
+				{
+					$hdr .= 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: quoted-printable';
+				}
+				else
+				{
+					$boundary = uniqid('B_ALT_', true);
+					$hdr     .= 'Content-Type: multipart/alternative; boundary="' . $boundary . '"';
+
+					$body .= $this->getMimeMessage() . $this->newline . $this->newline
+							. '--' . $boundary . $this->newline
+							. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+							. $this->getAltMessage() . $this->newline . $this->newline
+							. '--' . $boundary . $this->newline
+							. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline;
+				}
+
+				$this->finalBody = $body . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline;
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+				else
+				{
+					$this->finalBody = $hdr . $this->newline . $this->newline . $this->finalBody;
+				}
+
+				if ($this->sendMultipart !== false)
+				{
+					$this->finalBody .= '--' . $boundary . '--';
+				}
+
+				return;
+
+			case 'plain-attach':
+
+				$boundary = uniqid('B_ATC_', true);
+				$hdr     .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"';
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+
+				$body .= $this->getMimeMessage() . $this->newline
+						. $this->newline
+						. '--' . $boundary . $this->newline
+						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline
+						. $this->newline
+						. $this->body . $this->newline . $this->newline;
+
+				$this->appendAttachments($body, $boundary);
+
+				break;
+			case 'html-attach':
+
+				$alt_boundary  = uniqid('B_ALT_', true);
+				$last_boundary = null;
+
+				if ($this->attachmentsHaveMultipart('mixed'))
+				{
+					$atc_boundary  = uniqid('B_ATC_', true);
+					$hdr          .= 'Content-Type: multipart/mixed; boundary="' . $atc_boundary . '"';
+					$last_boundary = $atc_boundary;
+				}
+
+				if ($this->attachmentsHaveMultipart('related'))
+				{
+					$rel_boundary        = uniqid('B_REL_', true);
+					$rel_boundary_header = 'Content-Type: multipart/related; boundary="' . $rel_boundary . '"';
+
+					if (isset($last_boundary))
+					{
+						$body .= '--' . $last_boundary . $this->newline . $rel_boundary_header;
+					}
+					else
+					{
+						$hdr .= $rel_boundary_header;
+					}
+
+					$last_boundary = $rel_boundary;
+				}
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+
+				static::strlen($body) && $body .= $this->newline . $this->newline;
+				$body                          .= $this->getMimeMessage() . $this->newline . $this->newline
+						. '--' . $last_boundary . $this->newline
+						. 'Content-Type: multipart/alternative; boundary="' . $alt_boundary . '"' . $this->newline . $this->newline
+						. '--' . $alt_boundary . $this->newline
+						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+						. $this->getAltMessage() . $this->newline . $this->newline
+						. '--' . $alt_boundary . $this->newline
+						. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline
+						. $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
+						. '--' . $alt_boundary . '--' . $this->newline . $this->newline;
+
+				if (! empty($rel_boundary))
+				{
+					$body .= $this->newline . $this->newline;
+					$this->appendAttachments($body, $rel_boundary, 'related');
+				}
+
+				// multipart/mixed attachments
+				if (! empty($atc_boundary))
+				{
+					$body .= $this->newline . $this->newline;
+					$this->appendAttachments($body, $atc_boundary, 'mixed');
+				}
+
+				break;
+		}
+
+		$this->finalBody = ($this->getProtocol() === 'mail') ? $body : $hdr . $this->newline . $this->newline . $body;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepares attachment string
+	 *
+	 * @param string      &$body     Message body to append to
+	 * @param string      $boundary  Multipart boundary
+	 * @param string|null $multipart When provided, only attachments of this type will be processed
+	 *
+	 * @return string
+	 */
+	protected function appendAttachments(&$body, $boundary, $multipart = null)
+	{
+		for ($i = 0, $c = count($this->attachments); $i < $c; $i ++)
+		{
+			if (isset($multipart) && $this->attachments[$i]['multipart'] !== $multipart)
+			{
+				continue;
+			}
+
+			$name = isset($this->attachments[$i]['name'][1]) ? $this->attachments[$i]['name'][1] : basename($this->attachments[$i]['name'][0]);
+
+			$body .= '--' . $boundary . $this->newline
+					. 'Content-Type: ' . $this->attachments[$i]['type'] . '; name="' . $name . '"' . $this->newline
+					. 'Content-Disposition: ' . $this->attachments[$i]['disposition'] . ';' . $this->newline
+					. 'Content-Transfer-Encoding: base64' . $this->newline
+					. (empty($this->attachments[$i]['cid']) ? '' : 'Content-ID: <' . $this->attachments[$i]['cid'] . '>' . $this->newline)
+					. $this->newline
+					. $this->attachments[$i]['content'] . $this->newline;
+		}
+
+		// $name won't be set if no attachments were appended,
+		// and therefore a boundary wouldn't be necessary
+		empty($name) || $body .= '--' . $boundary . '--';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prep Quoted Printable
+	 *
+	 * Prepares string for Quoted-Printable Content-Transfer-Encoding
+	 * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	protected function prepQuotedPrintable($str)
+	{
+		// ASCII code numbers for "safe" characters that can always be
+		// used literally, without encoding, as described in RFC 2049.
+		// http://www.ietf.org/rfc/rfc2049.txt
+		static $ascii_safe_chars = [
+			// ' (  )   +   ,   -   .   /   :   =   ?
+			39,
+			40,
+			41,
+			43,
+			44,
+			45,
+			46,
+			47,
+			58,
+			61,
+			63,
+			// numbers
+			48,
+			49,
+			50,
+			51,
+			52,
+			53,
+			54,
+			55,
+			56,
+			57,
+			// upper-case letters
+			65,
+			66,
+			67,
+			68,
+			69,
+			70,
+			71,
+			72,
+			73,
+			74,
+			75,
+			76,
+			77,
+			78,
+			79,
+			80,
+			81,
+			82,
+			83,
+			84,
+			85,
+			86,
+			87,
+			88,
+			89,
+			90,
+			// lower-case letters
+			97,
+			98,
+			99,
+			100,
+			101,
+			102,
+			103,
+			104,
+			105,
+			106,
+			107,
+			108,
+			109,
+			110,
+			111,
+			112,
+			113,
+			114,
+			115,
+			116,
+			117,
+			118,
+			119,
+			120,
+			121,
+			122,
+		];
+
+		// We are intentionally wrapping so mail servers will encode characters
+		// properly and MUAs will behave, so {unwrap} must go!
+		$str = str_replace(['{unwrap}', '{/unwrap}'], '', $str);
+
+		// RFC 2045 specifies CRLF as "\r\n".
+		// However, many developers choose to override that and violate
+		// the RFC rules due to (apparently) a bug in MS Exchange,
+		// which only works with "\n".
+		if ($this->CRLF === "\r\n")
+		{
+			return quoted_printable_encode($str);
+		}
+
+		// Reduce multiple spaces & remove nulls
+		$str = preg_replace(['| +|', '/\x00+/'], [' ', ''], $str);
+
+		// Standardize newlines
+		if (strpos($str, "\r") !== false)
+		{
+			$str = str_replace(["\r\n", "\r"], "\n", $str);
+		}
+
+		$escape = '=';
+		$output = '';
+
+		foreach (explode("\n", $str) as $line)
+		{
+			$length = static::strlen($line);
+			$temp   = '';
+
+			// Loop through each character in the line to add soft-wrap
+			// characters at the end of a line " =\r\n" and add the newly
+			// processed line(s) to the output (see comment on $crlf class property)
+			for ($i = 0; $i < $length; $i ++)
+			{
+				// Grab the next character
+				$char  = $line[$i];
+				$ascii = ord($char);
+
+				// Convert spaces and tabs but only if it's the end of the line
+				if ($ascii === 32 || $ascii === 9)
+				{
+					if ($i === ($length - 1))
+					{
+						$char = $escape . sprintf('%02s', dechex($ascii));
+					}
+				}
+				// DO NOT move this below the $ascii_safe_chars line!
+				//
+				// = (equals) signs are allowed by RFC2049, but must be encoded
+				// as they are the encoding delimiter!
+				elseif ($ascii === 61)
+				{
+					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
+				}
+				elseif (! in_array($ascii, $ascii_safe_chars, true))
+				{
+					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));
+				}
+
+				// If we're at the character limit, add the line to the output,
+				// reset our temp variable, and keep on chuggin'
+				if ((static::strlen($temp) + static::strlen($char)) >= 76)
+				{
+					$output .= $temp . $escape . $this->CRLF;
+					$temp    = '';
+				}
+
+				// Add the character to our temporary line
+				$temp .= $char;
+			}
+
+			// Add our completed line to the output
+			$output .= $temp . $this->CRLF;
+		}
+
+		// get rid of extra CRLF tacked onto the end
+		return static::substr($output, 0, static::strlen($this->CRLF) * -1);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prep Q Encoding
+	 *
+	 * Performs "Q Encoding" on a string for use in email headers.
+	 * It's related but not identical to quoted-printable, so it has its
+	 * own method.
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	protected function prepQEncoding($str)
+	{
+		$str = str_replace(["\r", "\n"], '', $str);
+
+		if ($this->charset === 'UTF-8')
+		{
+			// Note: We used to have mb_encode_mimeheader() as the first choice
+			//       here, but it turned out to be buggy and unreliable. DO NOT
+			//       re-add it! -- Narf
+			if (extension_loaded('iconv'))
+			{
+				$output = @iconv_mime_encode(
+								'', $str, [
+									'scheme'           => 'Q',
+									'line-length'      => 76,
+									'input-charset'    => $this->charset,
+									'output-charset'   => $this->charset,
+									'line-break-chars' => $this->CRLF,
+								]);
+
+				// There are reports that iconv_mime_encode() might fail and return FALSE
+				if ($output !== false)
+				{
+					// iconv_mime_encode() will always put a header field name.
+					// We've passed it an empty one, but it still prepends our
+					// encoded string with ': ', so we need to strip it.
+					return static::substr($output, 2);
+				}
+
+				$chars = iconv_strlen($str, 'UTF-8');
+			}
+			elseif (extension_loaded('mbstring'))
+			{
+				$chars = mb_strlen($str, 'UTF-8');
+			}
+		}
+
+		// We might already have this set for UTF-8
+		isset($chars) || $chars = static::strlen($str);
+
+		$output = '=?' . $this->charset . '?Q?';
+		for ($i = 0, $length = static::strlen($output); $i < $chars; $i ++)
+		{
+			$chr = ($this->charset === 'UTF-8' && ICONV_ENABLED === true) ? '=' . implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2)) : '=' . strtoupper(bin2hex($str[$i]));
+
+			// RFC 2045 sets a limit of 76 characters per line.
+			// We'll append ?= to the end of each line though.
+			if ($length + ($l = static::strlen($chr)) > 74)
+			{
+				$output .= '?=' . $this->CRLF // EOL
+						. ' =?' . $this->charset . '?Q?' . $chr; // New line
+				$length  = 6 + static::strlen($this->charset) + $l; // Reset the length for the new line
+			}
+			else
+			{
+				$output .= $chr;
+				$length += $l;
+			}
+		}
+
+		// End the header
+		return $output . '?=';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send Email
+	 *
+	 * @param boolean $autoClear
+	 *
+	 * @return boolean
+	 */
+	public function send(Email $email, bool $autoClear = true, bool $reallySend = true)
+	{
+		if (! isset($this->headers['From']) && ! empty($this->fromEmail))
+		{
+			$this->setFrom($this->fromEmail, $this->fromName);
+		}
+
+		if (! isset($this->headers['From']))
+		{
+			throw EmailException::forNoFrom();
+		}
+
+		if ($this->replyToFlag === false)
+		{
+			$this->setReplyTo($this->headers['From']);
+		}
+
+		if (empty($this->recipients) && ! isset($this->headers['To']) && empty($this->BCCArray) && ! isset($this->headers['Bcc']) && ! isset($this->headers['Cc'])
+		)
+		{
+			throw EmailException::forNoRecipients();
+		}
+
+		$this->buildHeaders();
+
+		if ($this->BCCBatchMode && count($this->BCCArray) > $this->BCCBatchSize)
+		{
+			$this->batchBCCSend();
+
+			if ($autoClear)
+			{
+				$this->clear();
+			}
+
+			return true;
+		}
+
+		$this->buildMessage();
+		$result = $this->spoolEmail();
+
+		if ($result && $autoClear)
+		{
+			$this->clear();
+		}
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Batch Bcc Send. Sends groups of BCCs in batches
+	 */
+	public function batchBCCSend()
+	{
+		$float = $this->BCCBatchSize - 1;
+		$set   = '';
+		$chunk = [];
+
+		for ($i = 0, $c = count($this->BCCArray); $i < $c; $i ++)
+		{
+			if (isset($this->BCCArray[$i]))
+			{
+				$set .= ', ' . $this->BCCArray[$i];
+			}
+
+			if ($i === $float)
+			{
+				$chunk[] = static::substr($set, 1);
+				$float  += $this->BCCBatchSize;
+				$set     = '';
+			}
+
+			if ($i === $c - 1)
+			{
+				$chunk[] = static::substr($set, 1);
+			}
+		}
+
+		for ($i = 0, $c = count($chunk); $i < $c; $i ++)
+		{
+			unset($this->headers['Bcc']);
+
+			$bcc = $this->cleanEmail($this->stringToArray($chunk[$i]));
+
+			if ($this->protocol !== 'smtp')
+			{
+				$this->setHeader('Bcc', implode(', ', $bcc));
+			}
+			else
+			{
+				$this->BCCArray = $bcc;
+			}
+
+			$this->buildMessage();
+			$this->spoolEmail();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Unwrap special elements
+	 */
+	protected function unwrapSpecials()
+	{
+		$this->finalBody = preg_replace_callback(
+				'/\{unwrap\}(.*?)\{\/unwrap\}/si', [
+					$this,
+					'removeNLCallback',
+				], $this->finalBody
+		);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Strip line-breaks via callback
+	 *
+	 * @param string $matches
+	 *
+	 * @return string
+	 */
+	protected function removeNLCallback($matches)
+	{
+		if (strpos($matches[1], "\r") !== false || strpos($matches[1], "\n") !== false)
+		{
+			$matches[1] = str_replace(["\r\n", "\r", "\n"], '', $matches[1]);
+		}
+
+		return $matches[1];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Spool mail to the mail server
+	 *
+	 * @return boolean
+	 */
+	protected function spoolEmail()
+	{
+		$this->unwrapSpecials();
+
+		$protocol = $this->getProtocol();
+		$method   = 'sendWith' . ucfirst($protocol);
+		try
+		{
+			$success = $this->$method();
+		}
+		catch (\ErrorException $e)
+		{
+			$success = false;
+			$this->logger->error('Email: ' . $method . ' throwed ' . $e->getMessage());
+		}
+
+		if (! $success)
+		{
+			throw EmailException::forSendFailure($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol));
+		}
+
+		$this->setErrorMessage(lang('Email.sent', [$protocol]));
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Validate email for shell
+	 *
+	 * Applies stricter, shell-safe validation to email addresses.
+	 * Introduced to prevent RCE via sendmail's -f option.
+	 *
+	 * @see     https://github.com/codeigniter4/CodeIgniter/issues/4963
+	 * @see     https://gist.github.com/Zenexer/40d02da5e07f151adeaeeaa11af9ab36
+	 * @license https://creativecommons.org/publicdomain/zero/1.0/    CC0 1.0, Public Domain
+	 *
+	 * Credits for the base concept go to Paul Buonopane <paul@namepros.com>
+	 *
+	 * @param string &$email
+	 *
+	 * @return boolean
+	 */
+	protected function validateEmailForShell(&$email)
+	{
+		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
+		{
+			$email = static::substr($email, 0, ++ $atpos) . idn_to_ascii(
+							static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46
+			);
+		}
+
+		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send using mail()
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithMail()
+	{
+		if (is_array($this->recipients))
+		{
+			$this->recipients = implode(', ', $this->recipients);
+		}
+
+		// _validate_email_for_shell() below accepts by reference,
+		// so this needs to be assigned to a variable
+		$from = $this->cleanEmail($this->headers['Return-Path']);
+
+		if (! $this->validateEmailForShell($from))
+		{
+			return mail($this->recipients, $this->subject, $this->finalBody, $this->headerStr);
+		}
+
+		// most documentation of sendmail using the "-f" flag lacks a space after it, however
+		// we've encountered servers that seem to require it to be in place.
+		return mail($this->recipients, $this->subject, $this->finalBody, $this->headerStr, '-f ' . $from);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send using Sendmail
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithSendmail()
+	{
+		// _validate_email_for_shell() below accepts by reference,
+		// so this needs to be assigned to a variable
+		$from = $this->cleanEmail($this->headers['From']);
+		if ($this->validateEmailForShell($from))
+		{
+			$from = '-f ' . $from;
+		}
+		else
+		{
+			$from = '';
+		}
+
+		// is popen() enabled?
+		if (! function_usable('popen') || false === ($fp = @popen($this->mailPath . ' -oi ' . $from . ' -t', 'w')))
+		{
+			// server probably has popen disabled, so nothing we can do to get a verbose error.
+			return false;
+		}
+
+		fputs($fp, $this->headerStr);
+		fputs($fp, $this->finalBody);
+
+		$status = pclose($fp);
+
+		if ($status !== 0)
+		{
+			throw EmailException::forNosocket($status);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send using SMTP
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithSmtp()
+	{
+		if ($this->SMTPHost === '')
+		{
+			throw EmailException::forNoHostname();
+		}
+
+		if (! $this->SMTPConnect() || ! $this->SMTPAuthenticate())
+		{
+			return false;
+		}
+
+		if (! $this->sendCommand('from', $this->cleanEmail($this->headers['From'])))
+		{
+			$this->SMTPEnd();
+
+			return false;
+		}
+
+		foreach ($this->recipients as $val)
+		{
+			if (! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		foreach ($this->CCArray as $val)
+		{
+			if ($val !== '' && ! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		foreach ($this->BCCArray as $val)
+		{
+			if ($val !== '' && ! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		if (! $this->sendCommand('data'))
+		{
+			$this->SMTPEnd();
+
+			return false;
+		}
+
+		// perform dot transformation on any lines that begin with a dot
+		$this->sendData($this->headerStr . preg_replace('/^\./m', '..$1', $this->finalBody));
+
+		$this->sendData('.');
+		$reply = $this->getSMTPData();
+		$this->setErrorMessage($reply);
+
+		$this->SMTPEnd();
+
+		if (strpos($reply, '250') !== 0)
+		{
+			throw EmailException::forSMTPError($reply);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SMTP End
+	 *
+	 * Shortcut to send RSET or QUIT depending on keep-alive
+	 */
+	protected function SMTPEnd()
+	{
+		$this->sendCommand($this->SMTPKeepAlive ? 'reset' : 'quit');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SMTP Connect
+	 *
+	 * @return string
+	 */
+	protected function SMTPConnect()
+	{
+		if (is_resource($this->SMTPConnect))
+		{
+			return true;
+		}
+
+		$ssl = ($this->SMTPCrypto === 'ssl') ? 'ssl://' : '';
+
+		$this->SMTPConnect = fsockopen(
+				$ssl . $this->SMTPHost, $this->SMTPPort, $errno, $errstr, $this->SMTPTimeout
+		);
+
+		if (! is_resource($this->SMTPConnect))
+		{
+			throw EmailException::forSMTPError($errno . ' ' . $errstr);
+		}
+
+		stream_set_timeout($this->SMTPConnect, $this->SMTPTimeout);
+		$this->setErrorMessage($this->getSMTPData());
+
+		if ($this->SMTPCrypto === 'tls')
+		{
+			$this->sendCommand('hello');
+			$this->sendCommand('starttls');
+
+			$crypto = stream_socket_enable_crypto($this->SMTPConnect, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+
+			if ($crypto !== true)
+			{
+				throw EmailException::forSMTPError($this->getSMTPData());
+			}
+		}
+
+		return $this->sendCommand('hello');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send SMTP command
+	 *
+	 * @param string $cmd
+	 * @param string $data
+	 *
+	 * @return boolean
+	 */
+	protected function sendCommand($cmd, $data = '')
+	{
+		switch ($cmd)
+		{
+			case 'hello':
+				if ($this->SMTPAuth || $this->getEncoding() === '8bit')
+				{
+					$this->sendData('EHLO ' . $this->getHostname());
+				}
+				else
+				{
+					$this->sendData('HELO ' . $this->getHostname());
+				}
+
+				$resp = 250;
+				break;
+			case 'starttls':
+				$this->sendData('STARTTLS');
+				$resp = 220;
+				break;
+			case 'from':
+				$this->sendData('MAIL FROM:<' . $data . '>');
+				$resp = 250;
+				break;
+			case 'to':
+				if ($this->DSN)
+				{
+					$this->sendData('RCPT TO:<' . $data . '> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;' . $data);
+				}
+				else
+				{
+					$this->sendData('RCPT TO:<' . $data . '>');
+				}
+				$resp = 250;
+				break;
+			case 'data':
+				$this->sendData('DATA');
+				$resp = 354;
+				break;
+			case 'reset':
+				$this->sendData('RSET');
+				$resp = 250;
+				break;
+			case 'quit':
+				$this->sendData('QUIT');
+				$resp = 221;
+				break;
+		}
+
+		$reply = $this->getSMTPData();
+
+		$this->debugMessage[] = '<pre>' . $cmd . ': ' . $reply . '</pre>';
+
+		if ((int) static::substr($reply, 0, 3) !== $resp)
+		{
+			throw EmailException::forSMTPError($reply);
+		}
+
+		if ($cmd === 'quit')
+		{
+			fclose($this->SMTPConnect);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SMTP Authenticate
+	 *
+	 * @return boolean
+	 */
+	protected function SMTPAuthenticate()
+	{
+		if (! $this->SMTPAuth)
+		{
+			return true;
+		}
+
+		if ($this->SMTPUser === '' && $this->SMTPPass === '')
+		{
+			throw EmailException::forNoSMTPAuth();
+		}
+
+		$this->sendData('AUTH LOGIN');
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '503') === 0)    // Already authenticated
+		{
+			return true;
+		}
+		elseif (strpos($reply, '334') !== 0)
+		{
+			throw EmailException::forFailedSMTPLogin($reply);
+		}
+
+		$this->sendData(base64_encode($this->SMTPUser));
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '334') !== 0)
+		{
+			throw EmailException::forSMTPAuthUsername($reply);
+		}
+
+		$this->sendData(base64_encode($this->SMTPPass));
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '235') !== 0)
+		{
+			throw EmailException::forSMTPAuthPassword($reply);
+		}
+
+		if ($this->SMTPKeepAlive)
+		{
+			$this->SMTPAuth = false;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send SMTP data
+	 *
+	 * @param string $data
+	 *
+	 * @return boolean
+	 */
+	protected function sendData($data)
+	{
+		$data .= $this->newline;
+		for ($written = $timestamp = 0, $length = static::strlen($data); $written < $length; $written += $result)
+		{
+			if (($result = fwrite($this->SMTPConnect, static::substr($data, $written))) === false)
+			{
+				break;
+			}
+			// See https://bugs.php.net/bug.php?id=39598 and http://php.net/manual/en/function.fwrite.php#96951
+			elseif ($result === 0)
+			{
+				if ($timestamp === 0)
+				{
+					$timestamp = time();
+				}
+				elseif ($timestamp < (time() - $this->SMTPTimeout))
+				{
+					$result = false;
+					break;
+				}
+
+				usleep(250000);
+				continue;
+			}
+			else
+			{
+				$timestamp = 0;
+			}
+		}
+
+		if ($result === false)
+		{
+			throw EmailException::forSMTPDataFailure($data);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get SMTP data
+	 *
+	 * @return string
+	 */
+	protected function getSMTPData()
+	{
+		$data = '';
+
+		while ($str = fgets($this->SMTPConnect, 512))
+		{
+			$data .= $str;
+
+			if ($str[3] === ' ')
+			{
+				break;
+			}
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Hostname
+	 *
+	 * There are only two legal types of hostname - either a fully
+	 * qualified domain name (eg: "mail.example.com") or an IP literal
+	 * (eg: "[1.2.3.4]").
+	 *
+	 * @link https://tools.ietf.org/html/rfc5321#section-2.3.5
+	 * @link http://cbl.abuseat.org/namingproblems.html
+	 *
+	 * @return string
+	 */
+	protected function getHostname()
+	{
+		if (isset($_SERVER['SERVER_NAME']))
+		{
+			return $_SERVER['SERVER_NAME'];
+		}
+
+		return isset($_SERVER['SERVER_ADDR']) ? '[' . $_SERVER['SERVER_ADDR'] . ']' : '[127.0.0.1]';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Debug Message
+	 *
+	 * @param array $include List of raw data chunks to include in the output
+	 *                       Valid options are: 'headers', 'subject', 'body'
+	 *
+	 * @return string
+	 */
+	public function printDebugger($include = ['headers', 'subject', 'body'])
+	{
+		$msg = implode('', $this->debugMessage);
+
+		// Determine which parts of our raw data needs to be printed
+		$raw_data                      = '';
+		is_array($include) || $include = [$include];
+
+		in_array('headers', $include, true) && $raw_data  = htmlspecialchars($this->headerStr) . "\n";
+		in_array('subject', $include, true) && $raw_data .= htmlspecialchars($this->subject) . "\n";
+		in_array('body', $include, true) && $raw_data    .= htmlspecialchars($this->finalBody);
+
+		return $msg . ($raw_data === '' ? '' : '<pre>' . $raw_data . '</pre>');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set Message
+	 *
+	 * @param string $msg
+	 */
+	protected function setErrorMessage($msg)
+	{
+		$this->debugMessage[] = $msg . '<br />';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Mime Types
+	 *
+	 * @param string $ext
+	 *
+	 * @return string
+	 */
+	protected function mimeTypes($ext = '')
+	{
+		$mime = Mimes::guessTypeFromExtension(strtolower($ext));
+
+		return ! empty($mime) ? $mime : 'application/x-unknown-content-type';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Destructor
+	 */
+	public function __destruct()
+	{
+		is_resource($this->SMTPConnect) && $this->sendCommand('quit');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Byte-safe strlen()
+	 *
+	 * @param string $str
+	 *
+	 * @return integer
+	 */
+	protected static function strlen($str)
+	{
+		return (static::$func_overload) ? mb_strlen($str, '8bit') : strlen($str);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Byte-safe substr()
+	 *
+	 * @param string       $str
+	 * @param integer      $start
+	 * @param integer|null $length
+	 *
+	 * @return string
+	 */
+	protected static function substr($str, $start, $length = null)
+	{
+		if (static::$func_overload)
+		{
+			return mb_substr($str, $start, $length, '8bit');
+		}
+
+		return isset($length) ? substr($str, $start, $length) : substr($str, $start);
+	}
+
+}
diff --git a/system/Email/Handlers/SendmailHandler.php b/system/Email/Handlers/SendmailHandler.php
new file mode 100644
index 0000000000..a743711182
--- /dev/null
+++ b/system/Email/Handlers/SendmailHandler.php
@@ -0,0 +1,1638 @@
+<?php
+namespace CodeIgniter\Email\Handlers;
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014 - 2018, British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     EllisLab Dev Team
+ * @copyright  Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright  Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license    http://opensource.org/licenses/MIT    MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 1.0.0
+ * @filesource
+ */
+
+use CodeIgniter\Email\Email;
+use CodeIgniter\Email\Exceptions\EmailException;
+use Config\Mimes;
+use Psr\Log\LoggerAwareTrait;
+
+/**
+ * CodeIgniter Email Class
+ *
+ * Permits email to be sent using Mail, Sendmail, or SMTP.
+ *
+ * @package    CodeIgniter
+ * @subpackage Libraries
+ * @category   Libraries
+ * @author     EllisLab Dev Team
+ * @link       https://codeigniter.com/user_guide/libraries/email.html
+ */
+class SendmailHandler extends BaseHandler
+{
+
+	/**
+	 * Message format.
+	 *
+	 * @var string 'text' or 'html'
+	 */
+	public $mailType = 'text';
+
+	/**
+	 * Character set (default: utf-8)
+	 *
+	 * @var string
+	 */
+	public $charset = 'utf-8';
+
+	/**
+	 * Alternative message (for HTML messages only)
+	 *
+	 * @var string
+	 */
+	public $altMessage = '';
+
+	/**
+	 * Whether to validate e-mail addresses.
+	 *
+	 * @var boolean
+	 */
+	public $validate = true;
+
+	/**
+	 * X-Priority header value.
+	 *
+	 * @var integer 1-5
+	 */
+	public $priority = 3;            // Default priority (1 - 5)
+
+	/**
+	 * Newline character sequence.
+	 * Use "\r\n" to comply with RFC 822.
+	 *
+	 * @link http://www.ietf.org/rfc/rfc822.txt
+	 * @var  string "\r\n" or "\n"
+	 */
+	public $newline = "\n";            // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
+
+	/**
+	 * CRLF character sequence
+	 *
+	 * RFC 2045 specifies that for 'quoted-printable' encoding,
+	 * "\r\n" must be used. However, it appears that some servers
+	 * (even on the receiving end) don't handle it properly and
+	 * switching to "\n", while improper, is the only solution
+	 * that seems to work for all environments.
+	 *
+	 * @link http://www.ietf.org/rfc/rfc822.txt
+	 * @var  string
+	 */
+	public $CRLF = "\n";
+
+	/**
+	 * Whether to use Delivery Status Notification.
+	 *
+	 * @var boolean
+	 */
+	public $DSN = false;
+
+	/**
+	 * Whether to send multipart alternatives.
+	 * Yahoo! doesn't seem to like these.
+	 *
+	 * @var boolean
+	 */
+	public $sendMultipart = true;
+
+	/**
+	 * Whether to send messages to BCC recipients in batches.
+	 *
+	 * @var boolean
+	 */
+	public $BCCBatchMode = false;
+
+	/**
+	 * BCC Batch max number size.
+	 *
+	 * @see Email::$BCCBatchMode
+	 * @var integer
+	 */
+	public $BCCBatchSize = 200;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Subject header
+	 *
+	 * @var string
+	 */
+	protected $subject = '';
+
+	/**
+	 * Message body
+	 *
+	 * @var string
+	 */
+	protected $body = '';
+
+	/**
+	 * Final message body to be sent.
+	 *
+	 * @var string
+	 */
+	protected $finalBody = '';
+
+	/**
+	 * Final headers to send
+	 *
+	 * @var string
+	 */
+	protected $headerStr = '';
+
+	/**
+	 * SMTP Connection socket placeholder
+	 *
+	 * @var resource
+	 */
+	protected $SMTPConnect = '';
+
+	/**
+	 * Mail encoding
+	 *
+	 * @var string '8bit' or '7bit'
+	 */
+	protected $encoding = '8bit';
+
+	/**
+	 * Whether to send a Reply-To header
+	 *
+	 * @var boolean
+	 */
+	protected $replyToFlag = false;
+
+	/**
+	 * Debug messages
+	 *
+	 * @see Email::printDebugger()
+	 * @var array
+	 */
+	protected $debugMessage = [];
+
+	/**
+	 * Recipients
+	 *
+	 * @var array
+	 */
+	protected $recipients = [];
+
+	/**
+	 * CC Recipients
+	 *
+	 * @var array
+	 */
+	protected $CCArray = [];
+
+	/**
+	 * BCC Recipients
+	 *
+	 * @var array
+	 */
+	protected $BCCArray = [];
+
+	/**
+	 * Message headers
+	 *
+	 * @var array
+	 */
+	protected $headers = [];
+
+	/**
+	 * Attachment data
+	 *
+	 * @var array
+	 */
+	protected $attachments = [];
+
+	/**
+	 * Valid $protocol values
+	 *
+	 * @see Email::$protocol
+	 * @var array
+	 */
+	protected $protocols = [
+		'mail',
+		'sendmail',
+		'smtp',
+	];
+
+	/**
+	 * Base charsets
+	 *
+	 * Character sets valid for 7-bit encoding,
+	 * excluding language suffix.
+	 *
+	 * @var array
+	 */
+	protected $baseCharsets = [
+		'us-ascii',
+		'iso-2022-',
+	];
+
+	/**
+	 * Bit depths
+	 *
+	 * Valid mail encodings
+	 *
+	 * @see Email::$encoding
+	 * @var array
+	 */
+	protected $bitDepths = [
+		'7bit',
+		'8bit',
+	];
+
+	/**
+	 * $priority translations
+	 *
+	 * Actual values to send with the X-Priority header
+	 *
+	 * @var array
+	 */
+	protected $priorities = [
+		1 => '1 (Highest)',
+		2 => '2 (High)',
+		3 => '3 (Normal)',
+		4 => '4 (Low)',
+		5 => '5 (Lowest)',
+	];
+
+	/**
+	 * mbstring.func_overload flag
+	 *
+	 * @var boolean
+	 */
+	protected static $func_overload;
+
+	/**
+	 * Logger instance to record error messages and awarnings.
+	 *
+	 * @var \PSR\Log\LoggerInterface
+	 */
+	protected $logger;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor - Sets Email Preferences
+	 *
+	 * The constructor can be passed an array of config values
+	 *
+	 * @param array|null $config
+	 */
+	public function __construct($config = null)
+	{
+		$this->protocol = 'sendmail';
+		$this->initialize($config);
+
+		log_message('info', 'Email Class Initialized');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Initialize preferences
+	 *
+	 * @param array|\Config\Email $config
+	 *
+	 * @return Email
+	 */
+	public function initialize($config)
+	{
+		$this->clear();
+
+		if ($config instanceof \Config\Email)
+		{
+			$config = get_object_vars($config);
+		}
+
+		foreach (get_class_vars(get_class($this)) as $key => $value)
+		{
+			if (property_exists($this, $key) && isset($config[$key]))
+			{
+				$method = 'set' . ucfirst($key);
+
+				if (method_exists($this, $method))
+				{
+					$this->$method($config[$key]);
+				}
+				else
+				{
+					$this->$key = $config[$key];
+				}
+			}
+		}
+
+		$this->charset  = strtoupper($this->charset);
+		$this->SMTPAuth = isset($this->SMTPUser[0], $this->SMTPPass[0]);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Initialize the Email Data
+	 *
+	 * @param boolean $clearAttachments
+	 *
+	 * @return Email
+	 */
+	public function clear($clearAttachments = false)
+	{
+		$this->subject      = '';
+		$this->body         = '';
+		$this->finalBody    = '';
+		$this->headerStr    = '';
+		$this->replyToFlag  = false;
+		$this->recipients   = [];
+		$this->CCArray      = [];
+		$this->BCCArray     = [];
+		$this->headers      = [];
+		$this->debugMessage = [];
+
+		//      $this->setHeader('Date', $this->setDate());
+
+		if ($clearAttachments !== false)
+		{
+			$this->attachments = [];
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Build final headers
+	 */
+	protected function buildHeaders()
+	{
+		$this->setHeader('User-Agent', $this->userAgent);
+		$this->setHeader('X-Sender', $this->cleanEmail($this->headers['From']));
+		$this->setHeader('X-Mailer', $this->userAgent);
+		$this->setHeader('X-Priority', $this->priorities[$this->priority]);
+		$this->setHeader('Message-ID', $this->getMessageID());
+		$this->setHeader('Mime-Version', '1.0');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Write Headers as a string
+	 */
+	protected function writeHeaders()
+	{
+		if ($this->protocol === 'mail')
+		{
+			if (isset($this->headers['Subject']))
+			{
+				$this->subject = $this->headers['Subject'];
+				unset($this->headers['Subject']);
+			}
+		}
+
+		reset($this->headers);
+		$this->headerStr = '';
+
+		foreach ($this->headers as $key => $val)
+		{
+			$val = trim($val);
+
+			if ($val !== '')
+			{
+				$this->headerStr .= $key . ': ' . $val . $this->newline;
+			}
+		}
+
+		if ($this->getProtocol() === 'mail')
+		{
+			$this->headerStr = rtrim($this->headerStr);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Build Final Body and attachments
+	 */
+	protected function buildMessage()
+	{
+		if ($this->wordWrap === true && $this->mailType !== 'html')
+		{
+			$this->body = $this->wordWrap($this->body);
+		}
+
+		$this->writeHeaders();
+
+		$hdr  = ($this->getProtocol() === 'mail') ? $this->newline : '';
+		$body = '';
+
+		switch ($this->getContentType())
+		{
+			case 'plain':
+
+				$hdr .= 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding();
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+					$this->finalBody  = $this->body;
+				}
+				else
+				{
+					$this->finalBody = $hdr . $this->newline . $this->newline . $this->body;
+				}
+
+				return;
+
+			case 'html':
+
+				if ($this->sendMultipart === false)
+				{
+					$hdr .= 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: quoted-printable';
+				}
+				else
+				{
+					$boundary = uniqid('B_ALT_', true);
+					$hdr     .= 'Content-Type: multipart/alternative; boundary="' . $boundary . '"';
+
+					$body .= $this->getMimeMessage() . $this->newline . $this->newline
+							. '--' . $boundary . $this->newline
+							. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+							. $this->getAltMessage() . $this->newline . $this->newline
+							. '--' . $boundary . $this->newline
+							. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline;
+				}
+
+				$this->finalBody = $body . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline;
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+				else
+				{
+					$this->finalBody = $hdr . $this->newline . $this->newline . $this->finalBody;
+				}
+
+				if ($this->sendMultipart !== false)
+				{
+					$this->finalBody .= '--' . $boundary . '--';
+				}
+
+				return;
+
+			case 'plain-attach':
+
+				$boundary = uniqid('B_ATC_', true);
+				$hdr     .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"';
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+
+				$body .= $this->getMimeMessage() . $this->newline
+						. $this->newline
+						. '--' . $boundary . $this->newline
+						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline
+						. $this->newline
+						. $this->body . $this->newline . $this->newline;
+
+				$this->appendAttachments($body, $boundary);
+
+				break;
+			case 'html-attach':
+
+				$alt_boundary  = uniqid('B_ALT_', true);
+				$last_boundary = null;
+
+				if ($this->attachmentsHaveMultipart('mixed'))
+				{
+					$atc_boundary  = uniqid('B_ATC_', true);
+					$hdr          .= 'Content-Type: multipart/mixed; boundary="' . $atc_boundary . '"';
+					$last_boundary = $atc_boundary;
+				}
+
+				if ($this->attachmentsHaveMultipart('related'))
+				{
+					$rel_boundary        = uniqid('B_REL_', true);
+					$rel_boundary_header = 'Content-Type: multipart/related; boundary="' . $rel_boundary . '"';
+
+					if (isset($last_boundary))
+					{
+						$body .= '--' . $last_boundary . $this->newline . $rel_boundary_header;
+					}
+					else
+					{
+						$hdr .= $rel_boundary_header;
+					}
+
+					$last_boundary = $rel_boundary;
+				}
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+
+				static::strlen($body) && $body .= $this->newline . $this->newline;
+				$body                          .= $this->getMimeMessage() . $this->newline . $this->newline
+						. '--' . $last_boundary . $this->newline
+						. 'Content-Type: multipart/alternative; boundary="' . $alt_boundary . '"' . $this->newline . $this->newline
+						. '--' . $alt_boundary . $this->newline
+						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+						. $this->getAltMessage() . $this->newline . $this->newline
+						. '--' . $alt_boundary . $this->newline
+						. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline
+						. $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
+						. '--' . $alt_boundary . '--' . $this->newline . $this->newline;
+
+				if (! empty($rel_boundary))
+				{
+					$body .= $this->newline . $this->newline;
+					$this->appendAttachments($body, $rel_boundary, 'related');
+				}
+
+				// multipart/mixed attachments
+				if (! empty($atc_boundary))
+				{
+					$body .= $this->newline . $this->newline;
+					$this->appendAttachments($body, $atc_boundary, 'mixed');
+				}
+
+				break;
+		}
+
+		$this->finalBody = ($this->getProtocol() === 'mail') ? $body : $hdr . $this->newline . $this->newline . $body;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepares attachment string
+	 *
+	 * @param string      &$body     Message body to append to
+	 * @param string      $boundary  Multipart boundary
+	 * @param string|null $multipart When provided, only attachments of this type will be processed
+	 *
+	 * @return string
+	 */
+	protected function appendAttachments(&$body, $boundary, $multipart = null)
+	{
+		for ($i = 0, $c = count($this->attachments); $i < $c; $i ++)
+		{
+			if (isset($multipart) && $this->attachments[$i]['multipart'] !== $multipart)
+			{
+				continue;
+			}
+
+			$name = isset($this->attachments[$i]['name'][1]) ? $this->attachments[$i]['name'][1] : basename($this->attachments[$i]['name'][0]);
+
+			$body .= '--' . $boundary . $this->newline
+					. 'Content-Type: ' . $this->attachments[$i]['type'] . '; name="' . $name . '"' . $this->newline
+					. 'Content-Disposition: ' . $this->attachments[$i]['disposition'] . ';' . $this->newline
+					. 'Content-Transfer-Encoding: base64' . $this->newline
+					. (empty($this->attachments[$i]['cid']) ? '' : 'Content-ID: <' . $this->attachments[$i]['cid'] . '>' . $this->newline)
+					. $this->newline
+					. $this->attachments[$i]['content'] . $this->newline;
+		}
+
+		// $name won't be set if no attachments were appended,
+		// and therefore a boundary wouldn't be necessary
+		empty($name) || $body .= '--' . $boundary . '--';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prep Quoted Printable
+	 *
+	 * Prepares string for Quoted-Printable Content-Transfer-Encoding
+	 * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	protected function prepQuotedPrintable($str)
+	{
+		// ASCII code numbers for "safe" characters that can always be
+		// used literally, without encoding, as described in RFC 2049.
+		// http://www.ietf.org/rfc/rfc2049.txt
+		static $ascii_safe_chars = [
+			// ' (  )   +   ,   -   .   /   :   =   ?
+			39,
+			40,
+			41,
+			43,
+			44,
+			45,
+			46,
+			47,
+			58,
+			61,
+			63,
+			// numbers
+			48,
+			49,
+			50,
+			51,
+			52,
+			53,
+			54,
+			55,
+			56,
+			57,
+			// upper-case letters
+			65,
+			66,
+			67,
+			68,
+			69,
+			70,
+			71,
+			72,
+			73,
+			74,
+			75,
+			76,
+			77,
+			78,
+			79,
+			80,
+			81,
+			82,
+			83,
+			84,
+			85,
+			86,
+			87,
+			88,
+			89,
+			90,
+			// lower-case letters
+			97,
+			98,
+			99,
+			100,
+			101,
+			102,
+			103,
+			104,
+			105,
+			106,
+			107,
+			108,
+			109,
+			110,
+			111,
+			112,
+			113,
+			114,
+			115,
+			116,
+			117,
+			118,
+			119,
+			120,
+			121,
+			122,
+		];
+
+		// We are intentionally wrapping so mail servers will encode characters
+		// properly and MUAs will behave, so {unwrap} must go!
+		$str = str_replace(['{unwrap}', '{/unwrap}'], '', $str);
+
+		// RFC 2045 specifies CRLF as "\r\n".
+		// However, many developers choose to override that and violate
+		// the RFC rules due to (apparently) a bug in MS Exchange,
+		// which only works with "\n".
+		if ($this->CRLF === "\r\n")
+		{
+			return quoted_printable_encode($str);
+		}
+
+		// Reduce multiple spaces & remove nulls
+		$str = preg_replace(['| +|', '/\x00+/'], [' ', ''], $str);
+
+		// Standardize newlines
+		if (strpos($str, "\r") !== false)
+		{
+			$str = str_replace(["\r\n", "\r"], "\n", $str);
+		}
+
+		$escape = '=';
+		$output = '';
+
+		foreach (explode("\n", $str) as $line)
+		{
+			$length = static::strlen($line);
+			$temp   = '';
+
+			// Loop through each character in the line to add soft-wrap
+			// characters at the end of a line " =\r\n" and add the newly
+			// processed line(s) to the output (see comment on $crlf class property)
+			for ($i = 0; $i < $length; $i ++)
+			{
+				// Grab the next character
+				$char  = $line[$i];
+				$ascii = ord($char);
+
+				// Convert spaces and tabs but only if it's the end of the line
+				if ($ascii === 32 || $ascii === 9)
+				{
+					if ($i === ($length - 1))
+					{
+						$char = $escape . sprintf('%02s', dechex($ascii));
+					}
+				}
+				// DO NOT move this below the $ascii_safe_chars line!
+				//
+				// = (equals) signs are allowed by RFC2049, but must be encoded
+				// as they are the encoding delimiter!
+				elseif ($ascii === 61)
+				{
+					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
+				}
+				elseif (! in_array($ascii, $ascii_safe_chars, true))
+				{
+					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));
+				}
+
+				// If we're at the character limit, add the line to the output,
+				// reset our temp variable, and keep on chuggin'
+				if ((static::strlen($temp) + static::strlen($char)) >= 76)
+				{
+					$output .= $temp . $escape . $this->CRLF;
+					$temp    = '';
+				}
+
+				// Add the character to our temporary line
+				$temp .= $char;
+			}
+
+			// Add our completed line to the output
+			$output .= $temp . $this->CRLF;
+		}
+
+		// get rid of extra CRLF tacked onto the end
+		return static::substr($output, 0, static::strlen($this->CRLF) * -1);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prep Q Encoding
+	 *
+	 * Performs "Q Encoding" on a string for use in email headers.
+	 * It's related but not identical to quoted-printable, so it has its
+	 * own method.
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	protected function prepQEncoding($str)
+	{
+		$str = str_replace(["\r", "\n"], '', $str);
+
+		if ($this->charset === 'UTF-8')
+		{
+			// Note: We used to have mb_encode_mimeheader() as the first choice
+			//       here, but it turned out to be buggy and unreliable. DO NOT
+			//       re-add it! -- Narf
+			if (extension_loaded('iconv'))
+			{
+				$output = @iconv_mime_encode(
+								'', $str, [
+									'scheme'           => 'Q',
+									'line-length'      => 76,
+									'input-charset'    => $this->charset,
+									'output-charset'   => $this->charset,
+									'line-break-chars' => $this->CRLF,
+								]);
+
+				// There are reports that iconv_mime_encode() might fail and return FALSE
+				if ($output !== false)
+				{
+					// iconv_mime_encode() will always put a header field name.
+					// We've passed it an empty one, but it still prepends our
+					// encoded string with ': ', so we need to strip it.
+					return static::substr($output, 2);
+				}
+
+				$chars = iconv_strlen($str, 'UTF-8');
+			}
+			elseif (extension_loaded('mbstring'))
+			{
+				$chars = mb_strlen($str, 'UTF-8');
+			}
+		}
+
+		// We might already have this set for UTF-8
+		isset($chars) || $chars = static::strlen($str);
+
+		$output = '=?' . $this->charset . '?Q?';
+		for ($i = 0, $length = static::strlen($output); $i < $chars; $i ++)
+		{
+			$chr = ($this->charset === 'UTF-8' && ICONV_ENABLED === true) ? '=' . implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2)) : '=' . strtoupper(bin2hex($str[$i]));
+
+			// RFC 2045 sets a limit of 76 characters per line.
+			// We'll append ?= to the end of each line though.
+			if ($length + ($l = static::strlen($chr)) > 74)
+			{
+				$output .= '?=' . $this->CRLF // EOL
+						. ' =?' . $this->charset . '?Q?' . $chr; // New line
+				$length  = 6 + static::strlen($this->charset) + $l; // Reset the length for the new line
+			}
+			else
+			{
+				$output .= $chr;
+				$length += $l;
+			}
+		}
+
+		// End the header
+		return $output . '?=';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send Email
+	 *
+	 * @param boolean $autoClear
+	 *
+	 * @return boolean
+	 */
+	public function send(Email $email, bool $autoClear = true, bool $reallySend = true)
+	{
+		if (! isset($this->headers['From']) && ! empty($this->fromEmail))
+		{
+			$this->setFrom($this->fromEmail, $this->fromName);
+		}
+
+		if (! isset($this->headers['From']))
+		{
+			throw EmailException::forNoFrom();
+		}
+
+		if ($this->replyToFlag === false)
+		{
+			$this->setReplyTo($this->headers['From']);
+		}
+
+		if (empty($this->recipients) && ! isset($this->headers['To']) && empty($this->BCCArray) && ! isset($this->headers['Bcc']) && ! isset($this->headers['Cc'])
+		)
+		{
+			throw EmailException::forNoRecipients();
+		}
+
+		$this->buildHeaders();
+
+		if ($this->BCCBatchMode && count($this->BCCArray) > $this->BCCBatchSize)
+		{
+			$this->batchBCCSend();
+
+			if ($autoClear)
+			{
+				$this->clear();
+			}
+
+			return true;
+		}
+
+		$this->buildMessage();
+		$result = $this->spoolEmail();
+
+		if ($result && $autoClear)
+		{
+			$this->clear();
+		}
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Batch Bcc Send. Sends groups of BCCs in batches
+	 */
+	public function batchBCCSend()
+	{
+		$float = $this->BCCBatchSize - 1;
+		$set   = '';
+		$chunk = [];
+
+		for ($i = 0, $c = count($this->BCCArray); $i < $c; $i ++)
+		{
+			if (isset($this->BCCArray[$i]))
+			{
+				$set .= ', ' . $this->BCCArray[$i];
+			}
+
+			if ($i === $float)
+			{
+				$chunk[] = static::substr($set, 1);
+				$float  += $this->BCCBatchSize;
+				$set     = '';
+			}
+
+			if ($i === $c - 1)
+			{
+				$chunk[] = static::substr($set, 1);
+			}
+		}
+
+		for ($i = 0, $c = count($chunk); $i < $c; $i ++)
+		{
+			unset($this->headers['Bcc']);
+
+			$bcc = $this->cleanEmail($this->stringToArray($chunk[$i]));
+
+			if ($this->protocol !== 'smtp')
+			{
+				$this->setHeader('Bcc', implode(', ', $bcc));
+			}
+			else
+			{
+				$this->BCCArray = $bcc;
+			}
+
+			$this->buildMessage();
+			$this->spoolEmail();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Unwrap special elements
+	 */
+	protected function unwrapSpecials()
+	{
+		$this->finalBody = preg_replace_callback(
+				'/\{unwrap\}(.*?)\{\/unwrap\}/si', [
+					$this,
+					'removeNLCallback',
+				], $this->finalBody
+		);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Strip line-breaks via callback
+	 *
+	 * @param string $matches
+	 *
+	 * @return string
+	 */
+	protected function removeNLCallback($matches)
+	{
+		if (strpos($matches[1], "\r") !== false || strpos($matches[1], "\n") !== false)
+		{
+			$matches[1] = str_replace(["\r\n", "\r", "\n"], '', $matches[1]);
+		}
+
+		return $matches[1];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Spool mail to the mail server
+	 *
+	 * @return boolean
+	 */
+	protected function spoolEmail()
+	{
+		$this->unwrapSpecials();
+
+		$protocol = $this->getProtocol();
+		$method   = 'sendWith' . ucfirst($protocol);
+		try
+		{
+			$success = $this->$method();
+		}
+		catch (\ErrorException $e)
+		{
+			$success = false;
+			$this->logger->error('Email: ' . $method . ' throwed ' . $e->getMessage());
+		}
+
+		if (! $success)
+		{
+			throw EmailException::forSendFailure($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol));
+		}
+
+		$this->setErrorMessage(lang('Email.sent', [$protocol]));
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Validate email for shell
+	 *
+	 * Applies stricter, shell-safe validation to email addresses.
+	 * Introduced to prevent RCE via sendmail's -f option.
+	 *
+	 * @see     https://github.com/codeigniter4/CodeIgniter/issues/4963
+	 * @see     https://gist.github.com/Zenexer/40d02da5e07f151adeaeeaa11af9ab36
+	 * @license https://creativecommons.org/publicdomain/zero/1.0/    CC0 1.0, Public Domain
+	 *
+	 * Credits for the base concept go to Paul Buonopane <paul@namepros.com>
+	 *
+	 * @param string &$email
+	 *
+	 * @return boolean
+	 */
+	protected function validateEmailForShell(&$email)
+	{
+		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
+		{
+			$email = static::substr($email, 0, ++ $atpos) . idn_to_ascii(
+							static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46
+			);
+		}
+
+		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send using mail()
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithMail()
+	{
+		if (is_array($this->recipients))
+		{
+			$this->recipients = implode(', ', $this->recipients);
+		}
+
+		// _validate_email_for_shell() below accepts by reference,
+		// so this needs to be assigned to a variable
+		$from = $this->cleanEmail($this->headers['Return-Path']);
+
+		if (! $this->validateEmailForShell($from))
+		{
+			return mail($this->recipients, $this->subject, $this->finalBody, $this->headerStr);
+		}
+
+		// most documentation of sendmail using the "-f" flag lacks a space after it, however
+		// we've encountered servers that seem to require it to be in place.
+		return mail($this->recipients, $this->subject, $this->finalBody, $this->headerStr, '-f ' . $from);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send using Sendmail
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithSendmail()
+	{
+		// _validate_email_for_shell() below accepts by reference,
+		// so this needs to be assigned to a variable
+		$from = $this->cleanEmail($this->headers['From']);
+		if ($this->validateEmailForShell($from))
+		{
+			$from = '-f ' . $from;
+		}
+		else
+		{
+			$from = '';
+		}
+
+		// is popen() enabled?
+		if (! function_usable('popen') || false === ($fp = @popen($this->mailPath . ' -oi ' . $from . ' -t', 'w')))
+		{
+			// server probably has popen disabled, so nothing we can do to get a verbose error.
+			return false;
+		}
+
+		fputs($fp, $this->headerStr);
+		fputs($fp, $this->finalBody);
+
+		$status = pclose($fp);
+
+		if ($status !== 0)
+		{
+			throw EmailException::forNosocket($status);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send using SMTP
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithSmtp()
+	{
+		if ($this->SMTPHost === '')
+		{
+			throw EmailException::forNoHostname();
+		}
+
+		if (! $this->SMTPConnect() || ! $this->SMTPAuthenticate())
+		{
+			return false;
+		}
+
+		if (! $this->sendCommand('from', $this->cleanEmail($this->headers['From'])))
+		{
+			$this->SMTPEnd();
+
+			return false;
+		}
+
+		foreach ($this->recipients as $val)
+		{
+			if (! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		foreach ($this->CCArray as $val)
+		{
+			if ($val !== '' && ! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		foreach ($this->BCCArray as $val)
+		{
+			if ($val !== '' && ! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		if (! $this->sendCommand('data'))
+		{
+			$this->SMTPEnd();
+
+			return false;
+		}
+
+		// perform dot transformation on any lines that begin with a dot
+		$this->sendData($this->headerStr . preg_replace('/^\./m', '..$1', $this->finalBody));
+
+		$this->sendData('.');
+		$reply = $this->getSMTPData();
+		$this->setErrorMessage($reply);
+
+		$this->SMTPEnd();
+
+		if (strpos($reply, '250') !== 0)
+		{
+			throw EmailException::forSMTPError($reply);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SMTP End
+	 *
+	 * Shortcut to send RSET or QUIT depending on keep-alive
+	 */
+	protected function SMTPEnd()
+	{
+		$this->sendCommand($this->SMTPKeepAlive ? 'reset' : 'quit');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SMTP Connect
+	 *
+	 * @return string
+	 */
+	protected function SMTPConnect()
+	{
+		if (is_resource($this->SMTPConnect))
+		{
+			return true;
+		}
+
+		$ssl = ($this->SMTPCrypto === 'ssl') ? 'ssl://' : '';
+
+		$this->SMTPConnect = fsockopen(
+				$ssl . $this->SMTPHost, $this->SMTPPort, $errno, $errstr, $this->SMTPTimeout
+		);
+
+		if (! is_resource($this->SMTPConnect))
+		{
+			throw EmailException::forSMTPError($errno . ' ' . $errstr);
+		}
+
+		stream_set_timeout($this->SMTPConnect, $this->SMTPTimeout);
+		$this->setErrorMessage($this->getSMTPData());
+
+		if ($this->SMTPCrypto === 'tls')
+		{
+			$this->sendCommand('hello');
+			$this->sendCommand('starttls');
+
+			$crypto = stream_socket_enable_crypto($this->SMTPConnect, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+
+			if ($crypto !== true)
+			{
+				throw EmailException::forSMTPError($this->getSMTPData());
+			}
+		}
+
+		return $this->sendCommand('hello');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send SMTP command
+	 *
+	 * @param string $cmd
+	 * @param string $data
+	 *
+	 * @return boolean
+	 */
+	protected function sendCommand($cmd, $data = '')
+	{
+		switch ($cmd)
+		{
+			case 'hello':
+				if ($this->SMTPAuth || $this->getEncoding() === '8bit')
+				{
+					$this->sendData('EHLO ' . $this->getHostname());
+				}
+				else
+				{
+					$this->sendData('HELO ' . $this->getHostname());
+				}
+
+				$resp = 250;
+				break;
+			case 'starttls':
+				$this->sendData('STARTTLS');
+				$resp = 220;
+				break;
+			case 'from':
+				$this->sendData('MAIL FROM:<' . $data . '>');
+				$resp = 250;
+				break;
+			case 'to':
+				if ($this->DSN)
+				{
+					$this->sendData('RCPT TO:<' . $data . '> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;' . $data);
+				}
+				else
+				{
+					$this->sendData('RCPT TO:<' . $data . '>');
+				}
+				$resp = 250;
+				break;
+			case 'data':
+				$this->sendData('DATA');
+				$resp = 354;
+				break;
+			case 'reset':
+				$this->sendData('RSET');
+				$resp = 250;
+				break;
+			case 'quit':
+				$this->sendData('QUIT');
+				$resp = 221;
+				break;
+		}
+
+		$reply = $this->getSMTPData();
+
+		$this->debugMessage[] = '<pre>' . $cmd . ': ' . $reply . '</pre>';
+
+		if ((int) static::substr($reply, 0, 3) !== $resp)
+		{
+			throw EmailException::forSMTPError($reply);
+		}
+
+		if ($cmd === 'quit')
+		{
+			fclose($this->SMTPConnect);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SMTP Authenticate
+	 *
+	 * @return boolean
+	 */
+	protected function SMTPAuthenticate()
+	{
+		if (! $this->SMTPAuth)
+		{
+			return true;
+		}
+
+		if ($this->SMTPUser === '' && $this->SMTPPass === '')
+		{
+			throw EmailException::forNoSMTPAuth();
+		}
+
+		$this->sendData('AUTH LOGIN');
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '503') === 0)    // Already authenticated
+		{
+			return true;
+		}
+		elseif (strpos($reply, '334') !== 0)
+		{
+			throw EmailException::forFailedSMTPLogin($reply);
+		}
+
+		$this->sendData(base64_encode($this->SMTPUser));
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '334') !== 0)
+		{
+			throw EmailException::forSMTPAuthUsername($reply);
+		}
+
+		$this->sendData(base64_encode($this->SMTPPass));
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '235') !== 0)
+		{
+			throw EmailException::forSMTPAuthPassword($reply);
+		}
+
+		if ($this->SMTPKeepAlive)
+		{
+			$this->SMTPAuth = false;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Send SMTP data
+	 *
+	 * @param string $data
+	 *
+	 * @return boolean
+	 */
+	protected function sendData($data)
+	{
+		$data .= $this->newline;
+		for ($written = $timestamp = 0, $length = static::strlen($data); $written < $length; $written += $result)
+		{
+			if (($result = fwrite($this->SMTPConnect, static::substr($data, $written))) === false)
+			{
+				break;
+			}
+			// See https://bugs.php.net/bug.php?id=39598 and http://php.net/manual/en/function.fwrite.php#96951
+			elseif ($result === 0)
+			{
+				if ($timestamp === 0)
+				{
+					$timestamp = time();
+				}
+				elseif ($timestamp < (time() - $this->SMTPTimeout))
+				{
+					$result = false;
+					break;
+				}
+
+				usleep(250000);
+				continue;
+			}
+			else
+			{
+				$timestamp = 0;
+			}
+		}
+
+		if ($result === false)
+		{
+			throw EmailException::forSMTPDataFailure($data);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get SMTP data
+	 *
+	 * @return string
+	 */
+	protected function getSMTPData()
+	{
+		$data = '';
+
+		while ($str = fgets($this->SMTPConnect, 512))
+		{
+			$data .= $str;
+
+			if ($str[3] === ' ')
+			{
+				break;
+			}
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Hostname
+	 *
+	 * There are only two legal types of hostname - either a fully
+	 * qualified domain name (eg: "mail.example.com") or an IP literal
+	 * (eg: "[1.2.3.4]").
+	 *
+	 * @link https://tools.ietf.org/html/rfc5321#section-2.3.5
+	 * @link http://cbl.abuseat.org/namingproblems.html
+	 *
+	 * @return string
+	 */
+	protected function getHostname()
+	{
+		if (isset($_SERVER['SERVER_NAME']))
+		{
+			return $_SERVER['SERVER_NAME'];
+		}
+
+		return isset($_SERVER['SERVER_ADDR']) ? '[' . $_SERVER['SERVER_ADDR'] . ']' : '[127.0.0.1]';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Debug Message
+	 *
+	 * @param array $include List of raw data chunks to include in the output
+	 *                       Valid options are: 'headers', 'subject', 'body'
+	 *
+	 * @return string
+	 */
+	public function printDebugger($include = ['headers', 'subject', 'body'])
+	{
+		$msg = implode('', $this->debugMessage);
+
+		// Determine which parts of our raw data needs to be printed
+		$raw_data                      = '';
+		is_array($include) || $include = [$include];
+
+		in_array('headers', $include, true) && $raw_data  = htmlspecialchars($this->headerStr) . "\n";
+		in_array('subject', $include, true) && $raw_data .= htmlspecialchars($this->subject) . "\n";
+		in_array('body', $include, true) && $raw_data    .= htmlspecialchars($this->finalBody);
+
+		return $msg . ($raw_data === '' ? '' : '<pre>' . $raw_data . '</pre>');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set Message
+	 *
+	 * @param string $msg
+	 */
+	protected function setErrorMessage($msg)
+	{
+		$this->debugMessage[] = $msg . '<br />';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Mime Types
+	 *
+	 * @param string $ext
+	 *
+	 * @return string
+	 */
+	protected function mimeTypes($ext = '')
+	{
+		$mime = Mimes::guessTypeFromExtension(strtolower($ext));
+
+		return ! empty($mime) ? $mime : 'application/x-unknown-content-type';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Destructor
+	 */
+	public function __destruct()
+	{
+		is_resource($this->SMTPConnect) && $this->sendCommand('quit');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Byte-safe strlen()
+	 *
+	 * @param string $str
+	 *
+	 * @return integer
+	 */
+	protected static function strlen($str)
+	{
+		return (static::$func_overload) ? mb_strlen($str, '8bit') : strlen($str);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Byte-safe substr()
+	 *
+	 * @param string       $str
+	 * @param integer      $start
+	 * @param integer|null $length
+	 *
+	 * @return string
+	 */
+	protected static function substr($str, $start, $length = null)
+	{
+		if (static::$func_overload)
+		{
+			return mb_substr($str, $start, $length, '8bit');
+		}
+
+		return isset($length) ? substr($str, $start, $length) : substr($str, $start);
+	}
+
+}
diff --git a/system/Email/TransporterInterface.php b/system/Email/TransporterInterface.php
new file mode 100644
index 0000000000..62c6324167
--- /dev/null
+++ b/system/Email/TransporterInterface.php
@@ -0,0 +1,60 @@
+<?php namespace CodeIgniter\Email;
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014-2018 British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     CodeIgniter Dev Team
+ * @copyright  2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
+ * @license    https://opensource.org/licenses/MIT	MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 3.0.0
+ * @filesource
+ */
+
+/**
+ * Expected behavior of an email transporter used with CodeIgniter.
+ */
+interface TransporterInterface
+{
+
+	/**
+	 * Send an email
+	 *
+	 * @param Email The email to send
+	 * @param boolean                 $autoClear  Should old session data be destroyed?
+	 * @param boolean                 $reallySend Should the email really be sent? or everything but that
+	 */
+	public function send(Email $email, bool $autoClear = true, bool $reallySend = true);
+
+	/**
+	 * Which protocol is this a handler for?
+	 */
+	public function getProtocol() : string;
+
+	//--------------------------------------------------------------------
+}
diff --git a/tests/_support/Email/ci-logo-not-readable.png b/tests/_support/Email/ci-logo-not-readable.png
new file mode 100644
index 0000000000..34fb010828
Binary files /dev/null and b/tests/_support/Email/ci-logo-not-readable.png differ
diff --git a/tests/_support/Email/ci-logo.png b/tests/_support/Email/ci-logo.png
new file mode 100644
index 0000000000..34fb010828
Binary files /dev/null and b/tests/_support/Email/ci-logo.png differ
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index c8503ec2ff..82ad3cf5fb 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -57,14 +57,14 @@ class ServicesTest extends \CodeIgniter\Test\CIUnitTestCase
 
 	public function testNewEmail()
 	{
-		$actual = Services::email();
-		$this->assertInstanceOf(\CodeIgniter\Email\Email::class, $actual);
+		$actual = Services::transporter();
+		$this->assertInstanceOf(\CodeIgniter\Email\TransporterInterface::class, $actual);
 	}
 
-	public function testNewUnsharedEmailWithEmptyConfig()
+	public function testNewUnsharedEmail()
 	{
-		$actual = Services::email(null, false);
-		$this->assertInstanceOf(\CodeIgniter\Email\Email::class, $actual);
+		$actual = Services::transporter(null, false);
+		$this->assertInstanceOf(\CodeIgniter\Email\TransporterInterface::class, $actual);
 	}
 
 	public function testNewUnsharedEmailWithNonEmptyConfig()
diff --git a/tests/system/Email/TransporterTest.php b/tests/system/Email/TransporterTest.php
new file mode 100644
index 0000000000..30b1537336
--- /dev/null
+++ b/tests/system/Email/TransporterTest.php
@@ -0,0 +1,583 @@
+<?php namespace CodeIgniter\Email;
+
+/**
+ * This is Jim's original work on the refactored Email class tests
+ * and should be merged into the existing tests (which it predates)
+ * when the refactor is ready.
+ */
+
+class TransporterTest extends \CodeIgniter\Test\CIUnitTestCase
+{
+	public function tearDown()
+	{
+		// restore file permissions after unreadable attachment test
+		$thefile = SUPPORTPATH . 'Email/ci-logo-not-readable.png';
+		chmod($thefile, 0664);
+	}
+
+	//--------------------------------------------------------------------
+	// Test constructor & configs
+
+	public function testDefaultWithCustomConfig()
+	{
+		$email = new Email(['validate' => true, 'truth' => 'out there']);
+		$this->assertTrue($email->wordWrap);
+		$this->assertEquals(76, $email->wrapChars);
+		$this->assertEquals('text', $email->mailType);
+		$this->assertEquals('UTF-8', $email->charset);
+		$this->assertEquals('', $email->altMessage);
+		$this->assertTrue($email->validate);
+		$this->assertNull($email->truth);
+	}
+
+	public function testDefaultWithEmptyConfig()
+	{
+		$email = new Email();
+		$this->assertTrue($email->wordWrap);
+		$this->assertEquals(76, $email->wrapChars);
+		$this->assertEquals('text', $email->mailType);
+		$this->assertEquals('UTF-8', $email->charset);
+		$this->assertEquals('', $email->altMessage);
+		$this->assertFalse($email->validate); // this one differs
+		$this->assertNull($email->truth);
+	}
+
+	//--------------------------------------------------------------------
+	// Test setting the "from" property
+
+	public function testSetFromEmailOnly()
+	{
+		$email = new Email();
+		$email->setFrom('leia@alderaan.org');
+		$this->assertEquals(' <leia@alderaan.org>', $email->getHeader('From'));
+		$this->assertEquals('<leia@alderaan.org>', $email->getHeader('Return-Path'));
+	}
+
+	public function testSetFromEmailAndName()
+	{
+		$email = new Email();
+		$email->setFrom('leia@alderaan.org', 'Princess Leia');
+		$this->assertEquals('"Princess Leia" <leia@alderaan.org>', $email->getHeader('From'));
+		$this->assertEquals('<leia@alderaan.org>', $email->getHeader('Return-Path'));
+	}
+
+	public function testSetFromEmailAndFunkyName()
+	{
+		$email = new Email();
+		$email->setFrom('<leia@alderaan.org>', 'Princess Leià');
+		$this->assertEquals('=?UTF-8?Q?Princess=20Lei=C3=A0?= <leia@alderaan.org>', $email->getHeader('From'));
+		$this->assertEquals('<leia@alderaan.org>', $email->getHeader('Return-Path'));
+	}
+
+	public function testSetFromWithValidation()
+	{
+		$email = new Email(['validation' => true]);
+		$email->setFrom('leia@alderaan.org', 'Princess Leia');
+		$this->assertEquals('"Princess Leia" <leia@alderaan.org>', $email->getHeader('From'));
+		$this->assertEquals('<leia@alderaan.org>', $email->getHeader('Return-Path'));
+	}
+
+	public function testSetFromWithValidationAndReturnPath()
+	{
+		$email = new Email(['validation' => true]);
+		$email->setFrom('leia@alderaan.org', 'Princess Leia', 'leia@alderaan.org');
+		$this->assertEquals('"Princess Leia" <leia@alderaan.org>', $email->getHeader('From'));
+		$this->assertEquals('<leia@alderaan.org>', $email->getHeader('Return-Path'));
+	}
+
+	public function testSetFromWithValidationAndDifferentReturnPath()
+	{
+		$email = new Email(['validation' => true]);
+		$email->setFrom('leia@alderaan.org', 'Princess Leia', 'padme@naboo.org');
+		$this->assertEquals('"Princess Leia" <leia@alderaan.org>', $email->getHeader('From'));
+		$this->assertEquals('<padme@naboo.org>', $email->getHeader('Return-Path'));
+	}
+
+	//--------------------------------------------------------------------
+	// Test setting the "replyTo" property
+
+	public function testSetReplyToEmailOnly()
+	{
+		$email = new Email();
+		$email->setReplyTo('leia@alderaan.org');
+		$this->assertEquals(' <leia@alderaan.org>', $email->getHeader('Reply-To'));
+	}
+
+	public function testSetReplyToEmailAndName()
+	{
+		$email = new Email();
+		$email->setReplyTo('leia@alderaan.org', 'Princess Leia');
+		$this->assertEquals('"Princess Leia" <leia@alderaan.org>', $email->getHeader('Reply-To'));
+	}
+
+	public function testSetReplyToEmailAndFunkyName()
+	{
+		$email = new Email();
+		$email->setReplyTo('<leia@alderaan.org>', 'Princess Leià');
+		$this->assertEquals('=?UTF-8?Q?Princess=20Lei=C3=A0?= <leia@alderaan.org>', $email->getHeader('Reply-To'));
+	}
+
+	public function testSetReplyToWithValidation()
+	{
+		$email = new Email(['validation' => true]);
+		$email->setReplyTo('leia@alderaan.org', 'Princess Leia');
+		$this->assertEquals('"Princess Leia" <leia@alderaan.org>', $email->getHeader('Reply-To'));
+	}
+
+	public function testSetReplyToWithValidationAndReturnPath()
+	{
+		$email = new Email(['validation' => true]);
+		$email->setReplyTo('leia@alderaan.org', 'Princess Leia', 'leia@alderaan.org');
+		$this->assertEquals('"Princess Leia" <leia@alderaan.org>', $email->getHeader('Reply-To'));
+	}
+
+	public function testSetReplyToWithValidationAndDifferentReturnPath()
+	{
+		$email = new Email(['validation' => true]);
+		$email->setReplyTo('leia@alderaan.org', 'Princess Leia', 'padme@naboo.org');
+		$this->assertEquals('"Princess Leia" <leia@alderaan.org>', $email->getHeader('Reply-To'));
+	}
+
+	//--------------------------------------------------------------------
+	// Test setting the "to" property (recipients)
+
+	public function testSetToBasic()
+	{
+		$email = new Email();
+		$email->setTo('Luke <luke@tatooine.org>');
+		$this->assertTrue(in_array('luke@tatooine.org', $email->recipients));
+	}
+
+	public function testSetToArray()
+	{
+		$email = new Email();
+		$email->setTo(['Luke <luke@tatooine.org>', 'padme@naboo.org']);
+		$this->assertTrue(in_array('luke@tatooine.org', $email->recipients));
+		$this->assertTrue(in_array('padme@naboo.org', $email->recipients));
+	}
+
+	public function testSetToValid()
+	{
+		$email = new Email(['validate' => true]);
+		$email->setTo('Luke <luke@tatooine.org>');
+		$this->assertTrue(in_array('luke@tatooine.org', $email->recipients));
+	}
+
+	public function testSetToInvalid()
+	{
+		$email = new Email(['validate' => false]);
+		$email->setTo('Luke <luke@tatooine>');
+		$this->assertTrue(in_array('luke@tatooine', $email->recipients));
+	}
+
+	/**
+	 * @expectedException \CodeIgniter\Email\Exceptions\EmailException
+	 */
+	public function testDontSetToInvalid()
+	{
+		$email = new Email(['validate' => true]);
+		$email->setTo('Luke <luke@tatooine>');
+	}
+
+	public function testSetToHeader()
+	{
+		$email = new Email(['validate' => true]);
+		$email->setProtocol('sendmail');
+		$email->setTo('Luke <luke@tatooine.org>');
+		$this->assertTrue(in_array('luke@tatooine.org', $email->recipients));
+		$this->assertEquals('luke@tatooine.org', $email->getHeader('To'));
+	}
+
+	//--------------------------------------------------------------------
+	// Test setting the "cc" property (copied recipients)
+
+	public function testSetCCBasic()
+	{
+		$email = new Email();
+		$email->setCC('Luke <luke@tatooine.org>');
+		$this->assertTrue(in_array('luke@tatooine.org', $email->CCArray));
+	}
+
+	public function testSetCCArray()
+	{
+		$email = new Email();
+		$email->setCC(['Luke <luke@tatooine.org>', 'padme@naboo.org']);
+		$this->assertTrue(in_array('luke@tatooine.org', $email->CCArray));
+		$this->assertTrue(in_array('padme@naboo.org', $email->CCArray));
+		$this->assertEquals('luke@tatooine.org, padme@naboo.org', $email->getHeader('Cc'));
+	}
+
+	public function testSetCCValid()
+	{
+		$email = new Email(['validate' => true]);
+		$email->setCC('Luke <luke@tatooine.org>');
+		$this->assertTrue(in_array('luke@tatooine.org', $email->CCArray));
+	}
+
+	public function testSetCCInvalid()
+	{
+		$email = new Email(['validate' => false]);
+		$email->setCC('Luke <luke@tatooine>');
+		$this->assertTrue(in_array('luke@tatooine', $email->CCArray));
+	}
+
+	/**
+	 * @expectedException \CodeIgniter\Email\Exceptions\EmailException
+	 */
+	public function testDontSetCCInvalid()
+	{
+		$email = new Email(['validate' => true]);
+		$email->setCC('Luke <luke@tatooine>');
+	}
+
+	public function testSetCCHeader()
+	{
+		$email = new Email(['validate' => true]);
+		$email->setCC('Luke <luke@tatooine.org>');
+		$this->assertTrue(in_array('luke@tatooine.org', $email->CCArray));
+		$this->assertEquals('luke@tatooine.org', $email->getHeader('Cc'));
+	}
+
+	public function testSetCCForSMTP()
+	{
+		$email = new Email(['validate' => true]);
+		$email->setProtocol('smtp');
+		$email->setCC('Luke <luke@tatooine.org>');
+		$this->assertTrue(in_array('luke@tatooine.org', $email->CCArray));
+		$this->assertEquals('luke@tatooine.org', $email->getHeader('Cc'));
+	}
+
+	//--------------------------------------------------------------------
+	// Test setting the "bcc" property (blind-copied recipients)
+
+	public function testSetBCCBasic()
+	{
+		$email = new Email();
+		$email->setBCC('Luke <luke@tatooine.org>');
+		$this->assertTrue(in_array('luke@tatooine.org', $email->BCCArray));
+	}
+
+	public function testSetBCCArray()
+	{
+		$email = new Email();
+		$email->setBCC(['Luke <luke@tatooine.org>', 'padme@naboo.org']);
+		$this->assertTrue(in_array('luke@tatooine.org', $email->BCCArray));
+		$this->assertTrue(in_array('padme@naboo.org', $email->BCCArray));
+		$this->assertEquals('luke@tatooine.org, padme@naboo.org', $email->getHeader('Bcc'));
+	}
+
+	public function testSetBCCValid()
+	{
+		$email = new Email(['validate' => true]);
+		$email->setBCC('Luke <luke@tatooine.org>');
+		$this->assertTrue(in_array('luke@tatooine.org', $email->BCCArray));
+	}
+
+	public function testSetBCCInvalid()
+	{
+		$email = new Email(['validate' => false]);
+		$email->setBCC('Luke <luke@tatooine>');
+		$this->assertTrue(in_array('luke@tatooine', $email->BCCArray));
+	}
+
+	/**
+	 * @expectedException \CodeIgniter\Email\Exceptions\EmailException
+	 */
+	public function testDontSetBCCInvalid()
+	{
+		$email = new Email(['validate' => true]);
+		$email->setBCC('Luke <luke@tatooine>');
+	}
+
+	public function testSetBCCHeader()
+	{
+		$email = new Email(['validate' => true]);
+		$email->setBCC('Luke <luke@tatooine.org>');
+		$this->assertTrue(in_array('luke@tatooine.org', $email->BCCArray));
+		$this->assertEquals('luke@tatooine.org', $email->getHeader('Bcc'));
+	}
+
+	public function testSetBCCForSMTP()
+	{
+		$email = new Email(['validate' => true]);
+		$email->setProtocol('smtp');
+		$email->setBCC('Luke <luke@tatooine.org>');
+		$this->assertTrue(in_array('luke@tatooine.org', $email->BCCArray));
+		$this->assertEquals('luke@tatooine.org', $email->getHeader('Bcc'));
+	}
+
+	public function testSetBCCBatch()
+	{
+		$email = new Email();
+		$email->setBCC(['Luke <luke@tatooine.org>', 'padme@naboo.org'], 2);
+		$this->assertTrue(in_array('luke@tatooine.org', $email->BCCArray));
+		$this->assertTrue(in_array('padme@naboo.org', $email->BCCArray));
+		$this->assertEquals('luke@tatooine.org, padme@naboo.org', $email->getHeader('Bcc'));
+	}
+
+	public function testSetBCCBiggerBatch()
+	{
+		$email = new Email();
+		$email->setBCC(['Luke <luke@tatooine.org>', 'padme@naboo.org', 'leia@alderaan.org'], 2);
+		$this->assertTrue(in_array('luke@tatooine.org', $email->BCCArray));
+		$this->assertTrue(in_array('padme@naboo.org', $email->BCCArray));
+		$this->assertEquals('luke@tatooine.org, padme@naboo.org, leia@alderaan.org', $email->getHeader('Bcc'));
+	}
+
+	//--------------------------------------------------------------------
+	// Test setting the subject
+
+	public function testSetSubject()
+	{
+		$email    = new Email();
+		$original = 'Just a silly love song';
+		$expected = '=?UTF-8?Q?Just=20a=20silly=20love=20so?==?UTF-8?Q?ng?=';
+		$email->setSubject($original);
+		$this->assertEquals($expected, $email->getHeader('Subject'));
+	}
+
+	public function testSetEncodedSubject()
+	{
+		$email    = new Email();
+		$original = 'Just a silly Leià song';
+		$expected = '=?UTF-8?Q?Just=20a=20silly=20Lei=C3=A0=20s?==?UTF-8?Q?ong?=';
+		$email->setSubject($original);
+		$this->assertEquals($expected, $email->getHeader('Subject'));
+	}
+
+	//--------------------------------------------------------------------
+	// Test setting the body
+
+	public function testSetMessage()
+	{
+		$email    = new Email();
+		$original = 'Just a silly love song';
+		$expected = $original;
+		$email->setMessage($original);
+		$this->assertEquals($expected, $email->body);
+	}
+
+	public function testSetMultilineMessage()
+	{
+		$email    = new Email();
+		$original = "Just a silly love song\r\nIt's just two lines long";
+		$expected = "Just a silly love song\nIt's just two lines long";
+		$email->setMessage($original);
+		$this->assertEquals($expected, $email->body);
+	}
+
+	//--------------------------------------------------------------------
+	// Test setting the alternate message
+
+	public function testSetAltMessage()
+	{
+		$email    = new Email();
+		$original = 'Just a silly love song';
+		$expected = $original;
+		$email->setAltMessage($original);
+		$this->assertEquals($expected, $email->altMessage);
+	}
+
+	public function testSetMultilineAltMessage()
+	{
+		$email    = new Email();
+		$original = "Just a silly love song\r\nIt's just two lines long";
+		$email->setAltMessage($original);
+		$this->assertEquals($original, $email->altMessage);
+	}
+
+	//--------------------------------------------------------------------
+	// Test clearing the email
+
+	public function testClearing()
+	{
+		$email = new Email();
+		$email->setFrom('leia@alderaan.org');
+		$this->assertEquals(' <leia@alderaan.org>', $email->getHeader('From'));
+		$email->setTo('luke@tatooine.org');
+		$this->assertTrue(in_array('luke@tatooine.org', $email->recipients));
+
+		$email->clear(true);
+		$this->assertEquals('', $email->getHeader('From'));
+		$this->assertEquals('', $email->getHeader('To'));
+
+		$email->setFrom('leia@alderaan.org');
+		$this->assertEquals(' <leia@alderaan.org>', $email->getHeader('From'));
+	}
+
+	//--------------------------------------------------------------------
+	// Test clearing the email
+
+	public function testAttach()
+	{
+		$email = new Email();
+		$email->setFrom('leia@alderaan.org');
+		$email->setTo('luke@tatooine.org');
+
+		$email->attach(SUPPORTPATH . 'Images/ci-logo.png');
+		$this->assertEquals(1, count($email->attachments));
+	}
+
+	/**
+	 * @expectedException \CodeIgniter\Email\Exceptions\EmailException
+	 */
+	public function testAttachNotThere()
+	{
+		$email = new Email();
+		$email->setFrom('leia@alderaan.org');
+		$email->setTo('luke@tatooine.org');
+
+		$email->attach(SUPPORTPATH . 'Email/ci-logo-not-there.png');
+		$this->assertEquals(1, count($email->attachments));
+	}
+
+	/**
+	 * @expectedException \CodeIgniter\Email\Exceptions\EmailException
+	 */
+	public function testAttachNotReadable()
+	{
+		$email = new Email();
+		$email->setFrom('leia@alderaan.org');
+		$email->setTo('luke@tatooine.org');
+
+		$thefile = SUPPORTPATH . 'Email/ci-logo-not-readable.png';
+		chmod($thefile, 0222);
+		$email->attach($thefile);
+	}
+
+	public function testAttachContent()
+	{
+		$email = new Email();
+		$email->setFrom('leia@alderaan.org');
+		$email->setTo('luke@tatooine.org');
+
+		$content = 'This is bogus content';
+		$email->attach($content, '', 'truelies.txt', 'text/html');
+		$this->assertEquals(1, count($email->attachments));
+	}
+
+	//--------------------------------------------------------------------
+	// Test changing the protocol
+
+	public function testSetProtocol()
+	{
+		$email = new Email();
+		$this->assertEquals('mail', $email->getProtocol()); // default
+		$email->setProtocol('smtp');
+		$this->assertEquals('smtp', $email->getProtocol());
+		$email->setProtocol('mail');
+		$this->assertEquals('mail', $email->getProtocol());
+	}
+
+	/**
+	 * @expectedException \CodeIgniter\Email\Exceptions\EmailException
+	 */
+	public function testSetBadProtocol()
+	{
+		$email = new Email();
+		$email->setProtocol('mind-reader');
+	}
+
+	//--------------------------------------------------------------------
+	// Test word wrap
+
+	public function testWordWrapVanilla()
+	{
+		$email    = new Email();
+		$original = 'This is a short line.';
+		$expected = $original;
+		$this->assertEquals($expected, rtrim($email->wordWrap($original)));
+	}
+
+	public function testWordWrapShortLines()
+	{
+		$email    = new Email();
+		$original = 'This is a short line.';
+		$expected = "This is a short\r\nline.";
+		$this->assertEquals($expected, rtrim($email->wordWrap($original, 16)));
+	}
+
+	public function testWordWrapLines()
+	{
+		$email    = new Email();
+		$original = "This is a\rshort line.";
+		$expected = "This is a\r\nshort line.";
+		$this->assertEquals($expected, rtrim($email->wordWrap($original)));
+	}
+
+	public function testWordWrapUnwrap()
+	{
+		$email    = new Email();
+		$original = 'This is a {unwrap}not so short{/unwrap} line.';
+		$expected = 'This is a not so short line.';
+		$this->assertEquals($expected, rtrim($email->wordWrap($original)));
+	}
+
+	public function testWordWrapUnwrapWrapped()
+	{
+		$email    = new Email();
+		$original = 'This is a {unwrap}not so short or something{/unwrap} line.';
+		$expected = "This is a\r\nnot so short or something\r\nline.";
+		$this->assertEquals($expected, rtrim($email->wordWrap($original, 16)));
+	}
+
+	public function testWordWrapConsolidate()
+	{
+		$email    = new Email();
+		$original = "This is\r\na not so short or something\r\nline.";
+		$expected = "This is\r\na not so short\r\nor something\r\nline.";
+		$this->assertEquals($expected, rtrim($email->wordWrap($original, 16)));
+	}
+
+	public function testWordWrapLongWord()
+	{
+		$email    = new Email();
+		$original = "This is part of interoperabilities isn't it?";
+		$expected = "This is part of\r\ninteroperabilit\r\nies\r\nisn't it?";
+		$this->assertEquals($expected, rtrim($email->wordWrap($original, 16)));
+	}
+
+	public function testWordWrapURL()
+	{
+		$email    = new Email();
+		$original = "This is part of http://interoperabilities.com isn't it?";
+		$expected = "This is part of\r\nhttp://interoperabilities.com\r\nisn't it?";
+		$this->assertEquals($expected, rtrim($email->wordWrap($original, 16)));
+	}
+
+	//--------------------------------------------------------------------
+	// Test support methods
+
+	public function testValidEmail()
+	{
+		$email = new Email();
+		$this->assertTrue($email->isValidEmail('"Princess Leia" <leia@alderaan.org>'));
+		$this->assertTrue($email->isValidEmail('leia@alderaan.org'));
+		$this->assertTrue($email->isValidEmail('<princess.leia@alderaan.org>'));
+		$this->assertFalse($email->isValidEmail('<leia_at_alderaan.org>'));
+		$this->assertFalse($email->isValidEmail('<leia@alderaan>'));
+		$this->assertFalse($email->isValidEmail('<leia.alderaan@org>'));
+	}
+
+	public function testMagicMethods()
+	{
+		$email           = new Email();
+		$email->protocol = 'mail';
+		$this->assertEquals('mail', $email->protocol);
+	}
+
+	//--------------------------------------------------------------------
+	// "Test" sending the email
+
+	public function testFakeSend()
+	{
+		$email = new Email();
+		$email->setFrom('leia@alderaan.org');
+		$email->setTo('Luke <luke@tatooine>');
+		$email->setSubject('Hi there');
+
+		// make sure the second parameter below is "false"
+		// or you will trigger email for real!
+		$this->assertTrue($email->send(true, false));
+	}
+}