Add custom headers to the email

While I'm here do some PEP8 cleanup.

Ticket:	#3360