fix mailing
Merge branch 'feature/sami' into dev