Merge branch 'hotfix/shariq-text2'
Save each email only once.
Merge branch 'hotfix/log-once' into devel