diff --git a/include/class.mailer.php b/include/class.mailer.php
new file mode 100644
index 0000000000000000000000000000000000000000..d2e10961ad54339ead528ea6b3a6d7cdfc6032bc
--- /dev/null
+++ b/include/class.mailer.php
@@ -0,0 +1,180 @@
+<?php
+/*********************************************************************
+    class.mailer.php
+
+    osTicket mailer 
+
+    It's mainly PEAR MAIL wrapper for now (more improvements planned).
+
+    Peter Rotich <peter@osticket.com>
+    Copyright (c)  2006-2012 osTicket
+    http://www.osticket.com
+
+    Released under the GNU General Public License WITHOUT ANY WARRANTY.
+    See LICENSE.TXT for details.
+
+    vim: expandtab sw=4 ts=4 sts=4:
+**********************************************************************/
+
+include_once(INCLUDE_DIR.'class.email.php');
+
+class Mailer {
+
+    var $email;
+
+    var $ht = array();
+    var $attachments = array();
+
+    var $smtp = array();
+    var $eol="\n";
+    
+    function Mailer($email=null, $options=null) {
+        global $cfg;
+       
+        if(is_object($email) && $email->isSMTPEnabled() && ($info=$email->getSMTPInfo())) { //is SMTP enabled for the current email?
+            $this->smtp = $info;
+        } elseif($cfg && ($e=$cfg->getDefaultSMTPEmail()) && $e->isSMTPEnabled()) { //What about global SMTP setting?
+            $this->smtp = $e->getSMTPInfo();
+            if(!$e->allowSpoofing() || !$email)
+                $email = $e;
+        } elseif(!$email && $cfg && ($e=$cfg->getDefaultEmail())) {
+            if($e->isSMTPEnabled() && ($info=$email->getSMTPInfo()))
+                $this->smtp = $info;
+            $email = $e;
+        }
+
+        $this->email = $email;
+        $this->attachments = array();
+    }
+
+    function getEOL() {
+        return $this->eol;
+    }
+
+    function getEmail() {
+        return $this->email;
+    }
+    
+    function getSMTPInfo() {
+        return $this->smtp;
+    }
+    /* FROM Address */
+    function setFromAddress($from) {
+        $this->ht['from'] = $from;
+    }
+
+    function getFromAddress() {
+
+        if(!$this->ht['from'] && $this->getEmail())
+            $this->ht['from'] =$this->getEmail()->getAddress();
+
+        return $this->ht['from'];
+    }
+
+    /* attachments */
+    function getAttachments() {
+        return $this->attachments;
+    }
+
+    function addAttachment($attachment) {
+        $this->attachments[] = $attachment;
+    }
+
+    function addAttachments($attachments) {
+        $this->attachments = array_merge($this->attachments, $attachments);
+    }
+
+    function send($to, $subject, $message, $options=null) {
+        global $ost;
+
+        //Get the goodies
+        require_once (PEAR_DIR.'Mail.php'); // PEAR Mail package
+        require_once (PEAR_DIR.'Mail/mime.php'); // PEAR Mail_Mime packge
+
+        //do some cleanup
+        $to=preg_replace("/(\r\n|\r|\n)/s",'', trim($to));
+        $subject=stripslashes(preg_replace("/(\r\n|\r|\n)/s",'', trim($subject)));
+        $body = stripslashes(preg_replace("/(\r\n|\r)/s", "\n", trim($message)));
+
+        /* Message ID - generated for each outgoing email */
+        $messageId = sprintf('<%s%d-%s>', Misc::randCode(6), time(),
+                ($this->getEmail()?$this->getEmail()->getEmail():'@osTicketMailer'));
+
+        $headers = array (
+                'From' => $this->getFromAddress(),
+                'To' => $to,
+                'Subject' => $subject,
+                'Date'=> date('D, d M Y H:i:s O'),
+                'Message-ID' => $messageId,
+                'X-Mailer' =>'osTicket Mailer',
+                'Content-Type' => 'text/html; charset="UTF-8"'
+                );
+
+        $mime = new Mail_mime();
+        $mime->setTXTBody($body);
+        //XXX: Attachments
+        if(($attachments=$this->getAttachments())) {
+            foreach($attachments as $attachment) {
+                if($attachment['file_id'] && ($file=AttachmentFile::lookup($attachment['file_id'])))
+                    $mime->addAttachment($file->getData(),$file->getType(), $file->getName(),false);
+                elseif($attachment['file'] &&  file_exists($attachment['file']) && is_readable($attachment['file']))
+                    $mime->addAttachment($attachment['file'],$attachment['type'],$attachment['name']);
+            }
+        }
+        
+        //Desired encodings...
+        $encodings=array(
+                'head_encoding' => 'quoted-printable',
+                'text_encoding' => 'quoted-printable',
+                'html_encoding' => 'base64',
+                'html_charset'  => 'utf-8',
+                'text_charset'  => 'utf-8',
+                'head_charset'  => 'utf-8'
+                );
+        //encode the body
+        $body = $mime->get($encodings);
+        //encode the headers.
+        $headers = $mime->headers($headers);
+        if(($smtp=$this->getSMTPInfo())) { //Send via SMTP
+            $mail = mail::factory('smtp',
+                    array ('host' => $smtp['host'],
+                           'port' => $smtp['port'],
+                           'auth' => $smtp['auth']?true:false,
+                           'username' => $smtp['username'],
+                           'password' => $smtp['password'],
+                           'timeout'  =>20,
+                           'debug' => false,
+                           ));
+
+            $result = $mail->send($to, $headers, $body);
+            if(!PEAR::isError($result))
+                return $messageId;
+
+            $alert=sprintf("Unable to email via SMTP:%s:%d [%s]\n\n%s\n",
+                    $smtp['host'], $smtp['port'], $smtp['username'], $result->getMessage());
+            $this->logError($alert);
+        }
+
+        //No SMTP or it failed....use php's native mail function.
+        $mail = mail::factory('mail');
+        return PEAR::isError($mail->send($to, $headers, $body))?false:$messageId;
+
+    }
+
+    function logError($error) {
+        global $ost;
+        //NOTE: Admin alert overwrite - don't email when having email trouble!
+        $ost->logError('Mailer Error', $error, false);
+    }
+
+    /******* Static functions ************/
+
+    //Emails using native php mail function - if DB connection doesn't exist.
+    //Don't use this function if you can help it.
+    function sendmail($to, $subject, $message, $from) {
+        $mailer = new Mailer();
+        $mailer->setFromAddress($from);
+        return $mailer->send($to, $subject, $message);
+    }
+}
+?>