email slightly works
email actually works
Merge branch 'youve-got-mail' into master-copy