Merge branch 'issue-1639-email-reg-header' into dev

lib/email.js

@@ -43,13 +43,13 @@ const templates = {
   },
   "reset": {
     landing: 'reset_password',
-    subject: _("Reset Persona password"), 
+    subject: _("Reset Persona password"),
     template: fs.readFileSync(path.join(TEMPLATE_PATH, 'reset.ejs')),
     templateHTML: fs.readFileSync(path.join(TEMPLATE_PATH, 'reset.html.ejs'))
   },
   "confirm": {
     landing: 'confirm',
-    subject: _("Confirm email address for Persona"), 
+    subject: _("Confirm email address for Persona"),
     template: fs.readFileSync(path.join(TEMPLATE_PATH, 'confirm.ejs')),
     templateHTML: fs.readFileSync(path.join(TEMPLATE_PATH, 'confirm.html.ejs'))
   }
@@ -113,7 +113,11 @@ function doSend(email_type, email, site, secret, langContext) {
       sender: "Persona <no-reply@persona.org>",
       to: email,
       subject: GETTEXT(email_params.subject),
-      text: email_params.template(templateArgs)
+      text: email_params.template(templateArgs),
+      headers: {
+        'X-BrowserID-VerificationURL': public_url,
+        'X-BrowserID-RelyingParty': site
+      }
     };
 
     if (email_params.templateHTML) {