more mail improvements