Group email templates in folders when sending an email!

In the past, email templates were grouped in folders so they could be easily selected when sending an email in HubSpot. Now I see that it is a list of all email templates and the folders I created are not displayed. This makes it highly frustating to find the email template that I need to send in the long list, as we have a lot of different templates. And I also then need to remember the name of the template to search.
Can this be fixed asap?

Upvote on adding a view or filter for folders in email templates! Also, a similar idea with more votes here: https://community.hubspot.com/t5/HubSpot-Ideas/Template-folders-in-select-template-view/idi-p/424115