Stopped double counting of self-sent messages