[PATCHv2 0/2] Make message state feature independent of the stack