Fix Attachment expiry save