Fixed Server + MailClient
Fixed Server + MailClient
Merge pull request #19 from bflugon/MailClientFix

Mail client fix