added an envelope to the outgoing message and envelope handling (minus
offset handling) on the incoming message