potali-5-1 mailer config and misc. changes