#2 MailServer bugfix