fixed
Merge branch 'hotfix/fix_mailing'

* hotfix/fix_mailing:
  fixed