Outlook will do it to some extent. You can group your messages by conversation. I don't recall what annoyed me about it, but it wasn't ideal... I think it had something to do with the sorting.