Fix #1588 Error 400 when send email test
Merge pull request #811 from nlegoff/fix1588

[3.8] Fix #1588 Error 400 when send email test