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

This reverts commit afa64a35919385750cb0649ec883170895630ebb.