linking email configurations.
Merge branch 'hotfix/v2.2.1'