Bug 5921 follow-up: fix text wrapping