Fixed compatibility to support Apple Mail 6.6 now.