[FIX]mail:reduce the number of request & remove (if) statement add in (return) statement