I am no longer convinced that NEW_MESSAGE should be used for both query response and realtime message delivery from other users.