ContactsMailer and bug fixes