Save each email only once.
Merge branch 'hotfix/log-once'