Added a select to user chose from preset email settings
merge fix