[PATCH] attempt to fix the IMAP4_Tunnel breakages

[Ethan Glasser-Camp]

Here are two patches I hope will fix or at least help with the
breakages I introduced into IMAP4_Tunnel.  As previously, I do not use
this setup myself and so cannot test it, and am hoping for feedback
from users before asking to merge this.

I will also attach a single patch file that contains both commits, for
ease of testing.

Ethan