Revert "I broke some emailing stuff"

This reverts commit 335684e43402ca61bad056214fc73d6c87902da8.