[FIX] Email

Merged Tomás Canzoniero requested to merge fix_email into 11.0-stage

Merge request reports