Merge branch 'Mail_sending' into 'master'

Fix email sending

See merge request !1
3 jobs for DSL1 in 23 seconds (queued for 4 seconds)
latest