enforce a better email wrapping to send valid emails
do not translate error message in test case
Merge pull request #1297 from dereuromark/master-email-wrapping

enforce a better email wrapping to send valid emails