Mail settings update part II