name-stalker message changes as discussed in #71