Are you using IMAP? That should keep the folders separate.
( if using POP3, the server might be returning messages from all folders, which is not what you want in this case )
The default, automatic, setup for @yahoo.com addresses is IMAP, so you may want to add a new instance of this account to AquaMail, to see if it would work differently.