Use XHTML formatted texts where applicable

Avoid stripping formatting tags as we have done previously.