Fix mail service namespace error per Issue #1142
Merge pull request #1174 from taiwen/develop

Fix mail service namespace error per Issue #1142