Obsolete WrapSingleMessages and DontWrapSingleMessages

fixes #2104