Fix email server issue
Merge pull request #219 from mzry1992/email-server-issue

Fix email server issue