aosp Email Fix2