Renamed MailServer and fixed the conflict