Get rid of message spam (v1.3.0)