Add some new use cases for Mail