move messages back to client messages (not over TCP for now)