take message.c from 2.1 build to avoid compiler issues