Added fix for Apple Mail