Upgrade to new pgpmailer and pgpbuilder