Continued migration of app-mail-settings to app-mail