Merge branch 'B12701-spacesInMails' into 'develop'

B12701 spaces in mails

See merge request !354
2 jobs for develop in 3 minutes and 15 seconds (queued for 1 second)