AROMA: Readded AOSP Email, but added option to remove, if GoogleEmail is installed. Fixed wipe options. Fixed some of the remove options also