Makes imap compatible with new zip (much nicer)

The old version relied on an implentation detail of zip and (at the time
at least) I couldn't get rid of that reliance.  The use of the new zip
is oblivious to the implementation.  This rules.