Bug 1079780: Replace the client_message with echo

@mfojtik can you please review.