Fix handling of some conditional comment tags in HTML message (#1489004)

Conflicts:

	CHANGELOG