Filing re-Sent email in original mail Folder

This may sound trivial to the experts but it causes me and my colleagues a lot of wasted time, and our own technical support department cannot find a solution so I am hoping a very clever techie out there may know an answer. We are Users of 8.5 We maintain several hundred separate email Folders so selecting a specific Folder to store a Sent email can take a relatively long time. Many Sent emails are existing stored emails being resent (as a follow-up) from a specific Folder. When we ‘Send & File’ the Sent email, we have the laborious process of selecting the same specific Folder (that we are sending the email from) in order to store the latest iteration. Is there a Mail Preference setting that will automatically offer the specific Folder, we are currently in, to store the Sent email? I am sure our need must be shared by many NOTES Mail uses and I am sure that an earlier version of NOTES used to do what we need. Can you help please?