better message support