Fix wrong 'cancel activity' messages

Fixes #2420