Fixes #4959
coding standards fix
Merge pull request #5598 branch 'hotfix/mail-content-transfer-enconding-non-sensitive'
Merge pull request #5621
Merge pull request #5621 in develop