Properly parse apple mail
Merge remote-tracking branch 'chiiph/bug/properly_parse_apple_mail' into develop