Updated ciniki.mail and ciniki.surveys