Partial fixes for HTML email specs.