Cleaned up password email formatting, added message id to email.