Bug 1094320 - rich markup

Nice! That's been bugging me.