I had the same issue but after using macOS Sierra it disappeared and the Mail.app has stayed after that. I have not changed anything else in the mail settings.
Do more on the web, with a fast and secure browser!
Download Opera browser with:
- built-in ad blocker
- battery saver
- free VPN