I don't have Windows Mail but I would suggest you Install Windows Live Mail. It does a good job of importing all your settings, accounts and emails from Windows Mail. It is part of Windows Essentials which is a suite of products but you can choose to download only what you want. A friend uses this and finds it better but I can't advise anything about it.
OnePlus 5 review