Make e-mail rendering a bit more robust