in this case, after doing that change, I prefer to revert it.
The reason is that this method here is patched from the imap4 server, and we should try to keep the diffs to a minimum to be able to send the patch eventually to upstream.