diff --git a/webapp/controller/MailController.class.php b/webapp/controller/MailController.class.php
index 5b76a23..88f759b 100644
--- a/webapp/controller/MailController.class.php
+++ b/webapp/controller/MailController.class.php
@@ -107,10 +107,10 @@ class MailController
                 )
             );
 
-            if ($usermailrows) {
-                foreach ($mailrows as $mailitem) {
-                    $mailstatus = 0;
-                    $found = false;
+            foreach ($mailrows as $mailitem) {
+                $mailstatus = 0;
+                $found = false;
+                if ($usermailrows) {
                     foreach ($usermailrows as $usermailitem) {
                         if ($mailitem['mail_id'] != $usermailitem['mail_id']) {
                             continue;
@@ -122,22 +122,22 @@ class MailController
                         }
                         $mailstatus = $usermailitem['state'];
                     }
+                }
 
-                    $tmpmail = array(
-                        'id' => $mailitem['mail_id'],
-                        'status' => $mailstatus,
-                        'title' => $mailitem['subject'],
-                        'from' => 'system',
-                        'content' => $mailitem['content'],
-                        'attachment' => json_decode($mailitem['attachments'])
-                    );
-                    array_push($usermails, $tmpmail);
-                    if (!$found) {
-                        array_push($newmails, array(
-                            'mail_id' => $mailitem['mail_id'],
-                            'expiretime' => $mailitem['expiretime']
-                        ));
-                    }
+                $tmpmail = array(
+                    'id' => $mailitem['mail_id'],
+                    'status' => $mailstatus,
+                    'title' => $mailitem['subject'],
+                    'from' => 'system',
+                    'content' => $mailitem['content'],
+                    'attachment' => json_decode($mailitem['attachments'])
+                );
+                array_push($usermails, $tmpmail);
+                if (!$found) {
+                    array_push($newmails, array(
+                        'mail_id' => $mailitem['mail_id'],
+                        'expiretime' => $mailitem['expiretime']
+                    ));
                 }
             }
         }
@@ -461,7 +461,7 @@ class MailController
 
         $item_list = array();
         $str_list = explode('|', $response['content']);
-        foreach($str_list as $stritem) {
+        foreach ($str_list as $stritem) {
             $itemstrs = explode(':', $stritem);
             if (count($itemstrs) < 2) {
                 continue;