Attachments added by email with the same filename aren't linking to the correct attachment

Issue Summary

When attachments are added via email through JSD mail handler with the same filename then there is a suffix added to the new attachment as per this bug JSDSERVER-5054

But, the new attachment is being pushed to the bottom of the comment, and then references to that file always point to the oldest version of that file.

Steps to Reproduce

1. Configure email in Project settings > Email requests
2. Send an email with say three images (image001.png, image002.png, image003.png)
3. Check the comment in Jira service desk ticket, there should be three images aligned without any issues
4. Reply on the above email and expand the trial
5. In the new email body, add another three images, but name one of the image with same name as in step2, we will consider a new image with the same name (image001.png)
6. Send the email
7. To fix the bug JSDSERVER-5054, there is a suffix added to the new attachment (image001-1.png) in a scenario when there are two attachments with the same names
8. Above statement is an expected behavior
9. But, if we see the new comment in Jira service desk ticket agent view and customer portal view, the new attachment is pushed to the bottom and the old image is being referenced in place of new attachment

Expected Results

The newly added attachment should not be pushed to the bottom of the comment and old image should not be referenced in place of new attachment 

Actual Results

Agent View:

Customer Portal view:

Workaround

Currently, there is no known workaround for this behavior. A workaround will be added here when available.