Fixing rework of email fix

--HG--
extra : source : bec1c7368953ad899e1b638cfdefa530574a5e62