Additional Work on Email Class