Fixed Server + MailClient
Merge pull request #14 from bflugon/MailClient

Fixed Server + MailClient