Fix text-wrapping in product (bug 969162)

Fix for text-wrapping plus regression test.