Add i18n support to email module...
Merge remote-tracking branch 'origin/master'