I was testing out IMAP support in Trunk, and found a number errors about undefined variables. One instance was covered in branches/1.4, revision 87427, but not merged to trunk. The other appears to be from a partial merge of 94538 (hunk 2 did not fully apply) Dan