Fix bug for mail and sms