Updates for ticket 120501 (HTML inline styles)