Add parameter for custom mail class.
Merge branch 'deif-mail-customization' into deploy