Match local messaging to client messaging