Massive overhaul to mutt. Using offlineimap now. GMail for everything.