Additional fixes for mail