Mail bug fixed