Better rich text handling