Revert "[TOM-277] fix email lang and email_from"

Merged Luciano Ortiz requested to merge revert-fabb80c5 into master

This reverts commit fabb80c5

Merge request reports