Edit config/main delete mail component
Merge dev