re-did messaging subsystem