Updated for Yosemite / Mail 8.