Finish MVP for the emails