Added EtailReturn to UserPreferences and Scatter graph