Minor enhancement (No longer depends on the CMSMailer module)