Adding messages, fixing clear contacts