Using STATUS instead of hard "--" in messages.