I125/message envelope refactor #127

Closed daneduijnkerke closed 6 years ago