Message wrapping improvements for ^P.