diff --git a/application/common/library/Email.php b/application/common/library/Email.php
index 8d186fc3..458ae09d 100644
--- a/application/common/library/Email.php
+++ b/application/common/library/Email.php
@@ -176,7 +176,12 @@ class Email
      */
     protected function buildAddress($emails)
     {
-        $emails = is_array($emails) ? $emails : array_flip(explode(',', str_replace(";", ",", $emails)));
+        if (!is_array($emails)) {
+            $emails = array_flip(explode(',', str_replace(";", ",", $emails)));
+            foreach ($emails as $key => $value) {
+                $emails[$key] = strstr($key, '@', true);
+            }
+        }
         return $emails;
     }