Well, I promised myself that I would give Apple Mail another go when El Capitan arrived. As an added bonus the El Capitan 10.11.1 update..