Revert "mail fix"

This reverts commit 111d30f5cd8e93e458764f15d34f72c32b65b319.