WIP: offlineimap.py changes