Fixed bug with message headers