Revert "mail fix"

This reverts commit 4c8c0be0fc973cfc4d5748ebab3fb93911b89fb5.