lots of mail improvements!