try fix mail sending issue
Merge branch 'release/0.5.4'