Bug 1094320 - rich markup

Yeah happy with whatever? :smile: