Fix Mailer
Merge branch 'hotfix/v1.3.9-constellation'