Improve disguise messages (fixes #79)