Revert "email 8"

This reverts commit f5a204f16447aeae4bba9f3edfc613da8c9930b2.
Revert "mail 7"

This reverts commit 35435d0473ebf1b6e2e35f0b3119f1bced53eb53.