Mail template improvments