removed encode_mailbox_name() and changed calls since it is now in imap_general....