Tweaked headers so that they are a little more complete for test emails.