Fixed folder renaming to handle collapse_folder information, be
compatible with Cyrus-IMAPD >= 2.0 and correctly handle unsubscribed
folders. Thanks Simon Matter for the patch. (#1155791)