two changes:

each sender has a folder, instead of each message has a folder