patched whitespace handling in new content wrapping