changed Mail.cs in master