Fix repo smiley22/S22.Mail issues #2 and 4#