Mail reset improvements and fixes