Message System changes

Messages from index revamp