mail rendering fixes