7.0 email type

Merged Leandro Martinek requested to merge 7.0-email_type into 7.0

Merge request reports