Duplicate attachements when more than 1 fields

Problem/Motivation

I created a form with multiple fields where more than one fields has ability to upload image. When this form is submitted as email, there should two attachments which are sent but it has 4 attachments.

If you add 3 images fields in form, it will end up sending 9 attachments.

Steps to reproduce

Create a form with 2 fields to upload image. Create email handler and try to submit an email.

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes