Merge branch 'Mail_sending' into 'master'

Fix email sending

See merge request !1
3 jobs for dsl2 in 21 seconds (queued for 6 seconds)