Added required attributes back in on email and message