Fixed for Haraka's slightly wonky Attachment processing