pull secure-email from upstream