Initial merge of app-mail-settings into app-mail