Whatever client you end up using, IMAP is the correct answer for storing your mail. It greatly lowers the friction of moving from one client to another. I switch between my laptop, my desktop, and a web front-end to our IMAP server, and (so long as I remember not to leave one running while I want to use the other), everything seems to work great.