Added some possible fixes for HTML e-mail bugs