Fixed compatibility to support Apple Mail 6.5 now.