[ADD]Adjustment Ts Mail

Merged Gastón Bertolani requested to merge 12.0-add-mail into 12.0-stage

Merge request reports