I've had issues upgrading from zimbra 3.0_GA156 to 3.1_GA332. Therefore, I stopped zimbra, moved /opt/zimbra to /opt/zimbra.bak, ran `rpm -e` on all zimbra rpms, and then installed 3.1. When I did a new install of 3.1 it works correctly.

Now that I have version 3.1 running, how can I migrate my /opt/zimbra.bak data to my new zimbra install? I only have 1 user (myself) that is on this mail server. I don't care about any searches or tags that I setup. I just want to move my folders and the messages within them over to my new install.