abc: also check for valid message in handle_until

This was only done in handle_quiet. Both should behave identically.
Merge branch 'master' into abc-ip