邮件功能修改
Merge branch 'hot-fix-1.0.4'