changed Mail.cs