Include message type to the envelope