Fixed email test
Message context in progress