Avoid header stripping problems by using old message libray