Merge branch 'sa/send-email-dedup-some-headers'