Messaging rework

by Jonas Gri