Update mailer config for dev
Add treatment
WIP
Refactor
Fixes