Added compatibility with Mail.app 7.0 (1784.1)

Please pull and merge in