Use private messages where possible (bug #2)