change message handling, add busy indicator