diff --git a/app/Tygh/Mailer.php b/app/Tygh/Mailer.php
index 92f5a32..eeb4ace 100644
--- a/app/Tygh/Mailer.php
+++ b/app/Tygh/Mailer.php
@@ -13,7 +13,6 @@
 ****************************************************************************/
 
 namespace Tygh;
-use Tygh\Tools\Url;
 
 class Mailer extends \PHPMailer
 {
@@ -50,10 +49,15 @@ class Mailer extends \PHPMailer
 
         foreach (array('reply_to', 'to', 'cc') as $way) {
             if (!empty($params[$way])) {
-                foreach ((array) $params[$way] as $way_ar) {
-                    ${$way}[] = !empty($company_data[$way_ar]) ? $company_data[$way_ar] : $way_ar;
+                if (!is_array($params[$way])) {
+                    ${$way}[] = !empty($company_data[$params[$way]]) ? $company_data[$params[$way]] : $params[$way];
+                } else {
+                    foreach ($params[$way] as $way_ar) {
+                        ${$way}[] = !empty($company_data[$way_ar]) ? $company_data[$way_ar] : $way_ar;
+                    }
                 }
             }
+
         }
 
         if (!empty($reply_to)) {
@@ -95,7 +99,6 @@ class Mailer extends \PHPMailer
         if (empty($to) || empty($from['email'])) {
             return false;
         }
-        $from['email'] = Url::normalizeEmail($from['email']);
 
         $mailer->SetFrom($from['email'], $from['name']);
         $mailer->IsHTML(isset($params['is_html']) ? $params['is_html'] : true);
@@ -244,7 +247,10 @@ class Mailer extends \PHPMailer
     public function formatEmails($emails)
     {
         $result = array();
-        foreach ((array) $emails as $email) {
+        if (!is_array($emails)) {
+            $emails = array($emails);
+        }
+        foreach ($emails as $email) {
             $email = str_replace(';', ',', $email);
             $res = explode(',', $email);
             foreach ($res as &$v) {
@@ -253,16 +259,7 @@ class Mailer extends \PHPMailer
             $result = array_merge($result, $res);
         }
 
-        $result = array_unique($result);
-
-        foreach ($result as $k => $email) {
-            $result[$k] = Url::normalizeEmail($email);
-            if (!$result[$k]) {
-                unset($result[$k]);
-            }
-        }
-
-        return $result;
+        return array_unique($result);
     }
 
     public static function ValidateAddress($email, $method = 'auto')