El Capitan Mail.app iCloud email account default email address
Wow...found an answer elsewhere.  Basically, sign out of iCloud (System Preferences --> iCloud), restart, sign in to iCloud, restart, open Mail.  Everything seemed to reset just fine, and I could save changes to the account in Mail Preferences.