Use Envelope everywhere internally

For the end user all they should see is a Message but internally the system should use an Envelope as it contains more information.