merging latest mail core 2