This is the same here. I solved the issue by creating mailboxes and using rules that sort the incoming mail into mailboxes with the same name as the incoming mail. Then I added those inboxes to favorites to get them closer to the top. That was for my client, my personal setup I of course use the smart mailboxes just to filter what I'm looking at. Does anyone have any other fixes that have worked for them?