fix on email and building message