fixed non-wrapping messages