aosp Email Fix