Using Airmail since long instead of the stock mail app. Could not be happier.