Fix mail service namespace error per Issue #1142