MOB-2462 message buffer added