Revert "Revert "mail 7""

This reverts commit 546e050424b8a61e3a194b61eab242f3dd2eb19d.