Email - Updates in model and view