diff --git a/README.md b/README.md
index 6c33d99..5649748 100644
--- a/README.md
+++ b/README.md
@@ -1,87 +1,97 @@
 INSTALLATION PROCEDURE
 ======================
 
-This package contains required PHP libraries as well as the Roundcube Framework
-placed in lib/ext directory. In case you're using a package version
-with lib/ext directory empty make sure all dependencies are installed
-on your system. These are Roundcube Framework and its dependencies plus
-PEAR::HTTP_Request2 and PEAR::Net_URL2 packages. Additionally Smarty v3 need
-to be installed. Webdav driver requires SabreDAV library.
+This package uses [Composer][1] to install and maintain required PHP libraries
+as well as the Roundcube framework. The requirements are basically the same as
+for Roundcube so please read the INSTALLATION section in the Roundcube
+framework's [README][2] file.
 
-1. Create local config
+1. Install Composer
+
+Execute this in the project root directory:
+
+$ curl -s http://getcomposer.org/installer | php
+
+This will create a file named composer.phar in the project directory.
+
+2. Install Dependencies
+
+$ cp composer.json-dist composer.json
+$ php composer.phar install
+
+3. Import the Roundcube Framework (1.2) and Kolab plugins
+
+3.1. Either copy or symlink the Roundcube framework package into lib/ext/Roundcube
+3.2. Either copy or symlink the roundcubemail-plugins-kolab into lib/drivers/kolab/plugins
+
+4. Create local config
 
 The configuration for this service inherits basic options from the Roundcube
 config. To make that available, symlink the Roundcube config file
 (config.inc.php) into the local config/ directory.
 
-2. Give write access for the webserver user to the logs, cache and temp folders:
+5. Give write access for the webserver user to the logs, cache and temp folders:
 
 $ chown <www-user> logs
 $ chown <www-user> cache
 $ chown <www-user> temp
 
-3. Execute database initialization scripts from doc/SQL/ on Roundcube database.
+6. Execute database initialization scripts from doc/SQL/ on Roundcube database.
 
-4. Optionally, configure your webserver to point to the 'public_html' directory of this
+7. Optionally, configure your webserver to point to the 'public_html' directory of this
 package as document root.
 
 
-SabreDAV INSTALLATION
-=====================
-
-cd lib/ext
-wget https://github.com/fruux/sabre-dav/releases/download/2.1.6/sabredav-2.1.6.zip
-unzip sabredav-2.1.6.zip
-rm -f sabredav-2.1.6.zip
-
-
 CREATING BACKEND-DRIVER
 =======================
 
 Chwala API supports creation of different storage backends.
 It is possible to create a driver class that will store files on
 any storage e.g. local filesystem. As for now it is possible to use
 only one storage driver at a time.
 
 There are currently two drivers available for Chwala: Kolab and Seafile.
 The Kolab driver is considered the reference driver. Both can be found
 in the lib/drivers directory.
 
 The Kolab driver is based on Roundcube Framework and implements storage
 the "Kolab way", which is to store files in IMAP. The main file is
 lib/drivers/kolab/kolab_file_storage.php.
 
 To create a new driver for a different storage system you need to:
 
 1. Create driver directory as lib/drivers/<driver_name>. This directory will be
    added to PHP's include path.
 
 2. Create lib/drivers/<driver_name>/<driver_name>_file_storage.php file.
    This file should define a class <driver_name>_file_storage which
    implements the file_storage interface as defined in lib/file_storage.php.
 
 3. To change the driver set 'fileapi_backend' option to the driver name
    in main configuration file. The default is 'kolab'.
 
 
 Driver initialization
 ---------------------
 
 Driver object is initialized in file_api::api_init() method.
 After the object instance is created we call configure() method.
 
 
 Driver methods
 --------------
 
 1. configure - Is used to configure the driver.
 
 2. authenticate - Is used to authenticate a user in authenticate
    request.
 
 3. capabilities - Is supposed to return capabilities and limitations
    (like max. upload size) supported by the driver.
 
 Other methods are self explanatory and well documented in
 interface class file. API documentation can be generated
 using phpDocumentor (http://phpdoc.org).
+
+[1]: http://getcomposer.org
+[2]: https://github.com/roundcube/roundcubemail/blob/master/program/lib/Roundcube/README.md)
diff --git a/composer.json-dist b/composer.json-dist
new file mode 100644
index 0000000..1ba0af6
--- /dev/null
+++ b/composer.json-dist
@@ -0,0 +1,25 @@
+{
+    "name": "kolab/chwala",
+    "description": "The Kolab Storage service",
+    "license": "AGPL-3.0+",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git"
+        }
+    ],
+    "require": {
+        "php": ">=5.4.0",
+        "pear/pear-core-minimal": "~1.10.1",
+        "pear/net_url2": "~2.2.1",
+        "pear/http_request2": "~2.3.0",
+        "pear/net_socket": "~1.2.1",
+        "pear/auth_sasl": "~1.1.0",
+        "pear/net_idna2": "~0.2.0",
+        "pear/mail_mime": "~1.10.0",
+        "pear/net_smtp": "~1.7.3",
+        "pear/net_ldap2": "~2.2.0",
+        "kolab/net_ldap3": "dev-master",
+        "sabre/dav" : "~2.1.11"
+    }
+}
diff --git a/lib/drivers/kolab/plugins/kolab_auth/LICENSE b/lib/drivers/kolab/plugins/kolab_auth/LICENSE
deleted file mode 100644
index dba13ed..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/lib/drivers/kolab/plugins/kolab_auth/composer.json b/lib/drivers/kolab/plugins/kolab_auth/composer.json
deleted file mode 100644
index 5fec104..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "kolab/kolab_auth",
-    "type": "roundcube-plugin",
-    "description": "Kolab authentication",
-    "homepage": "https://git.kolab.org/diffusion/RPK/",
-    "license": "AGPLv3",
-    "version": "3.2.8",
-    "authors": [
-        {
-            "name": "Thomas Bruederli",
-            "email": "bruederli@kolabsys.com",
-            "role": "Lead"
-        },
-        {
-            "name": "Aleksander Machniak",
-            "email": "machniak@kolabsys.com",
-            "role": "Lead"
-        }
-    ],
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "http://plugins.roundcube.net"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0",
-        "roundcube/plugin-installer": ">=0.1.3"
-    }
-}
diff --git a/lib/drivers/kolab/plugins/kolab_auth/config.inc.php.dist b/lib/drivers/kolab/plugins/kolab_auth/config.inc.php.dist
deleted file mode 100644
index 8c01d56..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/config.inc.php.dist
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-// The id of the LDAP address book (which refers to the $rcmail_config['ldap_public'])
-// or complete addressbook definition array.
-// --------------------------------------------------------------------
-// Note: Multi-domain (hosted) installations can resolve domain aliases
-//   by adding following settings in kolab_auth_addressbook spec.:
-//
-//   'domain_base_dn'   => 'cn=kolab,cn=config',
-//   'domain_filter'    => '(&(objectclass=domainrelatedobject)(associateddomain=%s))',
-//   'domain_name_attr' => 'associateddomain',
-//
-//   With this %dc variable in base_dn and groups/base_dn will be
-//   replaced with DN string of resolved domain
-//---------------------------------------------------------------------
-$config['kolab_auth_addressbook'] = '';
-
-// This will overwrite defined filter
-$config['kolab_auth_filter'] = '(&(objectClass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)(alias=%fu)))';
-
-// Use this field (from fieldmap configuration) to get authentication ID. Don't use an array here!
-$config['kolab_auth_login'] = 'email';
-
-// Use these fields (from fieldmap configuration) for default identity.
-// If the value array contains more than one field, first non-empty will be used
-// Note: These aren't LDAP attributes, but field names in config
-// Note: If there's more than one email address, as many identities will be created
-$config['kolab_auth_name']         = array('name', 'cn');
-$config['kolab_auth_email']        = array('email');
-$config['kolab_auth_organization'] = array('organization');
-
-// Role field (from fieldmap configuration)
-$config['kolab_auth_role'] = 'role';
-
-// Template for user names displayed in the UI.
-// You can use all attributes from the 'fieldmap' property of the 'kolab_auth_addressbook' configuration
-$config['kolab_auth_user_displayname'] = '{name} ({ou})';
-
-// Login and password of the admin user. Enables "Login As" feature.
-$config['kolab_auth_admin_login']    = '';
-$config['kolab_auth_admin_password'] = '';
-
-// Enable audit logging for abuse of administrative privileges.
-$config['kolab_auth_auditlog'] = false;
-
-// As set of rules to define the required rights on the target entry
-// which allow an admin user to login as another user (the target).
-// The effective rights value refers to either entry level attribute level rights:
-//  * entry:[read|add|delete]
-//  * attrib:<attribute-name>:[read|write|delete]
-$config['kolab_auth_admin_rights'] = array(
-    // Roundcube task => required effective right
-    'settings'        => 'entry:read',
-    'mail'            => 'entry:delete',
-    'addressbook'     => 'entry:delete',
-    // or use a wildcard entry like this:
-    '*'               => 'entry:read',
-);
-
-// Enable plugins on a role-by-role basis. In this example, the 'acl' plugin
-// is enabled for people with a 'cn=professional-user,dc=mykolab,dc=ch' role.
-//
-// Note that this does NOT mean the 'acl' plugin is disabled for other people.
-$config['kolab_auth_role_plugins'] = Array(
-        'cn=professional-user,dc=mykolab,dc=ch' => Array(
-                'acl',
-            ),
-    );
-
-// Settings on a role-by-role basis. In this example, the 'htmleditor' setting
-// is enabled(1) for people with a 'cn=professional-user,dc=mykolab,dc=ch' role,
-// and it cannot be overridden. Sample use-case: disable htmleditor for normal people,
-// do not allow the setting to be controlled through the preferences, enable the
-// html editor for professional users and allow them to override the setting in
-// the preferences.
-$config['kolab_auth_role_settings'] = Array(
-        'cn=professional-user,dc=mykolab,dc=ch' => Array(
-                'htmleditor' => Array(
-                        'mode' => 'override',
-                        'value' => 1,
-                        'allow_override' => true
-                    ),
-            ),
-    );
-
-// List of LDAP addressbooks (keys of ldap_public configuration array)
-// for which base_dn variables (%dc, etc.) will be replaced according to authenticated user DN
-// Note: special name '*' for all LDAP addressbooks
-$config['kolab_auth_ldap_addressbooks'] = array('*');
-
-?>
diff --git a/lib/drivers/kolab/plugins/kolab_auth/kolab_auth.php b/lib/drivers/kolab/plugins/kolab_auth/kolab_auth.php
deleted file mode 100644
index 926c506..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/kolab_auth.php
+++ /dev/null
@@ -1,788 +0,0 @@
-<?php
-
-/**
- * Kolab Authentication (based on ldap_authentication plugin)
- *
- * Authenticates on LDAP server, finds canonized authentication ID for IMAP
- * and for new users creates identity based on LDAP information.
- *
- * Supports impersonate feature (login as another user). To use this feature
- * imap_auth_type/smtp_auth_type must be set to DIGEST-MD5 or PLAIN.
- *
- * @version @package_version@
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2011-2013, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_auth extends rcube_plugin
-{
-    static $ldap;
-    private $username;
-    private $data = array();
-
-    public function init()
-    {
-        $rcmail = rcube::get_instance();
-
-        $this->load_config();
-
-        $this->add_hook('authenticate', array($this, 'authenticate'));
-        $this->add_hook('startup', array($this, 'startup'));
-        $this->add_hook('user_create', array($this, 'user_create'));
-
-        // Hook for password change
-        $this->add_hook('password_ldap_bind', array($this, 'password_ldap_bind'));
-
-        // Hooks related to "Login As" feature
-        $this->add_hook('template_object_loginform', array($this, 'login_form'));
-        $this->add_hook('storage_connect', array($this, 'imap_connect'));
-        $this->add_hook('managesieve_connect', array($this, 'imap_connect'));
-        $this->add_hook('smtp_connect', array($this, 'smtp_connect'));
-        $this->add_hook('identity_form', array($this, 'identity_form'));
-
-        // Hook to modify some configuration, e.g. ldap
-        $this->add_hook('config_get', array($this, 'config_get'));
-
-        // Hook to modify logging directory
-        $this->add_hook('write_log', array($this, 'write_log'));
-        $this->username = $_SESSION['username'];
-
-        // Enable debug logs (per-user), when logged as another user
-        if (!empty($_SESSION['kolab_auth_admin']) && $rcmail->config->get('kolab_auth_auditlog')) {
-            $rcmail->config->set('debug_level', 1);
-            $rcmail->config->set('devel_mode', true);
-            $rcmail->config->set('smtp_log', true);
-            $rcmail->config->set('log_logins', true);
-            $rcmail->config->set('log_session', true);
-            $rcmail->config->set('memcache_debug', true);
-            $rcmail->config->set('imap_debug', true);
-            $rcmail->config->set('ldap_debug', true);
-            $rcmail->config->set('smtp_debug', true);
-            $rcmail->config->set('sql_debug', true);
-
-            // SQL debug need to be set directly on DB object
-            // setting config variable will not work here because
-            // the object is already initialized/configured
-            if ($db = $rcmail->get_dbh()) {
-                $db->set_debug(true);
-            }
-        }
-    }
-
-    /**
-     * Startup hook handler
-     */
-    public function startup($args)
-    {
-        // Check access rights when logged in as another user
-        if (!empty($_SESSION['kolab_auth_admin']) && $args['task'] != 'login' && $args['task'] != 'logout') {
-            // access to specified task is forbidden,
-            // redirect to the first task on the list
-            if (!empty($_SESSION['kolab_auth_allowed_tasks'])) {
-                $tasks = (array)$_SESSION['kolab_auth_allowed_tasks'];
-                if (!in_array($args['task'], $tasks) && !in_array('*', $tasks)) {
-                    header('Location: ?_task=' . array_shift($tasks));
-                    die;
-                }
-
-                // add script that will remove disabled taskbar buttons
-                if (!in_array('*', $tasks)) {
-                    $this->add_hook('render_page', array($this, 'render_page'));
-                }
-            }
-        }
-
-        // load per-user settings
-        $this->load_user_role_plugins_and_settings();
-
-        return $args;
-    }
-
-    /**
-     * Modify some configuration according to LDAP user record
-     */
-    public function config_get($args)
-    {
-        // Replaces ldap_vars (%dc, etc) in public kolab ldap addressbooks
-        // config based on the users base_dn. (for multi domain support)
-        if ($args['name'] == 'ldap_public' && !empty($args['result'])) {
-            $rcmail      = rcube::get_instance();
-            $kolab_books = (array) $rcmail->config->get('kolab_auth_ldap_addressbooks');
-
-            foreach ($args['result'] as $name => $config) {
-                if (in_array($name, $kolab_books) || in_array('*', $kolab_books)) {
-                    $args['result'][$name] = $this->patch_ldap_config($config);
-                }
-            }
-        }
-        else if ($args['name'] == 'kolab_users_directory' && !empty($args['result'])) {
-            $args['result'] = $this->patch_ldap_config($args['result']);
-        }
-
-        return $args;
-    }
-
-    /**
-     * Helper method to patch the given LDAP directory config with user-specific values
-     */
-    protected function patch_ldap_config($config)
-    {
-        if (is_array($config)) {
-            $config['base_dn']        = self::parse_ldap_vars($config['base_dn']);
-            $config['search_base_dn'] = self::parse_ldap_vars($config['search_base_dn']);
-            $config['bind_dn']        = str_replace('%dn', $_SESSION['kolab_dn'], $config['bind_dn']);
-
-            if (!empty($config['groups'])) {
-                $config['groups']['base_dn'] = self::parse_ldap_vars($config['groups']['base_dn']);
-            }
-        }
-
-        return $config;
-    }
-
-    /**
-     * Modifies list of plugins and settings according to
-     * specified LDAP roles
-     */
-    public function load_user_role_plugins_and_settings()
-    {
-        if (empty($_SESSION['user_roledns'])) {
-            return;
-        }
-
-        $rcmail = rcube::get_instance();
-
-        // Example 'kolab_auth_role_plugins' =
-        //
-        //  Array(
-        //      '<role_dn>' => Array('plugin1', 'plugin2'),
-        //  );
-        //
-        // NOTE that <role_dn> may in fact be something like: 'cn=role,%dc'
-
-        $role_plugins = $rcmail->config->get('kolab_auth_role_plugins');
-
-        // Example $rcmail_config['kolab_auth_role_settings'] =
-        //
-        //  Array(
-        //      '<role_dn>' => Array(
-        //          '$setting' => Array(
-        //              'mode' => '(override|merge)', (default: override)
-        //              'value' => <>,
-        //              'allow_override' => (true|false) (default: false)
-        //          ),
-        //      ),
-        //  );
-        //
-        // NOTE that <role_dn> may in fact be something like: 'cn=role,%dc'
-
-        $role_settings = $rcmail->config->get('kolab_auth_role_settings');
-
-        if (!empty($role_plugins)) {
-            foreach ($role_plugins as $role_dn => $plugins) {
-                $role_dn = self::parse_ldap_vars($role_dn);
-                if (!empty($role_plugins[$role_dn])) {
-                    $role_plugins[$role_dn] = array_unique(array_merge((array)$role_plugins[$role_dn], $plugins));
-                } else {
-                    $role_plugins[$role_dn] = $plugins;
-                }
-            }
-        }
-
-        if (!empty($role_settings)) {
-            foreach ($role_settings as $role_dn => $settings) {
-                $role_dn = self::parse_ldap_vars($role_dn);
-                if (!empty($role_settings[$role_dn])) {
-                    $role_settings[$role_dn] = array_merge((array)$role_settings[$role_dn], $settings);
-                } else {
-                    $role_settings[$role_dn] = $settings;
-                }
-            }
-        }
-
-        foreach ($_SESSION['user_roledns'] as $role_dn) {
-            if (!empty($role_settings[$role_dn]) && is_array($role_settings[$role_dn])) {
-                foreach ($role_settings[$role_dn] as $setting_name => $setting) {
-                    if (!isset($setting['mode'])) {
-                        $setting['mode'] = 'override';
-                    }
-
-                    if ($setting['mode'] == "override") {
-                        $rcmail->config->set($setting_name, $setting['value']);
-                    } elseif ($setting['mode'] == "merge") {
-                        $orig_setting = $rcmail->config->get($setting_name);
-
-                        if (!empty($orig_setting)) {
-                            if (is_array($orig_setting)) {
-                                $rcmail->config->set($setting_name, array_merge($orig_setting, $setting['value']));
-                            }
-                        } else {
-                            $rcmail->config->set($setting_name, $setting['value']);
-                        }
-                    }
-
-                    $dont_override = (array) $rcmail->config->get('dont_override');
-
-                    if (empty($setting['allow_override'])) {
-                        $rcmail->config->set('dont_override', array_merge($dont_override, array($setting_name)));
-                    }
-                    else {
-                        if (in_array($setting_name, $dont_override)) {
-                            $_dont_override = array();
-                            foreach ($dont_override as $_setting) {
-                                if ($_setting != $setting_name) {
-                                    $_dont_override[] = $_setting;
-                                }
-                            }
-                            $rcmail->config->set('dont_override', $_dont_override);
-                        }
-                    }
-
-                    if ($setting_name == 'skin') {
-                        if ($rcmail->output->type == 'html') {
-                            $rcmail->output->set_skin($setting['value']);
-                            $rcmail->output->set_env('skin', $setting['value']);
-                        }
-                    }
-                }
-            }
-
-            if (!empty($role_plugins[$role_dn])) {
-                foreach ((array)$role_plugins[$role_dn] as $plugin) {
-                    $this->api->load_plugin($plugin);
-                }
-            }
-        }
-    }
-
-    /**
-     * Logging method replacement to print debug/errors into
-     * a separate (sub)folder for each user
-     */
-    public function write_log($args)
-    {
-        $rcmail = rcube::get_instance();
-
-        if ($rcmail->config->get('log_driver') == 'syslog') {
-            return $args;
-        }
-
-        // log_driver == 'file' is assumed here
-        $log_dir  = $rcmail->config->get('log_dir', RCUBE_INSTALL_PATH . 'logs');
-
-        // Append original username + target username for audit-logging
-        if ($rcmail->config->get('kolab_auth_auditlog') && !empty($_SESSION['kolab_auth_admin'])) {
-            $args['dir'] = $log_dir . '/' . strtolower($_SESSION['kolab_auth_admin']) . '/' . strtolower($this->username);
-
-            // Attempt to create the directory
-            if (!is_dir($args['dir'])) {
-                @mkdir($args['dir'], 0750, true);
-            }
-        }
-        // Define the user log directory if a username is provided
-        else if ($rcmail->config->get('per_user_logging') && !empty($this->username)) {
-            $user_log_dir = $log_dir . '/' . strtolower($this->username);
-            if (is_writable($user_log_dir)) {
-                $args['dir'] = $user_log_dir;
-            }
-            else if ($args['name'] != 'errors') {
-                $args['abort'] = true;  // don't log if unauthenticed
-            }
-        }
-
-        return $args;
-    }
-
-    /**
-     * Sets defaults for new user.
-     */
-    public function user_create($args)
-    {
-        if (!empty($this->data['user_email'])) {
-            // addresses list is supported
-            if (array_key_exists('email_list', $args)) {
-                $email_list = array_unique($this->data['user_email']);
-
-                // add organization to the list
-                if (!empty($this->data['user_organization'])) {
-                    foreach ($email_list as $idx => $email) {
-                        $email_list[$idx] = array(
-                            'organization' => $this->data['user_organization'],
-                            'email'        => $email,
-                        );
-                    }
-                }
-
-                $args['email_list'] = $email_list;
-            }
-            else {
-                $args['user_email'] = $this->data['user_email'][0];
-            }
-        }
-
-        if (!empty($this->data['user_name'])) {
-            $args['user_name'] = $this->data['user_name'];
-        }
-
-        return $args;
-    }
-
-    /**
-     * Modifies login form adding additional "Login As" field
-     */
-    public function login_form($args)
-    {
-        $this->add_texts('localization/');
-
-        $rcmail      = rcube::get_instance();
-        $admin_login = $rcmail->config->get('kolab_auth_admin_login');
-        $group       = $rcmail->config->get('kolab_auth_group');
-        $role_attr   = $rcmail->config->get('kolab_auth_role');
-
-        // Show "Login As" input
-        if (empty($admin_login) || (empty($group) && empty($role_attr))) {
-            return $args;
-        }
-
-        $input = new html_inputfield(array('name' => '_loginas', 'id' => 'rcmloginas',
-            'type' => 'text', 'autocomplete' => 'off'));
-        $row = html::tag('tr', null,
-            html::tag('td', 'title', html::label('rcmloginas', rcube::Q($this->gettext('loginas'))))
-            . html::tag('td', 'input', $input->show(trim(rcube_utils::get_input_value('_loginas', rcube_utils::INPUT_POST))))
-        );
-        $args['content'] = preg_replace('/<\/tbody>/i', $row . '</tbody>', $args['content']);
-
-        return $args;
-    }
-
-    /**
-     * Find user credentials In LDAP.
-     */
-    public function authenticate($args)
-    {
-        // get username and host
-        $host    = $args['host'];
-        $user    = $args['user'];
-        $pass    = $args['pass'];
-        $loginas = trim(rcube_utils::get_input_value('_loginas', rcube_utils::INPUT_POST));
-
-        if (empty($user) || (empty($pass) && empty($_SERVER['REMOTE_USER']))) {
-            $args['abort'] = true;
-            return $args;
-        }
-
-        // temporarily set the current username to the one submitted
-        $this->username = $user;
-
-        $ldap = self::ldap();
-        if (!$ldap || !$ldap->ready) {
-            $args['abort'] = true;
-            $args['kolab_ldap_error'] = true;
-            $message = sprintf(
-                    'Login failure for user %s from %s in session %s (error %s)',
-                    $user,
-                    rcube_utils::remote_ip(),
-                    session_id(),
-                    "LDAP not ready"
-                );
-
-            rcube::write_log('userlogins', $message);
-
-            return $args;
-        }
-
-        // Find user record in LDAP
-        $record = $ldap->get_user_record($user, $host);
-
-        if (empty($record)) {
-            $args['abort'] = true;
-            $message = sprintf(
-                    'Login failure for user %s from %s in session %s (error %s)',
-                    $user,
-                    rcube_utils::remote_ip(),
-                    session_id(),
-                    "No user record found"
-                );
-
-            rcube::write_log('userlogins', $message);
-
-            return $args;
-        }
-
-        $rcmail      = rcube::get_instance();
-        $admin_login = $rcmail->config->get('kolab_auth_admin_login');
-        $admin_pass  = $rcmail->config->get('kolab_auth_admin_password');
-        $login_attr  = $rcmail->config->get('kolab_auth_login');
-        $name_attr   = $rcmail->config->get('kolab_auth_name');
-        $email_attr  = $rcmail->config->get('kolab_auth_email');
-        $org_attr    = $rcmail->config->get('kolab_auth_organization');
-        $role_attr   = $rcmail->config->get('kolab_auth_role');
-        $imap_attr   = $rcmail->config->get('kolab_auth_mailhost');
-
-        if (!empty($role_attr) && !empty($record[$role_attr])) {
-            $_SESSION['user_roledns'] = (array)($record[$role_attr]);
-        }
-
-        if (!empty($imap_attr) && !empty($record[$imap_attr])) {
-            $default_host = $rcmail->config->get('default_host');
-            if (!empty($default_host)) {
-                rcube::write_log("errors", "Both default host and kolab_auth_mailhost set. Incompatible.");
-            } else {
-                $args['host'] = "tls://" . $record[$imap_attr];
-            }
-        }
-
-        // Login As...
-        if (!empty($loginas) && $admin_login) {
-            // Authenticate to LDAP
-            $result = $ldap->bind($record['dn'], $pass);
-
-            if (!$result) {
-                $args['abort'] = true;
-                $message = sprintf(
-                        'Login failure for user %s from %s in session %s (error %s)',
-                        $user,
-                        rcube_utils::remote_ip(),
-                        session_id(),
-                        "Unable to bind with '" . $record['dn'] . "'"
-                    );
-
-                rcube::write_log('userlogins', $message);
-
-                return $args;
-            }
-
-            $isadmin = false;
-            $admin_rights = $rcmail->config->get('kolab_auth_admin_rights', array());
-
-            // @deprecated: fall-back to the old check if the original user has/belongs to administrative role/group
-            if (empty($admin_rights)) {
-                $group   = $rcmail->config->get('kolab_auth_group');
-                $role_dn = $rcmail->config->get('kolab_auth_role_value');
-
-                // check role attribute
-                if (!empty($role_attr) && !empty($role_dn) && !empty($record[$role_attr])) {
-                    $role_dn = $ldap->parse_vars($role_dn, $user, $host);
-                    if (in_array($role_dn, (array)$record[$role_attr])) {
-                        $isadmin = true;
-                    }
-                }
-
-                // check group
-                if (!$isadmin && !empty($group)) {
-                    $groups = $ldap->get_user_groups($record['dn'], $user, $host);
-                    if (in_array($group, $groups)) {
-                        $isadmin = true;
-                    }
-                }
-
-                if ($isadmin) {
-                    // user has admin privileges privilage, get "login as" user credentials
-                    $target_entry = $ldap->get_user_record($loginas, $host);
-                    $allowed_tasks = $rcmail->config->get('kolab_auth_allowed_tasks');
-                }
-            }
-            else {
-                // get "login as" user credentials
-                $target_entry = $ldap->get_user_record($loginas, $host);
-
-                if (!empty($target_entry)) {
-                    // get effective rights to determine login-as permissions
-                    $effective_rights = (array)$ldap->effective_rights($target_entry['dn']);
-
-                    if (!empty($effective_rights)) {
-                        $effective_rights['attrib'] = $effective_rights['attributeLevelRights'];
-                        $effective_rights['entry']  = $effective_rights['entryLevelRights'];
-
-                        // compare the rights with the permissions mapping
-                        $allowed_tasks = array();
-                        foreach ($admin_rights as $task => $perms) {
-                            $perms_ = explode(':', $perms);
-                            $type   = array_shift($perms_);
-                            $req    = array_pop($perms_);
-                            $attrib = array_pop($perms_);
-
-                            if (array_key_exists($type, $effective_rights)) {
-                                if ($type == 'entry' && in_array($req, $effective_rights[$type])) {
-                                    $allowed_tasks[] = $task;
-                                }
-                                else if ($type == 'attrib' && array_key_exists($attrib, $effective_rights[$type]) &&
-                                        in_array($req, $effective_rights[$type][$attrib])) {
-                                    $allowed_tasks[] = $task;
-                                }
-                            }
-                        }
-
-                        $isadmin = !empty($allowed_tasks);
-                    }
-                }
-            }
-
-            // Save original user login for log (see below)
-            if ($login_attr) {
-                $origname = is_array($record[$login_attr]) ? $record[$login_attr][0] : $record[$login_attr];
-            }
-            else {
-                $origname = $user;
-            }
-
-            if (!$isadmin || empty($target_entry)) {
-                $this->add_texts('localization/');
-
-                $args['abort'] = true;
-                $args['error'] = $this->gettext(array(
-                    'name' => 'loginasnotallowed',
-                    'vars' => array('user' => rcube::Q($loginas)),
-                ));
-
-                $message = sprintf(
-                        'Login failure for user %s (as user %s) from %s in session %s (error %s)',
-                        $user,
-                        $loginas,
-                        rcube_utils::remote_ip(),
-                        session_id(),
-                        "No privileges to login as '" . $loginas . "'"
-                    );
-
-                rcube::write_log('userlogins', $message);
-
-                return $args;
-            }
-
-            // replace $record with target entry
-            $record = $target_entry;
-
-            $args['user'] = $this->username = $loginas;
-
-            // Mark session to use SASL proxy for IMAP authentication
-            $_SESSION['kolab_auth_admin']    = strtolower($origname);
-            $_SESSION['kolab_auth_login']    = $rcmail->encrypt($admin_login);
-            $_SESSION['kolab_auth_password'] = $rcmail->encrypt($admin_pass);
-            $_SESSION['kolab_auth_allowed_tasks'] = $allowed_tasks;
-        }
-
-        // Store UID and DN of logged user in session for use by other plugins
-        $_SESSION['kolab_uid'] = is_array($record['uid']) ? $record['uid'][0] : $record['uid'];
-        $_SESSION['kolab_dn']  = $record['dn'];
-
-        // Store LDAP replacement variables used for current user
-        // This improves performance of load_user_role_plugins_and_settings()
-        // which is executed on every request (via startup hook) and where
-        // we don't like to use LDAP (connection + bind + search)
-        $_SESSION['kolab_auth_vars'] = $ldap->get_parse_vars();
-
-        // Set user login
-        if ($login_attr) {
-            $this->data['user_login'] = is_array($record[$login_attr]) ? $record[$login_attr][0] : $record[$login_attr];
-        }
-        if ($this->data['user_login']) {
-            $args['user'] = $this->username = $this->data['user_login'];
-        }
-
-        // User name for identity (first log in)
-        foreach ((array)$name_attr as $field) {
-            $name = is_array($record[$field]) ? $record[$field][0] : $record[$field];
-            if (!empty($name)) {
-                $this->data['user_name'] = $name;
-                break;
-            }
-        }
-        // User email(s) for identity (first log in)
-        foreach ((array)$email_attr as $field) {
-            $email = is_array($record[$field]) ? array_filter($record[$field]) : $record[$field];
-            if (!empty($email)) {
-                $this->data['user_email'] = array_merge((array)$this->data['user_email'], (array)$email);
-            }
-        }
-        // Organization name for identity (first log in)
-        foreach ((array)$org_attr as $field) {
-            $organization = is_array($record[$field]) ? $record[$field][0] : $record[$field];
-            if (!empty($organization)) {
-                $this->data['user_organization'] = $organization;
-                break;
-            }
-        }
-
-        // Log "Login As" usage
-        if (!empty($origname)) {
-            rcube::write_log('userlogins', sprintf('Admin login for %s by %s from %s',
-                $args['user'], $origname, rcube_utils::remote_ip()));
-        }
-
-        // load per-user settings/plugins
-        $this->load_user_role_plugins_and_settings();
-
-        return $args;
-    }
-
-    /**
-     * Set user DN for password change (password plugin with ldap_simple driver)
-     */
-    public function password_ldap_bind($args)
-    {
-        $args['user_dn'] = $_SESSION['kolab_dn'];
-
-        $rcmail = rcube::get_instance();
-
-        $rcmail->config->set('password_ldap_method', 'user');
-
-        return $args;
-    }
-
-    /**
-     * Sets SASL Proxy login/password for IMAP and Managesieve auth
-     */
-    public function imap_connect($args)
-    {
-        if (!empty($_SESSION['kolab_auth_admin'])) {
-            $rcmail      = rcube::get_instance();
-            $admin_login = $rcmail->decrypt($_SESSION['kolab_auth_login']);
-            $admin_pass  = $rcmail->decrypt($_SESSION['kolab_auth_password']);
-
-            $args['auth_cid'] = $admin_login;
-            $args['auth_pw']  = $admin_pass;
-        }
-
-        return $args;
-    }
-
-    /**
-     * Sets SASL Proxy login/password for SMTP auth
-     */
-    public function smtp_connect($args)
-    {
-        if (!empty($_SESSION['kolab_auth_admin'])) {
-            $rcmail      = rcube::get_instance();
-            $admin_login = $rcmail->decrypt($_SESSION['kolab_auth_login']);
-            $admin_pass  = $rcmail->decrypt($_SESSION['kolab_auth_password']);
-
-            $args['smtp_auth_cid'] = $admin_login;
-            $args['smtp_auth_pw']  = $admin_pass;
-        }
-
-        return $args;
-    }
-
-    /**
-     * Hook to replace the plain text input field for email address by a drop-down list
-     * with all email addresses (including aliases) from this user's LDAP record.
-     */
-    public function identity_form($args)
-    {
-        $rcmail      = rcube::get_instance();
-        $ident_level = intval($rcmail->config->get('identities_level', 0));
-
-        // do nothing if email address modification is disabled
-        if ($ident_level == 1 || $ident_level == 3) {
-            return $args;
-        }
-
-        $ldap = self::ldap();
-        if (!$ldap || !$ldap->ready || empty($_SESSION['kolab_dn'])) {
-            return $args;
-        }
-
-        $emails      = array();
-        $user_record = $ldap->get_record($_SESSION['kolab_dn']);
-
-        foreach ((array)$rcmail->config->get('kolab_auth_email', array()) as $col) {
-            $values = rcube_addressbook::get_col_values($col, $user_record, true);
-            if (!empty($values))
-                $emails = array_merge($emails, array_filter($values));
-        }
-
-        // kolab_delegation might want to modify this addresses list
-        $plugin = $rcmail->plugins->exec_hook('kolab_auth_emails', array('emails' => $emails));
-        $emails = $plugin['emails'];
-
-        if (!empty($emails)) {
-            $args['form']['addressing']['content']['email'] = array(
-                'type' => 'select',
-                'options' => array_combine($emails, $emails),
-            );
-        }
-
-        return $args;
-    }
-
-    /**
-     * Action executed before the page is rendered to add an onload script
-     * that will remove all taskbar buttons for disabled tasks
-     */
-    public function render_page($args)
-    {
-        $rcmail  = rcube::get_instance();
-        $tasks   = (array)$_SESSION['kolab_auth_allowed_tasks'];
-        $tasks[] = 'logout';
-
-        // disable buttons in taskbar
-        $script = "
-        \$('a').filter(function() {
-            var ev = \$(this).attr('onclick');
-            return ev && ev.match(/'switch-task','([a-z]+)'/)
-                && \$.inArray(RegExp.\$1, " . json_encode($tasks) . ") < 0;
-        }).remove();
-        ";
-
-        $rcmail->output->add_script($script, 'docready');
-    }
-
-    /**
-     * Initializes LDAP object and connects to LDAP server
-     */
-    public static function ldap()
-    {
-        if (self::$ldap) {
-            return self::$ldap;
-        }
-
-        $rcmail      = rcube::get_instance();
-        $addressbook = $rcmail->config->get('kolab_auth_addressbook');
-
-        if (!is_array($addressbook)) {
-            $ldap_config = (array)$rcmail->config->get('ldap_public');
-            $addressbook = $ldap_config[$addressbook];
-        }
-
-        if (empty($addressbook)) {
-            return null;
-        }
-
-        require_once __DIR__ . '/kolab_auth_ldap.php';
-
-        self::$ldap = new kolab_auth_ldap($addressbook);
-
-        return self::$ldap;
-    }
-
-    /**
-     * Parses LDAP DN string with replacing supported variables.
-     * See kolab_auth_ldap::parse_vars()
-     *
-     * @param string $str LDAP DN string
-     *
-     * @return string Parsed DN string
-     */
-    public static function parse_ldap_vars($str)
-    {
-        if (!empty($_SESSION['kolab_auth_vars'])) {
-            $str = strtr($str, $_SESSION['kolab_auth_vars']);
-        }
-
-        return $str;
-    }
-}
diff --git a/lib/drivers/kolab/plugins/kolab_auth/kolab_auth_ldap.php b/lib/drivers/kolab/plugins/kolab_auth/kolab_auth_ldap.php
deleted file mode 100644
index 30c82bf..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/kolab_auth_ldap.php
+++ /dev/null
@@ -1,480 +0,0 @@
-<?php
-
-/**
- * Kolab Authentication
- *
- * @version @package_version@
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2011-2013, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * Wrapper class for rcube_ldap_generic
- */
-class kolab_auth_ldap extends rcube_ldap_generic
-{
-    private $conf     = array();
-    private $fieldmap = array();
-
-
-    function __construct($p)
-    {
-        $rcmail = rcube::get_instance();
-
-        $this->conf = $p;
-        $this->conf['kolab_auth_user_displayname'] = $rcmail->config->get('kolab_auth_user_displayname', '{name}');
-
-        $this->fieldmap = $p['fieldmap'];
-        $this->fieldmap['uid'] = 'uid';
-
-        $p['attributes'] = array_values($this->fieldmap);
-        $p['debug']      = (bool) $rcmail->config->get('ldap_debug');
-
-        // Connect to the server (with bind)
-        parent::__construct($p);
-        $this->_connect();
-
-        $rcmail->add_shutdown_function(array($this, 'close'));
-    }
-
-    /**
-    * Establish a connection to the LDAP server
-    */
-    private function _connect()
-    {
-        // try to connect + bind for every host configured
-        // with OpenLDAP 2.x ldap_connect() always succeeds but ldap_bind will fail if host isn't reachable
-        // see http://www.php.net/manual/en/function.ldap-connect.php
-        foreach ((array)$this->config['hosts'] as $host) {
-            // skip host if connection failed
-            if (!$this->connect($host)) {
-                continue;
-            }
-
-            $bind_pass = $this->config['bind_pass'];
-            $bind_user = $this->config['bind_user'];
-            $bind_dn   = $this->config['bind_dn'];
-
-            if (empty($bind_pass)) {
-                $this->ready = true;
-            }
-            else {
-                if (!empty($bind_dn)) {
-                    $this->ready = $this->bind($bind_dn, $bind_pass);
-                }
-                else if (!empty($this->config['auth_cid'])) {
-                    $this->ready = $this->sasl_bind($this->config['auth_cid'], $bind_pass, $bind_user);
-                }
-                else {
-                    $this->ready = $this->sasl_bind($bind_user, $bind_pass);
-                }
-            }
-
-            // connection established, we're done here
-            if ($this->ready) {
-                break;
-            }
-
-        }  // end foreach hosts
-
-        if (!is_resource($this->conn)) {
-            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Could not connect to any LDAP server, last tried $host"), true);
-
-            $this->ready = false;
-        }
-
-        return $this->ready;
-    }
-
-    /**
-     * Fetches user data from LDAP addressbook
-     */
-    function get_user_record($user, $host)
-    {
-        $rcmail  = rcube::get_instance();
-        $filter  = $rcmail->config->get('kolab_auth_filter');
-        $filter  = $this->parse_vars($filter, $user, $host);
-        $base_dn = $this->parse_vars($this->config['base_dn'], $user, $host);
-        $scope   = $this->config['scope'];
-
-        // @TODO: print error if filter is empty
-
-        // get record
-        if ($result = parent::search($base_dn, $filter, $scope, $this->attributes)) {
-            if ($result->count() == 1) {
-                $entries = $result->entries(true);
-                $dn      = key($entries);
-                $entry   = array_pop($entries);
-                $entry   = $this->field_mapping($dn, $entry);
-
-                return $entry;
-            }
-        }
-    }
-
-    /**
-     * Fetches user data from LDAP addressbook
-     */
-    function get_user_groups($dn, $user, $host)
-    {
-        if (empty($dn) || empty($this->config['groups'])) {
-            return array();
-        }
-
-        $base_dn     = $this->parse_vars($this->config['groups']['base_dn'], $user, $host);
-        $name_attr   = $this->config['groups']['name_attr'] ? $this->config['groups']['name_attr'] : 'cn';
-        $member_attr = $this->get_group_member_attr();
-        $filter      = "(member=$dn)(uniqueMember=$dn)";
-
-        if ($member_attr != 'member' && $member_attr != 'uniqueMember')
-            $filter .= "($member_attr=$dn)";
-        $filter = strtr("(|$filter)", array("\\" => "\\\\"));
-
-        $result = parent::search($base_dn, $filter, 'sub', array('dn', $name_attr));
-
-        if (!$result) {
-            return array();
-        }
-
-        $groups = array();
-        foreach ($result as $entry) {
-            $dn    = $entry['dn'];
-            $entry = rcube_ldap_generic::normalize_entry($entry);
-
-            $groups[$dn] = $entry[$name_attr];
-        }
-
-        return $groups;
-    }
-
-    /**
-     * Get a specific LDAP record
-     *
-     * @param string DN
-     *
-     * @return array Record data
-     */
-    function get_record($dn)
-    {
-        if (!$this->ready) {
-            return;
-        }
-
-        if ($rec = $this->get_entry($dn)) {
-            $rec = rcube_ldap_generic::normalize_entry($rec);
-            $rec = $this->field_mapping($dn, $rec);
-        }
-
-        return $rec;
-    }
-
-    /**
-     * Replace LDAP record data items
-     *
-     * @param string $dn    DN
-     * @param array  $entry LDAP entry
-     *
-     * return bool True on success, False on failure
-     */
-    function replace($dn, $entry)
-    {
-        // fields mapping
-        foreach ($this->fieldmap as $field => $attr) {
-            if (array_key_exists($field, $entry)) {
-                $entry[$attr] = $entry[$field];
-                if ($attr != $field) {
-                    unset($entry[$field]);
-                }
-            }
-        }
-
-        return $this->mod_replace($dn, $entry);
-    }
-
-    /**
-     * Search records (simplified version of rcube_ldap::search)
-     *
-     * @param mixed   $fields   The field name or array of field names to search in
-     * @param string  $value    Search value
-     * @param int     $mode     Matching mode:
-     *                          0 - partial (*abc*),
-     *                          1 - strict (=),
-     *                          2 - prefix (abc*)
-     * @param array   $required List of fields that cannot be empty
-     * @param int     $limit    Number of records
-     * @param int     $count    Returns the number of records found
-     *
-     * @return array List or false on error
-     */
-    function dosearch($fields, $value, $mode=1, $required = array(), $limit = 0, &$count = 0)
-    {
-        if (empty($fields)) {
-            return array();
-        }
-
-        $mode  = intval($mode);
-
-        // try to resolve field names into ldap attributes
-        $fieldmap = $this->fieldmap;
-        $attrs = array_map(function($f) use ($fieldmap) {
-            return array_key_exists($f, $fieldmap) ? $fieldmap[$f] : $f;
-        }, (array)$fields);
-
-        // compose a full-text-search-like filter
-        if (count($attrs) > 1 || $mode != 1) {
-            $filter = self::fulltext_search_filter($value, $attrs, $mode);
-        }
-        // direct search
-        else {
-            $field  = $attrs[0];
-            $filter = "($field=" . self::quote_string($value) . ")";
-        }
-
-        // add required (non empty) fields filter
-        $req_filter = '';
-
-        foreach ((array)$required as $field) {
-            $attr = array_key_exists($field, $this->fieldmap) ? $this->fieldmap[$field] : $field;
-
-            // only add if required field is not already in search filter
-            if (!in_array($attr, $attrs)) {
-                $req_filter .= "($attr=*)";
-            }
-        }
-
-        if (!empty($req_filter)) {
-            $filter = '(&' . $req_filter . $filter . ')';
-        }
-
-        // avoid double-wildcard if $value is empty
-        $filter = preg_replace('/\*+/', '*', $filter);
-
-        // add general filter to query
-        if (!empty($this->config['filter'])) {
-            $filter = '(&(' . preg_replace('/^\(|\)$/', '', $this->config['filter']) . ')' . $filter . ')';
-        }
-
-        $base_dn = $this->parse_vars($this->config['base_dn']);
-        $scope   = $this->config['scope'];
-        $attrs   = array_values($this->fieldmap);
-        $list    = array();
-
-        if ($result = $this->search($base_dn, $filter, $scope, $attrs)) {
-            $count = $result->count();
-            $i = 0;
-            foreach ($result as $entry) {
-                if ($limit && $limit <= $i) {
-                    break;
-                }
-
-                $dn        = $entry['dn'];
-                $entry     = rcube_ldap_generic::normalize_entry($entry);
-                $list[$dn] = $this->field_mapping($dn, $entry);
-                $i++;
-            }
-        }
-
-        return $list;
-    }
-
-    /**
-     * Set filter used in search()
-     */
-    function set_filter($filter)
-    {
-        $this->config['filter'] = $filter;
-    }
-
-    /**
-     * Maps LDAP attributes to defined fields
-     */
-    protected function field_mapping($dn, $entry)
-    {
-        $entry['dn'] = $dn;
-
-        // fields mapping
-        foreach ($this->fieldmap as $field => $attr) {
-            // $entry might be indexed by lower-case attribute names
-            $attr_lc = strtolower($attr);
-            if (isset($entry[$attr_lc])) {
-                $entry[$field] = $entry[$attr_lc];
-            }
-            else if (isset($entry[$attr])) {
-                $entry[$field] = $entry[$attr];
-            }
-        }
-
-        // compose display name according to config
-        if (empty($this->fieldmap['displayname'])) {
-            $entry['displayname'] = rcube_addressbook::compose_search_name(
-                $entry,
-                $entry['email'],
-                $entry['name'],
-                $this->conf['kolab_auth_user_displayname']
-            );
-        }
-
-        return $entry;
-    }
-
-    /**
-     * Detects group member attribute name
-     */
-    private function get_group_member_attr($object_classes = array())
-    {
-        if (empty($object_classes)) {
-            $object_classes = $this->config['groups']['object_classes'];
-        }
-        if (!empty($object_classes)) {
-            foreach ((array)$object_classes as $oc) {
-                switch (strtolower($oc)) {
-                    case 'group':
-                    case 'groupofnames':
-                    case 'kolabgroupofnames':
-                        $member_attr = 'member';
-                        break;
-
-                    case 'groupofuniquenames':
-                    case 'kolabgroupofuniquenames':
-                        $member_attr = 'uniqueMember';
-                        break;
-                }
-            }
-        }
-
-        if (!empty($member_attr)) {
-            return $member_attr;
-        }
-
-        if (!empty($this->config['groups']['member_attr'])) {
-            return $this->config['groups']['member_attr'];
-        }
-
-        return 'member';
-    }
-
-    /**
-     * Prepares filter query for LDAP search
-     */
-    function parse_vars($str, $user = null, $host = null)
-    {
-        // When authenticating user $user is always set
-        // if not set it means we use this LDAP object for other
-        // purposes, e.g. kolab_delegation, then username with
-        // correct domain is in a session
-        if (!$user) {
-            $user = $_SESSION['username'];
-        }
-
-        if (isset($this->icache[$user])) {
-            list($user, $dc) = $this->icache[$user];
-        }
-        else {
-            $orig_user = $user;
-            $rcmail = rcube::get_instance();
-
-            // get default domain
-            if ($username_domain = $rcmail->config->get('username_domain')) {
-                if ($host && is_array($username_domain) && isset($username_domain[$host])) {
-                    $domain = rcube_utils::parse_host($username_domain[$host], $host);
-                }
-                else if (is_string($username_domain)) {
-                    $domain = rcube_utils::parse_host($username_domain, $host);
-                }
-            }
-
-            // realmed username (with domain)
-            if (strpos($user, '@')) {
-                list($usr, $dom) = explode('@', $user);
-
-                // unrealm domain, user login can contain a domain alias
-                if ($dom != $domain && ($dc = $this->domain_root_dn($dom))) {
-                    // @FIXME: we should replace domain in $user, I suppose
-                }
-            }
-            else if ($domain) {
-                $user .= '@' . $domain;
-            }
-
-            $this->icache[$orig_user] = array($user, $dc);
-        }
-
-        // replace variables in filter
-        list($u, $d) = explode('@', $user);
-
-        // hierarchal domain string
-        if (empty($dc)) {
-            $dc = 'dc=' . strtr($d, array('.' => ',dc='));
-        }
-
-        $replaces = array('%dc' => $dc, '%d' => $d, '%fu' => $user, '%u' => $u);
-
-        $this->parse_replaces = $replaces;
-
-        return strtr($str, $replaces);
-    }
-
-    /**
-     * Returns variables used for replacement in (last) parse_vars() call
-     *
-     * @return array Variable-value hash array
-     */
-    public function get_parse_vars()
-    {
-        return $this->parse_replaces;
-    }
-
-    /**
-     * Register additional fields
-     */
-    public function extend_fieldmap($map)
-    {
-        foreach ((array)$map as $name => $attr) {
-            if (!in_array($attr, $this->attributes)) {
-                $this->attributes[]    = $attr;
-                $this->fieldmap[$name] = $attr;
-            }
-        }
-    }
-
-    /**
-     * HTML-safe DN string encoding
-     *
-     * @param string $str DN string
-     *
-     * @return string Encoded HTML identifier string
-     */
-    static function dn_encode($str)
-    {
-        return rtrim(strtr(base64_encode($str), '+/', '-_'), '=');
-    }
-
-    /**
-     * Decodes DN string encoded with _dn_encode()
-     *
-     * @param string $str Encoded HTML identifier string
-     *
-     * @return string DN string
-     */
-    static function dn_decode($str)
-    {
-        $str = str_pad(strtr($str, '-_', '+/'), strlen($str) % 4, '=', STR_PAD_RIGHT);
-        return base64_decode($str);
-    }
-}
diff --git a/lib/drivers/kolab/plugins/kolab_auth/localization/bg_BG.inc b/lib/drivers/kolab/plugins/kolab_auth/localization/bg_BG.inc
deleted file mode 100644
index 01e1ac2..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/localization/bg_BG.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Localizations for the Kolab Auth plugin
- *
- * Copyright (C) 2014, Kolab Systems AG
- *
- * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
- */
-$labels['loginas'] = 'Влизане като';
-?>
diff --git a/lib/drivers/kolab/plugins/kolab_auth/localization/de_CH.inc b/lib/drivers/kolab/plugins/kolab_auth/localization/de_CH.inc
deleted file mode 100644
index 3918e6e..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/localization/de_CH.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Localizations for the Kolab Auth plugin
- *
- * Copyright (C) 2014, Kolab Systems AG
- *
- * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
- */
-$labels['loginas'] = 'Anmelden als';
-$labels['loginasnotallowed'] = 'Keine Privilegien zum Anmelden als $user';
-?>
diff --git a/lib/drivers/kolab/plugins/kolab_auth/localization/de_DE.inc b/lib/drivers/kolab/plugins/kolab_auth/localization/de_DE.inc
deleted file mode 100644
index 3918e6e..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/localization/de_DE.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Localizations for the Kolab Auth plugin
- *
- * Copyright (C) 2014, Kolab Systems AG
- *
- * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
- */
-$labels['loginas'] = 'Anmelden als';
-$labels['loginasnotallowed'] = 'Keine Privilegien zum Anmelden als $user';
-?>
diff --git a/lib/drivers/kolab/plugins/kolab_auth/localization/en_US.inc b/lib/drivers/kolab/plugins/kolab_auth/localization/en_US.inc
deleted file mode 100644
index 4882bdc..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/localization/en_US.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-/**
- * Localizations for the Kolab Auth plugin
- *
- * Copyright (C) 2014, Kolab Systems AG
- *
- * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
- */
-
-$labels['loginas'] = 'Login As';
-$labels['loginasnotallowed'] = 'No privileges to login as $user';
-
-?>
diff --git a/lib/drivers/kolab/plugins/kolab_auth/localization/es_ES.inc b/lib/drivers/kolab/plugins/kolab_auth/localization/es_ES.inc
deleted file mode 100644
index ed203e6..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/localization/es_ES.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Localizations for the Kolab Auth plugin
- *
- * Copyright (C) 2014, Kolab Systems AG
- *
- * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
- */
-?>
diff --git a/lib/drivers/kolab/plugins/kolab_auth/localization/et_EE.inc b/lib/drivers/kolab/plugins/kolab_auth/localization/et_EE.inc
deleted file mode 100644
index ed203e6..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/localization/et_EE.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Localizations for the Kolab Auth plugin
- *
- * Copyright (C) 2014, Kolab Systems AG
- *
- * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
- */
-?>
diff --git a/lib/drivers/kolab/plugins/kolab_auth/localization/fr_FR.inc b/lib/drivers/kolab/plugins/kolab_auth/localization/fr_FR.inc
deleted file mode 100644
index 6538f5b..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/localization/fr_FR.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Localizations for the Kolab Auth plugin
- *
- * Copyright (C) 2014, Kolab Systems AG
- *
- * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
- */
-$labels['loginas'] = 'Se connecter en tant que';
-$labels['loginasnotallowed'] = 'Pas de privilège de se connecter comme $utilisateur';
-?>
diff --git a/lib/drivers/kolab/plugins/kolab_auth/localization/ja_JP.inc b/lib/drivers/kolab/plugins/kolab_auth/localization/ja_JP.inc
deleted file mode 100644
index e360737..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/localization/ja_JP.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Localizations for the Kolab Auth plugin
- *
- * Copyright (C) 2014, Kolab Systems AG
- *
- * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
- */
-$labels['loginas'] = 'ログイン';
-?>
diff --git a/lib/drivers/kolab/plugins/kolab_auth/localization/nl_NL.inc b/lib/drivers/kolab/plugins/kolab_auth/localization/nl_NL.inc
deleted file mode 100644
index ea3a1c0..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/localization/nl_NL.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Localizations for the Kolab Auth plugin
- *
- * Copyright (C) 2014, Kolab Systems AG
- *
- * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
- */
-$labels['loginas'] = 'Log in als';
-?>
diff --git a/lib/drivers/kolab/plugins/kolab_auth/localization/pl_PL.inc b/lib/drivers/kolab/plugins/kolab_auth/localization/pl_PL.inc
deleted file mode 100644
index ed203e6..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/localization/pl_PL.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Localizations for the Kolab Auth plugin
- *
- * Copyright (C) 2014, Kolab Systems AG
- *
- * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
- */
-?>
diff --git a/lib/drivers/kolab/plugins/kolab_auth/localization/pt_BR.inc b/lib/drivers/kolab/plugins/kolab_auth/localization/pt_BR.inc
deleted file mode 100644
index e594c2e..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/localization/pt_BR.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Localizations for the Kolab Auth plugin
- *
- * Copyright (C) 2014, Kolab Systems AG
- *
- * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
- */
-$labels['loginas'] = 'Logar como';
-?>
diff --git a/lib/drivers/kolab/plugins/kolab_auth/localization/ru_RU.inc b/lib/drivers/kolab/plugins/kolab_auth/localization/ru_RU.inc
deleted file mode 100644
index ac9e5a7..0000000
--- a/lib/drivers/kolab/plugins/kolab_auth/localization/ru_RU.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Localizations for the Kolab Auth plugin
- *
- * Copyright (C) 2014, Kolab Systems AG
- *
- * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
- */
-$labels['loginas'] = 'Войти как';
-$labels['loginasnotallowed'] = 'Нет привилегий войти как $user';
-?>
diff --git a/lib/drivers/kolab/plugins/libkolab/LICENSE b/lib/drivers/kolab/plugins/libkolab/LICENSE
deleted file mode 100644
index dba13ed..0000000
--- a/lib/drivers/kolab/plugins/libkolab/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/lib/drivers/kolab/plugins/libkolab/README b/lib/drivers/kolab/plugins/libkolab/README
deleted file mode 100644
index 2f94839..0000000
--- a/lib/drivers/kolab/plugins/libkolab/README
+++ /dev/null
@@ -1,28 +0,0 @@
-libkolab plugin to access to Kolab groupware data
-=================================================
-
-The contained library classes establish a connection to the Kolab server
-and manage the access to the Kolab groupware objects stored in various
-IMAP folders. For reading and writing these objects, the PHP bindings of
-the libkolabxml library are used.
-
-
-REQUIREMENTS
-------------
-* libkolabxml PHP bindings
-  - kolabformat.so loaded into PHP
-  - kolabformat.php placed somewhere in the include_path
-* PEAR: HTTP/Request2
-* PEAR: Net/URL2
-
-
-INSTALLATION
-------------
-To use local cache you need to create a dedicated table in Roundcube's database.
-To do so, execute the SQL commands in SQL/<yourdatabase>.initial.sql
-
-
-CONFIGURATION
--------------
-Rename config.inc.php.dist to config.inc.php in the plugin folder.
-For available configuration options see config.inc.php.dist file.
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/mysql.initial.sql b/lib/drivers/kolab/plugins/libkolab/SQL/mysql.initial.sql
deleted file mode 100644
index a1497da..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/mysql.initial.sql
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * libkolab database schema
- *
- * @version 1.1
- * @author Thomas Bruederli
- * @licence GNU AGPL
- **/
-
-/*!40014  SET FOREIGN_KEY_CHECKS=0 */;
-
-DROP TABLE IF EXISTS `kolab_folders`;
-
-CREATE TABLE `kolab_folders` (
-  `folder_id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `resource` VARCHAR(255) NOT NULL,
-  `type` VARCHAR(32) NOT NULL,
-  `synclock` INT(10) NOT NULL DEFAULT '0',
-  `ctag` VARCHAR(40) DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `objectcount` BIGINT DEFAULT NULL,
-  PRIMARY KEY(`folder_id`),
-  INDEX `resource_type` (`resource`, `type`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-DROP TABLE IF EXISTS `kolab_cache`;
-
-DROP TABLE IF EXISTS `kolab_cache_contact`;
-
-CREATE TABLE `kolab_cache_contact` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
-  `name` VARCHAR(255) NOT NULL,
-  `firstname` VARCHAR(255) NOT NULL,
-  `surname` VARCHAR(255) NOT NULL,
-  `email` VARCHAR(255) NOT NULL,
-  CONSTRAINT `fk_kolab_cache_contact_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `contact_type` (`folder_id`,`type`),
-  INDEX `contact_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-DROP TABLE IF EXISTS `kolab_cache_event`;
-
-CREATE TABLE `kolab_cache_event` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_event_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `event_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-DROP TABLE IF EXISTS `kolab_cache_task`;
-
-CREATE TABLE `kolab_cache_task` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_task_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `task_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-DROP TABLE IF EXISTS `kolab_cache_journal`;
-
-CREATE TABLE `kolab_cache_journal` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_journal_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `journal_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-DROP TABLE IF EXISTS `kolab_cache_note`;
-
-CREATE TABLE `kolab_cache_note` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  CONSTRAINT `fk_kolab_cache_note_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `note_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-DROP TABLE IF EXISTS `kolab_cache_file`;
-
-CREATE TABLE `kolab_cache_file` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `filename` varchar(255) DEFAULT NULL,
-  CONSTRAINT `fk_kolab_cache_file_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `folder_filename` (`folder_id`, `filename`),
-  INDEX `file_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-DROP TABLE IF EXISTS `kolab_cache_configuration`;
-
-CREATE TABLE `kolab_cache_configuration` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
-  CONSTRAINT `fk_kolab_cache_configuration_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `configuration_type` (`folder_id`,`type`),
-  INDEX `configuration_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-DROP TABLE IF EXISTS `kolab_cache_freebusy`;
-
-CREATE TABLE `kolab_cache_freebusy` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_freebusy_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `freebusy_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-/*!40014  SET FOREIGN_KEY_CHECKS=1 */;
-
-REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2015020600');
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013011000.sql b/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013011000.sql
deleted file mode 100644
index fe6741a..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013011000.sql
+++ /dev/null
@@ -1 +0,0 @@
--- empty
\ No newline at end of file
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013041900.sql b/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013041900.sql
deleted file mode 100644
index 76577e6..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013041900.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `kolab_cache` WHERE `type` = 'file';
-ALTER TABLE `kolab_cache` ADD `filename` varchar(255) DEFAULT NULL;
-ALTER TABLE `kolab_cache` ADD INDEX `resource_filename` (`resource`, `filename`);
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013100400.sql b/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013100400.sql
deleted file mode 100644
index d41d0e1..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013100400.sql
+++ /dev/null
@@ -1,174 +0,0 @@
-CREATE TABLE `kolab_folders` (
-  `folder_id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `resource` VARCHAR(255)  NOT NULL,
-  `type` VARCHAR(32) NOT NULL,
-  `synclock` INT(10) NOT NULL DEFAULT '0',
-  `ctag` VARCHAR(40) DEFAULT NULL,
-  PRIMARY KEY(`folder_id`),
-  INDEX `resource_type` (`resource`, `type`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_contact` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
-  CONSTRAINT `fk_kolab_cache_contact_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `contact_type` (`folder_id`,`type`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_event` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_event_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_task` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_task_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_journal` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_journal_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_note` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  CONSTRAINT `fk_kolab_cache_note_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_file` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `filename` varchar(255) DEFAULT NULL,
-  CONSTRAINT `fk_kolab_cache_file_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `folder_filename` (`folder_id`, `filename`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_configuration` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
-  CONSTRAINT `fk_kolab_cache_configuration_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `configuration_type` (`folder_id`,`type`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_freebusy` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_freebusy_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-
--- Migrate data from old kolab_cache table
-
-INSERT INTO kolab_folders (resource, type)
-  SELECT DISTINCT resource, type
-  FROM  kolab_cache WHERE type IN ('event','contact','task','file');
-
-INSERT INTO kolab_cache_event (folder_id, msguid, uid, created, changed, data, xml, tags, words, dtstart, dtend)
-  SELECT kolab_folders.folder_id, msguid, uid, created, changed, data, xml, tags, words, dtstart, dtend
-  FROM kolab_cache LEFT JOIN kolab_folders ON (kolab_folders.resource = kolab_cache.resource)
-  WHERE kolab_cache.type = 'event' AND kolab_folders.folder_id IS NOT NULL;
-
-INSERT INTO kolab_cache_task (folder_id, msguid, uid, created, changed, data, xml, tags, words, dtstart, dtend)
-  SELECT kolab_folders.folder_id, msguid, uid, created, changed, data, xml, tags, words, dtstart, dtend
-  FROM kolab_cache LEFT JOIN kolab_folders ON (kolab_folders.resource = kolab_cache.resource)
-  WHERE kolab_cache.type = 'task' AND kolab_folders.folder_id IS NOT NULL;
-
-INSERT INTO kolab_cache_contact (folder_id, msguid, uid, created, changed, data, xml, tags, words, type)
-  SELECT kolab_folders.folder_id, msguid, uid, created, changed, data, xml, tags, words, kolab_cache.type
-  FROM kolab_cache LEFT JOIN kolab_folders ON (kolab_folders.resource = kolab_cache.resource)
-  WHERE kolab_cache.type IN ('contact','distribution-list') AND kolab_folders.folder_id IS NOT NULL;
-
-INSERT INTO kolab_cache_file (folder_id, msguid, uid, created, changed, data, xml, tags, words, filename)
-  SELECT kolab_folders.folder_id, msguid, uid, created, changed, data, xml, tags, words, filename
-  FROM kolab_cache LEFT JOIN kolab_folders ON (kolab_folders.resource = kolab_cache.resource)
-  WHERE kolab_cache.type = 'file' AND kolab_folders.folder_id IS NOT NULL;
-
-
-DROP TABLE IF EXISTS `kolab_cache`;
-
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013110400.sql b/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013110400.sql
deleted file mode 100644
index 5b7a9ef..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013110400.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `kolab_cache_contact` CHANGE `xml` `xml` LONGTEXT NOT NULL;
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013121100.sql b/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013121100.sql
deleted file mode 100644
index 8cab5ef..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013121100.sql
+++ /dev/null
@@ -1,13 +0,0 @@
--- well, these deletes are really optional
--- we can clear all caches or only contacts/events/tasks
--- the issue we're fixing here was about contacts (Bug #2662)
-DELETE FROM `kolab_folders` WHERE `type` IN ('contact', 'event', 'task');
-
-ALTER TABLE `kolab_cache_contact` CHANGE `xml` `xml` LONGBLOB NOT NULL;
-ALTER TABLE `kolab_cache_event` CHANGE `xml` `xml` LONGBLOB NOT NULL;
-ALTER TABLE `kolab_cache_task` CHANGE `xml` `xml` LONGBLOB NOT NULL;
-ALTER TABLE `kolab_cache_journal` CHANGE `xml` `xml` LONGBLOB NOT NULL;
-ALTER TABLE `kolab_cache_note` CHANGE `xml` `xml` LONGBLOB NOT NULL;
-ALTER TABLE `kolab_cache_file` CHANGE `xml` `xml` LONGBLOB NOT NULL;
-ALTER TABLE `kolab_cache_configuration` CHANGE `xml` `xml` LONGBLOB NOT NULL;
-ALTER TABLE `kolab_cache_freebusy` CHANGE `xml` `xml` LONGBLOB NOT NULL;
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014021000.sql b/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014021000.sql
deleted file mode 100644
index 31ce699..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014021000.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-ALTER TABLE `kolab_cache_contact` ADD `name` VARCHAR(255) NOT NULL,
-  ADD `firstname` VARCHAR(255) NOT NULL,
-  ADD `surname` VARCHAR(255) NOT NULL,
-  ADD `email` VARCHAR(255) NOT NULL;
-
--- updating or clearing all contacts caches is required.
--- either run `bin/modcache.sh update --type=contact` or execute the following query:
---   DELETE FROM `kolab_folders` WHERE `type`='contact';
-
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014032700.sql b/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014032700.sql
deleted file mode 100644
index a45fae3..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014032700.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-ALTER TABLE `kolab_cache_configuration` ADD INDEX `configuration_uid2msguid` (`folder_id`, `uid`, `msguid`);
-ALTER TABLE `kolab_cache_contact` ADD INDEX `contact_uid2msguid` (`folder_id`, `uid`, `msguid`);
-ALTER TABLE `kolab_cache_event` ADD INDEX `event_uid2msguid` (`folder_id`, `uid`, `msguid`);
-ALTER TABLE `kolab_cache_task` ADD INDEX `task_uid2msguid` (`folder_id`, `uid`, `msguid`);
-ALTER TABLE `kolab_cache_journal` ADD INDEX `journal_uid2msguid` (`folder_id`, `uid`, `msguid`);
-ALTER TABLE `kolab_cache_note` ADD INDEX `note_uid2msguid` (`folder_id`, `uid`, `msguid`);
-ALTER TABLE `kolab_cache_file` ADD INDEX `file_uid2msguid` (`folder_id`, `uid`, `msguid`);
-ALTER TABLE `kolab_cache_freebusy` ADD INDEX `freebusy_uid2msguid` (`folder_id`, `uid`, `msguid`);
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014040900.sql b/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014040900.sql
deleted file mode 100644
index cfcaa9d..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014040900.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-ALTER TABLE `kolab_cache_contact` CHANGE `data` `data` LONGTEXT NOT NULL;
-ALTER TABLE `kolab_cache_event` CHANGE `data` `data` LONGTEXT NOT NULL;
-ALTER TABLE `kolab_cache_task` CHANGE `data` `data` LONGTEXT NOT NULL;
-ALTER TABLE `kolab_cache_journal` CHANGE `data` `data` LONGTEXT NOT NULL;
-ALTER TABLE `kolab_cache_note` CHANGE `data` `data` LONGTEXT NOT NULL;
-ALTER TABLE `kolab_cache_file` CHANGE `data` `data` LONGTEXT NOT NULL;
-ALTER TABLE `kolab_cache_configuration` CHANGE `data` `data` LONGTEXT NOT NULL;
-ALTER TABLE `kolab_cache_freebusy` CHANGE `data` `data` LONGTEXT NOT NULL;
-
--- rebuild cache entries for xcal objects with alarms
-DELETE FROM `kolab_cache_event` WHERE tags LIKE '% x-has-alarms %';
-DELETE FROM `kolab_cache_task` WHERE tags LIKE '% x-has-alarms %';
-
--- force cache synchronization
-UPDATE `kolab_folders` SET ctag='' WHERE `type` IN ('event','task');
-
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014112700.sql b/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014112700.sql
deleted file mode 100644
index 90c77b8..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014112700.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- delete cache entries for old folder identifiers
-DELETE FROM `kolab_folders` WHERE `resource` LIKE 'imap://anonymous@%';
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2015011600.sql b/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2015011600.sql
deleted file mode 100644
index be523ae..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2015011600.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-ALTER TABLE `kolab_cache_contact` MODIFY `tags` text NOT NULL;
-ALTER TABLE `kolab_cache_event` MODIFY `tags` text NOT NULL;
-ALTER TABLE `kolab_cache_task` MODIFY `tags` text NOT NULL;
-ALTER TABLE `kolab_cache_journal` MODIFY `tags` text NOT NULL;
-ALTER TABLE `kolab_cache_note` MODIFY `tags` text NOT NULL;
-ALTER TABLE `kolab_cache_file` MODIFY `tags` text NOT NULL;
-ALTER TABLE `kolab_cache_configuration` MODIFY `tags` text NOT NULL;
-ALTER TABLE `kolab_cache_freebusy` MODIFY `tags` text NOT NULL;
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2015020600.sql b/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2015020600.sql
deleted file mode 100644
index d9077a0..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/mysql/2015020600.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- improve cache synchronization (#3933)
-ALTER TABLE `kolab_folders`
-  ADD `changed` DATETIME DEFAULT NULL,
-  ADD `objectcount` BIGINT DEFAULT NULL;
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/oracle.initial.sql b/lib/drivers/kolab/plugins/libkolab/SQL/oracle.initial.sql
deleted file mode 100644
index cf1fae5..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/oracle.initial.sql
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * libkolab database schema
- *
- * @version 1.1
- * @author Aleksander Machniak
- * @licence GNU AGPL
- **/
-
-
-CREATE TABLE "kolab_folders" (
-    "folder_id" number NOT NULL PRIMARY KEY,
-    "resource" VARCHAR(255) NOT NULL,
-    "type" VARCHAR(32) NOT NULL,
-    "synclock" integer DEFAULT 0 NOT NULL,
-    "ctag" VARCHAR(40) DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "objectcount" number DEFAULT NULL
-);
-
-CREATE INDEX "kolab_folders_resource_idx" ON "kolab_folders" ("resource", "type");
-
-CREATE SEQUENCE "kolab_folders_seq"
-    START WITH 1 INCREMENT BY 1 NOMAXVALUE;
-
-CREATE TRIGGER "kolab_folders_seq_trig"
-BEFORE INSERT ON "kolab_folders" FOR EACH ROW
-BEGIN
-    :NEW."folder_id" := "kolab_folders_seq".nextval;
-END;
-/
-
-CREATE TABLE "kolab_cache_contact" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "type" varchar(32) NOT NULL,
-    "name" varchar(255) DEFAULT NULL,
-    "firstname" varchar(255) DEFAULT NULL,
-    "surname" varchar(255) DEFAULT NULL,
-    "email" varchar(255) DEFAULT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_contact_type_idx" ON "kolab_cache_contact" ("folder_id", "type");
-CREATE INDEX "kolab_cache_contact_uid2msguid" ON "kolab_cache_contact" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_event" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "dtstart" timestamp DEFAULT NULL,
-    "dtend" timestamp DEFAULT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_event_uid2msguid" ON "kolab_cache_event" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_task" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "dtstart" timestamp DEFAULT NULL,
-    "dtend" timestamp DEFAULT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_task_uid2msguid" ON "kolab_cache_task" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_journal" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "dtstart" timestamp DEFAULT NULL,
-    "dtend" timestamp DEFAULT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_journal_uid2msguid" ON "kolab_cache_journal" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_note" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_note_uid2msguid" ON "kolab_cache_note" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_file" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "filename" varchar(255) DEFAULT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_file_filename" ON "kolab_cache_file" ("folder_id", "filename");
-CREATE INDEX "kolab_cache_file_uid2msguid" ON "kolab_cache_file" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_configuration" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "type" varchar(32) NOT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_config_type" ON "kolab_cache_configuration" ("folder_id", "type");
-CREATE INDEX "kolab_cache_config_uid2msguid" ON "kolab_cache_configuration" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_freebusy" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "dtstart" timestamp DEFAULT NULL,
-    "dtend" timestamp DEFAULT NULL,
-    PRIMARY KEY("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_fb_uid2msguid" ON "kolab_cache_freebusy" ("folder_id", "uid", "msguid");
-
-
-INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2015020600');
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/oracle/2015011600.sql b/lib/drivers/kolab/plugins/libkolab/SQL/oracle/2015011600.sql
deleted file mode 100644
index 69f7953..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/oracle/2015011600.sql
+++ /dev/null
@@ -1,40 +0,0 @@
--- direct change from varchar to clob does not work, need temp column (#4257)
-ALTER TABLE "kolab_cache_contact" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_contact" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_contact" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_contact" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_event" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_event" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_event" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_event" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_task" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_task" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_task" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_task" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_journal" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_journal" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_journal" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_journal" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_note" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_note" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_note" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_note" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_file" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_file" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_file" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_file" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_configuration" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_configuration" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_configuration" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_configuration" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_freebusy" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_freebusy" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_freebusy" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_freebusy" RENAME COLUMN "tags1" TO "tags";
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/oracle/2015020600.sql b/lib/drivers/kolab/plugins/libkolab/SQL/oracle/2015020600.sql
deleted file mode 100644
index a605649..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/oracle/2015020600.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- improve cache synchronization (#3933)
-ALTER TABLE "kolab_folders"
-  ADD "changed" timestamp DEFAULT NULL,
-  ADD "objectcount" number DEFAULT NULL;
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/postgres.initial.sql b/lib/drivers/kolab/plugins/libkolab/SQL/postgres.initial.sql
deleted file mode 100644
index e06346c..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/postgres.initial.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * libkolab database schema
- *
- * @version @package_version@
- * @author Sidlyarenko Sergey
- * @licence GNU AGPL
- **/
-
-DROP TABLE IF EXISTS kolab_cache;
-
-CREATE TABLE kolab_cache (
-  resource character varying(255) NOT NULL,
-  type character varying(32) NOT NULL,
-  msguid NUMERIC(20) NOT NULL,
-  uid character varying(128) NOT NULL,
-  created timestamp without time zone DEFAULT NULL,
-  changed timestamp without time zone DEFAULT NULL,
-  data text NOT NULL,
-  xml text NOT NULL,
-  dtstart timestamp without time zone,
-  dtend timestamp without time zone,
-  tags character varying(255) NOT NULL,
-  words text NOT NULL,
-  filename character varying(255) DEFAULT NULL,
-  PRIMARY KEY(resource, type, msguid)
-);
-
-CREATE INDEX kolab_cache_resource_filename_idx ON kolab_cache (resource, filename);
-
-
-INSERT INTO system (name, value) VALUES ('libkolab-version', '2013041900');
diff --git a/lib/drivers/kolab/plugins/libkolab/SQL/sqlite.initial.sql b/lib/drivers/kolab/plugins/libkolab/SQL/sqlite.initial.sql
deleted file mode 100644
index 6f6f3c9..0000000
--- a/lib/drivers/kolab/plugins/libkolab/SQL/sqlite.initial.sql
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * libkolab database schema
- *
- * @version 1.1
- * @author Thomas Bruederli
- * @licence GNU AGPL
- **/
-
-CREATE TABLE kolab_folders (
-  folder_id INTEGER NOT NULL PRIMARY KEY,
-  resource VARCHAR(255) NOT NULL,
-  type VARCHAR(32) NOT NULL,
-  synclock INTEGER NOT NULL DEFAULT '0',
-  ctag VARCHAR(40) DEFAULT NULL,
-  changed DATETIME DEFAULT NULL,
-  objectcount INTEGER DEFAULT NULL
-);
-
-CREATE INDEX ix_resource_type ON kolab_folders(resource, type);
-
-CREATE TABLE kolab_cache_contact (
-  folder_id INTEGER NOT NULL,
-  msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
-  created DATETIME DEFAULT NULL,
-  changed DATETIME DEFAULT NULL,
-  data TEXT NOT NULL,
-  xml TEXT NOT NULL,
-  tags TEXT NOT NULL,
-  words TEXT NOT NULL,
-  type VARCHAR(32) NOT NULL,
-  name VARCHAR(255) NOT NULL,
-  firstname VARCHAR(255) NOT NULL,
-  surname VARCHAR(255) NOT NULL,
-  email VARCHAR(255) NOT NULL,
-  PRIMARY KEY(folder_id,msguid)
-);
-
-CREATE INDEX ix_contact_type ON kolab_cache_contact(folder_id,type);
-CREATE INDEX ix_contact_uid2msguid ON kolab_cache_contact(folder_id,uid,msguid);
-
-CREATE TABLE kolab_cache_event (
-  folder_id INTEGER NOT NULL,
-  msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
-  created DATETIME DEFAULT NULL,
-  changed DATETIME DEFAULT NULL,
-  data TEXT NOT NULL,
-  xml TEXT NOT NULL,
-  tags TEXT NOT NULL,
-  words TEXT NOT NULL,
-  dtstart DATETIME,
-  dtend DATETIME,
-  PRIMARY KEY(folder_id,msguid)
-);
-
-CREATE INDEX ix_event_uid2msguid ON kolab_cache_event(folder_id,uid,msguid);
-
-CREATE TABLE kolab_cache_task (
-  folder_id INTEGER NOT NULL,
-  msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
-  created DATETIME DEFAULT NULL,
-  changed DATETIME DEFAULT NULL,
-  data TEXT NOT NULL,
-  xml TEXT NOT NULL,
-  tags TEXT NOT NULL,
-  words TEXT NOT NULL,
-  dtstart DATETIME,
-  dtend DATETIME,
-  PRIMARY KEY(folder_id,msguid)
-);
-
-CREATE INDEX ix_task_uid2msguid ON kolab_cache_task(folder_id,uid,msguid);
-
-CREATE TABLE kolab_cache_journal (
-  folder_id INTEGER NOT NULL,
-  msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
-  created DATETIME DEFAULT NULL,
-  changed DATETIME DEFAULT NULL,
-  data TEXT NOT NULL,
-  xml TEXT NOT NULL,
-  tags TEXT NOT NULL,
-  words TEXT NOT NULL,
-  dtstart DATETIME,
-  dtend DATETIME,
-  PRIMARY KEY(folder_id,msguid)
-);
-
-CREATE INDEX ix_journal_uid2msguid ON kolab_cache_journal(folder_id,uid,msguid);
-
-CREATE TABLE kolab_cache_note (
-  folder_id INTEGER NOT NULL,
-  msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
-  created DATETIME DEFAULT NULL,
-  changed DATETIME DEFAULT NULL,
-  data TEXT NOT NULL,
-  xml TEXT NOT NULL,
-  tags TEXT NOT NULL,
-  words TEXT NOT NULL,
-  PRIMARY KEY(folder_id,msguid)
-);
-
-CREATE INDEX ix_note_uid2msguid ON kolab_cache_note(folder_id,uid,msguid);
-
-CREATE TABLE kolab_cache_file (
-  folder_id INTEGER NOT NULL,
-  msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
-  created DATETIME DEFAULT NULL,
-  changed DATETIME DEFAULT NULL,
-  data TEXT NOT NULL,
-  xml TEXT NOT NULL,
-  tags TEXT NOT NULL,
-  words TEXT NOT NULL,
-  filename varchar(255) DEFAULT NULL,
-  PRIMARY KEY(folder_id,msguid)
-);
-
-CREATE INDEX ix_folder_filename ON kolab_cache_file(folder_id,filename);
-CREATE INDEX ix_file_uid2msguid ON kolab_cache_file(folder_id,uid,msguid);
-
-CREATE TABLE kolab_cache_configuration (
-  folder_id INTEGER NOT NULL,
-  msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
-  created DATETIME DEFAULT NULL,
-  changed DATETIME DEFAULT NULL,
-  data TEXT NOT NULL,
-  xml TEXT NOT NULL,
-  tags TEXT NOT NULL,
-  words TEXT NOT NULL,
-  type VARCHAR(32) NOT NULL,
-  PRIMARY KEY(folder_id,msguid)
-);
-
-CREATE INDEX ix_configuration_type ON kolab_cache_configuration(folder_id,type);
-CREATE INDEX ix_configuration_uid2msguid ON kolab_cache_configuration(folder_id,uid,msguid);
-
-CREATE TABLE kolab_cache_freebusy (
-  folder_id INTEGER NOT NULL,
-  msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
-  created DATETIME DEFAULT NULL,
-  changed DATETIME DEFAULT NULL,
-  data TEXT NOT NULL,
-  xml TEXT NOT NULL,
-  tags TEXT NOT NULL,
-  words TEXT NOT NULL,
-  dtstart DATETIME,
-  dtend DATETIME,
-  PRIMARY KEY(folder_id,msguid)
-);
-
-CREATE INDEX ix_freebusy_uid2msguid ON kolab_cache_freebusy(folder_id,uid,msguid);
-
-INSERT INTO system (name, value) VALUES ('libkolab-version', '2015020600');
diff --git a/lib/drivers/kolab/plugins/libkolab/UPGRADING b/lib/drivers/kolab/plugins/libkolab/UPGRADING
deleted file mode 100644
index e7f04d8..0000000
--- a/lib/drivers/kolab/plugins/libkolab/UPGRADING
+++ /dev/null
@@ -1,9 +0,0 @@
-UPGRADING instructions
-======================
-
-To update database schema please run in Roundcube bin/ directory:
-
-updatedb.sh --package=libkolab --version=<version> --dir=../plugins/libkolab/SQL
-
-[*] Replace <version> with Roundcube version e.g. 0.7.3
-[*] Roundcube should be upgraded before plugin upgrades
diff --git a/lib/drivers/kolab/plugins/libkolab/bin/modcache.sh b/lib/drivers/kolab/plugins/libkolab/bin/modcache.sh
deleted file mode 100755
index 8208b6c..0000000
--- a/lib/drivers/kolab/plugins/libkolab/bin/modcache.sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/**
- * Kolab storage cache modification script
- *
- * @version 3.1
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALL_PATH', realpath('.') . '/' );
-ini_set('display_errors', 1);
-
-if (!file_exists(INSTALL_PATH . 'program/include/clisetup.php'))
-    die("Execute this from the Roundcube installation dir!\n\n");
-
-require_once INSTALL_PATH . 'program/include/clisetup.php';
-
-function print_usage()
-{
-	print "Usage:  modcache.sh ACTION [OPTIONS] [USERNAME ARGS ...]\n";
-	print "Possible actions are: expunge, clear, prewarm\n";
-	print "-a, --all      Clear/expunge all caches\n";
-	print "-h, --host     IMAP host name\n";
-	print "-u, --user     IMAP user name to authenticate\n";
-	print "-t, --type     Object types to clear/expunge cache\n";
-	print "-l, --limit    Limit the number of records to be expunged\n";
-}
-
-// read arguments
-$opts = rcube_utils::get_opt(array(
-    'a' => 'all',
-    'h' => 'host',
-    'u' => 'user',
-    'p' => 'password',
-    't' => 'type',
-    'l' => 'limit',
-    'v' => 'verbose',
-));
-
-$opts['username'] = !empty($opts[1]) ? $opts[1] : $opts['user'];
-$action = $opts[0];
-
-$rcmail = rcube::get_instance(rcube::INIT_WITH_DB | rcube::INIT_WITH_PLUGINS);
-
-
-// connect to database
-$db = $rcmail->get_dbh();
-$db->db_connect('w');
-if (!$db->is_connected() || $db->is_error())
-    die("No DB connection\n");
-
-ini_set('display_errors', 1);
-
-// All supported object types
-$all_types = array('contact','configuration','event','file','journal','note','task');
-
-/*
- * Script controller
- */
-switch (strtolower($action)) {
-
-/*
- * Clear/expunge all cache records
- */
-case 'expunge':
-    $folder_types = $opts['type'] ? explode(',', $opts['type']) : $all_types;
-    $folder_types_db = array_map(array($db, 'quote'), $folder_types);
-    $expire = strtotime(!empty($opts[2]) ? $opts[2] : 'now - 10 days');
-    $sql_where = "type IN (" . join(',', $folder_types_db) . ")";
-
-    if ($opts['username']) {
-        $sql_where .= ' AND resource LIKE ?';
-    }
-
-    $sql_query = "DELETE FROM %s WHERE folder_id IN (SELECT folder_id FROM kolab_folders WHERE $sql_where) AND created <= " . $db->quote(date('Y-m-d 00:00:00', $expire));
-    if ($opts['limit']) {
-        $sql_query .= ' LIMIT ' . intval($opts['limit']);
-    }
-    foreach ($folder_types as $type) {
-        $table_name = 'kolab_cache_' . $type;
-        $db->query(sprintf($sql_query, $table_name), resource_prefix($opts).'%');
-        echo $db->affected_rows() . " records deleted from '$table_name'\n";
-    }
-
-    $db->query("UPDATE kolab_folders SET ctag='' WHERE $sql_where", resource_prefix($opts).'%');
-    break;
-
-case 'clear':
-    $folder_types = $opts['type'] ? explode(',', $opts['type']) : $all_types;
-    $folder_types_db = array_map(array($db, 'quote'), $folder_types);
-
-    if ($opts['all']) {
-        $sql_query = "DELETE FROM kolab_folders WHERE 1";
-    }
-    else if ($opts['username']) {
-        $sql_query = "DELETE FROM kolab_folders WHERE type IN (" . join(',', $folder_types_db) . ") AND resource LIKE ?";
-    }
-
-    if ($sql_query) {
-        $db->query($sql_query, resource_prefix($opts).'%');
-        echo $db->affected_rows() . " records deleted from 'kolab_folders'\n";
-    }
-    break;
-
-
-/*
- * Prewarm cache by synchronizing objects for the given user
- */
-case 'prewarm':
-    // make sure libkolab classes are loaded
-    $rcmail->plugins->load_plugin('libkolab');
-
-    if (authenticate($opts)) {
-        $folder_types = $opts['type'] ? explode(',', $opts['type']) : $all_types;
-        foreach ($folder_types as $type) {
-            // sync every folder of the given type
-            foreach (kolab_storage::get_folders($type) as $folder) {
-                echo "Synching " . $folder->name . " ($type) ... ";
-                echo $folder->count($type) . "\n";
-
-                // also sync distribution lists in contact folders
-                if ($type == 'contact') {
-                    echo "Synching " . $folder->name . " (distribution-list) ... ";
-                    echo $folder->count('distribution-list') . "\n";
-                }
-            }
-        }
-    }
-    else
-        die("Authentication failed for " . $opts['user']);
-    break;
-
-/**
- * Update the cache meta columns from the serialized/xml data
- * (might be run after a schema update)
- */
-case 'update':
-    // make sure libkolab classes are loaded
-    $rcmail->plugins->load_plugin('libkolab');
-
-    $folder_types = $opts['type'] ? explode(',', $opts['type']) : $all_types;
-    foreach ($folder_types as $type) {
-        $class = 'kolab_storage_cache_' . $type;
-        $sql_result = $db->query("SELECT folder_id FROM kolab_folders WHERE type=? AND synclock = 0", $type);
-        while ($sql_result && ($sql_arr = $db->fetch_assoc($sql_result))) {
-            $folder = new $class;
-            $folder->select_by_id($sql_arr['folder_id']);
-            echo "Updating " . $sql_arr['folder_id'] . " ($type) ";
-            foreach ($folder->select() as $object) {
-                $object['_formatobj']->to_array();  // load data
-                $folder->save($object['_msguid'], $object, $object['_msguid']);
-                echo ".";
-            }
-            echo "done.\n";
-        }
-    }
-    break;
-
-
-/*
- * Unknown action => show usage
- */
-default:
-    print_usage();
-    exit;
-}
-
-
-/**
- * Compose cache resource URI prefix for the given user credentials
- */
-function resource_prefix($opts)
-{
-    return 'imap://' . str_replace('%', '\\%', urlencode($opts['username'])) . '@' . $opts['host'] . '/';
-}
-
-
-/**
- * Authenticate to the IMAP server with the given user credentials
- */
-function authenticate(&$opts)
-{
-    global $rcmail;
-
-    // prompt for password
-    if (empty($opts['password']) && ($opts['username'] || $opts['user'])) {
-        $opts['password'] = prompt_silent("Password: ");
-    }
-
-    // simulate "login as" feature
-    if ($opts['user'] && $opts['user'] != $opts['username'])
-        $_POST['_loginas'] = $opts['username'];
-    else if (empty($opts['user']))
-        $opts['user'] = $opts['username'];
-
-    // let the kolab_auth plugin do its magic
-    $auth = $rcmail->plugins->exec_hook('authenticate', array(
-        'host' => trim($opts['host']),
-        'user' => trim($opts['user']),
-        'pass' => $opts['password'],
-        'cookiecheck' => false,
-        'valid' => !empty($opts['user']) && !empty($opts['host']),
-    ));
-
-    if ($auth['valid']) {
-        $storage = $rcmail->get_storage();
-        if ($storage->connect($auth['host'], $auth['user'], $auth['pass'], 143, false)) {
-            if ($opts['verbose'])
-                echo "IMAP login succeeded.\n";
-            if (($user = rcube_user::query($opts['username'], $auth['host'])) && $user->ID)
-                $rcmail->user = $user;
-        }
-        else
-            die("Login to IMAP server failed!\n");
-    }
-    else {
-        die("Invalid login credentials!\n");
-    }
-
-    return $auth['valid'];
-}
-
diff --git a/lib/drivers/kolab/plugins/libkolab/bin/randomcontacts.sh b/lib/drivers/kolab/plugins/libkolab/bin/randomcontacts.sh
deleted file mode 100755
index e6154bb..0000000
--- a/lib/drivers/kolab/plugins/libkolab/bin/randomcontacts.sh
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/**
- * Generate a number contacts with random data
- *
- * @version 3.1
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALL_PATH', realpath('.') . '/' );
-ini_set('display_errors', 1);
-
-if (!file_exists(INSTALL_PATH . 'program/include/clisetup.php'))
-    die("Execute this from the Roundcube installation dir!\n\n");
-
-require_once INSTALL_PATH . 'program/include/clisetup.php';
-
-function print_usage()
-{
-    print "Usage:  randomcontacts.sh [OPTIONS] USERNAME FOLDER\n";
-    print "Create random contact that for then given user in the specified folder.\n";
-    print "-n, --num      Number of contacts to be created, defaults to 50\n";
-    print "-h, --host     IMAP host name\n";
-    print "-p, --password IMAP user password\n";
-}
-
-// read arguments
-$opts = rcube_utils::get_opt(array(
-    'n' => 'num',
-    'h' => 'host',
-    'u' => 'user',
-    'p' => 'pass',
-    'v' => 'verbose',
-));
-
-$opts['username'] = !empty($opts[0]) ? $opts[0] : $opts['user'];
-$opts['folder'] = $opts[1];
-
-$rcmail = rcube::get_instance(rcube::INIT_WITH_DB | rcube::INIT_WITH_PLUGINS);
-$rcmail->plugins->load_plugins(array('libkolab'));
-ini_set('display_errors', 1);
-
-
-if (empty($opts['host'])) {
-    $opts['host'] = $rcmail->config->get('default_host');
-    if (is_array($opts['host']))  // not unique
-        $opts['host'] = null;
-}
-
-if (empty($opts['username']) || empty($opts['folder']) || empty($opts['host'])) {
-    print_usage();
-    exit;
-}
-
-// prompt for password
-if (empty($opts['pass'])) {
-    $opts['pass'] = rcube_utils::prompt_silent("Password: ");
-}
-
-// parse $host URL
-$a_host = parse_url($opts['host']);
-if ($a_host['host']) {
-    $host = $a_host['host'];
-    $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? TRUE : FALSE;
-    $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : 143);
-}
-else {
-    $host = $opts['host'];
-    $imap_port = 143;
-}
-
-// instantiate IMAP class
-$IMAP = $rcmail->get_storage();
-
-// try to connect to IMAP server
-if ($IMAP->connect($host, $opts['username'], $opts['pass'], $imap_port, $imap_ssl)) {
-    print "IMAP login successful.\n";
-    $user = rcube_user::query($opts['username'], $host);
-    $rcmail->user = $user ?: new rcube_user(null, array('username' => $opts['username'], 'host' => $host));
-}
-else {
-    die("IMAP login failed for user " . $opts['username'] . " @ $host\n");
-}
-
-// get contacts folder
-$folder = kolab_storage::get_folder($opts['folder']);
-if (!$folder || empty($folder->type)) {
-    die("Invalid Address Book " . $opts['folder'] . "\n");
-}
-
-$format = new kolab_format_contact;
-
-$num = $opts['num'] ? intval($opts['num']) : 50;
-echo "Creating $num contacts in " . $folder->get_resource_uri() . "\n";
-
-for ($i=0; $i < $num; $i++) {
-    // generate random names
-    $contact = array(
-        'surname' => random_string(rand(1,2)),
-        'firstname' => random_string(rand(1,2)),
-        'organization' => random_string(rand(0,2)),
-        'profession' => random_string(rand(1,2)),
-        'email' => array(),
-        'phone' => array(),
-        'address' => array(),
-        'notes' => random_string(rand(10,200)),
-    );
-
-    // randomly add email addresses
-    $em = rand(1,3);
-    for ($e=0; $e < $em; $e++) {
-        $type = array_rand($format->emailtypes);
-        $contact['email'][] = array(
-            'address' => strtolower(random_string(1) . '@' . random_string(1) . '.tld'),
-            'type' => $type,
-        );
-    }
-
-    // randomly add phone numbers
-    $ph = rand(1,4);
-    for ($p=0; $p < $ph; $p++) {
-        $type = array_rand($format->phonetypes);
-        $contact['phone'][] = array(
-            'number' => '+'.rand(2,8).rand(1,9).rand(1,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9),
-            'type' => $type,
-        );
-    }
-
-    // randomly add addresses
-    $ad = rand(0,2);
-    for ($a=0; $a < $ad; $a++) {
-        $type = array_rand($format->addresstypes);
-        $contact['address'][] = array(
-            'street' => random_string(rand(1,3)),
-            'locality' => random_string(rand(1,2)),
-            'code' => rand(1000, 89999),
-            'country' => random_string(1),
-            'type' => $type,
-        );
-    }
-
-    $contact['name'] = $contact['firstname'] . ' ' . $contact['surname'];
-
-    if ($folder->save($contact, 'contact')) {
-        echo ".";
-    }
-    else {
-        echo "x";
-        break;  // abort on error
-    }
-}
-
-echo " done.\n";
-
-
-
-function random_string($len)
-{
-    $words = explode(" ", "The Hough transform is named after Paul Hough who patented the method in 1962. It is a technique which can be used to isolate features of a particular shape within an image. Because it requires that the desired features be specified in some parametric form, the classical Hough transform is most commonly used for the de- tection of regular curves such as lines, circles, ellipses, etc. A generalized Hough transform can be employed in applications where a simple analytic description of a features is not possible. Due to the computational complexity of the generalized Hough algorithm, we restrict the main focus of this discussion to the classical Hough transform. Despite its domain restrictions, the classical Hough transform hereafter referred to without the classical prefix retains many applications, as most manufac- tured parts and many anatomical parts investigated in medical imagery contain feature boundaries which can be described by regular curves. The main advantage of the Hough transform technique is that it is tolerant of gaps in feature boundary descriptions and is relatively unaffected by image noise.");
-    for ($i = 0; $i < $len; $i++) {
-        $str .= $words[rand(0,count($words)-1)] . " ";
-    }
-
-    return rtrim($str);
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/bin/readcache.sh b/lib/drivers/kolab/plugins/libkolab/bin/readcache.sh
deleted file mode 100755
index 238741f..0000000
--- a/lib/drivers/kolab/plugins/libkolab/bin/readcache.sh
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/**
- * Kolab storage cache testing script
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALL_PATH', realpath('.') . '/' );
-ini_set('display_errors', 1);
-libxml_use_internal_errors(true);
-
-if (!file_exists(INSTALL_PATH . 'program/include/clisetup.php'))
-    die("Execute this from the Roundcube installation dir!\n\n");
-
-require_once INSTALL_PATH . 'program/include/clisetup.php';
-
-function print_usage()
-{
-	print "Usage:  readcache.sh [OPTIONS] FOLDER\n";
-	print "-h, --host     IMAP host name\n";
-	print "-l, --limit    Limit the number of records to be listed\n";
-}
-
-// read arguments
-$opts = rcube_utils::get_opt(array(
-    'h' => 'host',
-    'l' => 'limit',
-    'v' => 'verbose',
-));
-
-$folder = $opts[0];
-$imap_host = $opts['host'];
-
-$rcmail = rcube::get_instance(rcube::INIT_WITH_DB | rcube::INIT_WITH_PLUGINS);
-
-if (empty($imap_host)) {
-    $default_host = $rcmail->config->get('default_host');
-    if (is_array($default_host)) {
-        list($k,$v) = each($default_host);
-        $imap_host = is_numeric($k) ? $v : $k;
-    }
-    else {
-        $imap_host = $default_host;
-    }
-
-    // strip protocol prefix
-    $imap_host = preg_replace('!^[a-z]+://!', '', $imap_host);
-}
-
-if (empty($folder) || empty($imap_host)) {
-    print_usage();
-    exit;
-}
-
-// connect to database
-$db = $rcmail->get_dbh();
-$db->db_connect('r');
-if (!$db->is_connected() || $db->is_error())
-    die("No DB connection\n");
-
-
-// resolve folder_id
-if (!is_numeric($folder)) {
-    if (strpos($folder, '@')) {
-        list($mailbox, $domain) = explode('@', $folder);
-        list($username, $subpath) = explode('/', preg_replace('!^user/!', '', $mailbox), 2);
-        $folder_uri = 'imap://' . urlencode($username.'@'.$domain) . '@' . $imap_host . '/' . $subpath;
-    }
-    else {
-        die("Invalid mailbox identifier! Example: user/john.doe/Calendar@example.org\n");
-    }
-
-    print "Resolving folder $folder_uri...";
-    $sql_result = $db->query('SELECT * FROM `kolab_folders` WHERE `resource`=?', $folder_uri);
-    if ($sql_result && ($folder_data = $db->fetch_assoc($sql_result))) {
-        $folder_id = $folder_data['folder_id'];
-        print $folder_id;
-    }
-    print "\n";
-}
-else {
-    $folder_id = intval($folder);
-    $sql_result = $db->query('SELECT * FROM `kolab_folders` WHERE `folder_id`=?', $folder_id);
-    if ($sql_result) {
-        $folder_data = $db->fetch_assoc($sql_result);
-    }
-}
-
-if (empty($folder_data)) {
-    die("Can't find cache mailbox for '$folder'\n");
-}
-
-print "Querying cache for folder $folder_id ($folder_data[type])...\n";
-
-$extra_cols = array(
-    'event'   => array('dtstart','dtend'),
-    'contact' => array('type'),
-);
-
-$cache_table = $db->table_name('kolab_cache_' . $folder_data['type']);
-$extra_cols_ = $extra_cols[$folder_data['type']] ?: array();
-$sql_arr = $db->fetch_assoc($db->query("SELECT COUNT(*) as cnt FROM `$cache_table` WHERE `folder_id`=?", intval($folder_id)));
-
-print "CTag  = " . $folder_data['ctag'] . "\n";
-print "Lock  = " . $folder_data['synclock'] . "\n";
-print "Count = " . $sql_arr['cnt'] . "\n";
-print "----------------------------------------------------------------------------------\n";
-print "<MSG>\t<UUID>\t<CHANGED>\t<DATA>\t<XML>\t";
-print join("\t", array_map(function($c) { return '<' . strtoupper($c) . '>'; }, $extra_cols_));
-print "\n----------------------------------------------------------------------------------\n";
-
-$result = $db->limitquery("SELECT * FROM `$cache_table` WHERE `folder_id`=?", 0, $opts['limit'], intval($folder_id));
-while ($result && ($sql_arr = $db->fetch_assoc($result))) {
-    print $sql_arr['msguid'] . "\t" . $sql_arr['uid'] . "\t" . $sql_arr['changed'];
-
-    // try to unserialize data block
-    $object = @unserialize(@base64_decode($sql_arr['data']));
-    print "\t" . ($object === false ? 'FAIL!' : ($object['uid'] == $sql_arr['uid'] ? 'OK' : '!!!'));
-
-    // check XML validity
-    $xml = simplexml_load_string($sql_arr['xml']);
-    print "\t" . ($xml === false ? 'FAIL!' : 'OK');
-
-    // print extra cols
-    array_walk($extra_cols_, function($c) use ($sql_arr) {
-        print "\t" . $sql_arr[$c];
-    });
-
-    print "\n";
-}
-
-print "----------------------------------------------------------------------------------\n";
-echo "Done.\n";
diff --git a/lib/drivers/kolab/plugins/libkolab/composer.json b/lib/drivers/kolab/plugins/libkolab/composer.json
deleted file mode 100644
index 41b70ea..0000000
--- a/lib/drivers/kolab/plugins/libkolab/composer.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "name": "kolab/libkolab",
-    "type": "roundcube-plugin",
-    "description": "Plugin to setup a basic environment for the interaction with a Kolab server.",
-    "homepage": "https://git.kolab.org/diffusion/RPK/",
-    "license": "AGPLv3",
-    "version": "3.2.8",
-    "authors": [
-        {
-            "name": "Thomas Bruederli",
-            "email": "bruederli@kolabsys.com",
-            "role": "Lead"
-        },
-        {
-            "name": "Aleksander Machniak",
-            "email": "machniak@kolabsys.com",
-            "role": "Developer"
-        }
-    ],
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "http://plugins.roundcube.net"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0",
-        "roundcube/plugin-installer": ">=0.1.3",
-        "caxy/php-htmldiff": "dev-master"
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/config.inc.php.dist b/lib/drivers/kolab/plugins/libkolab/config.inc.php.dist
deleted file mode 100644
index a2c15e8..0000000
--- a/lib/drivers/kolab/plugins/libkolab/config.inc.php.dist
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/* Configuration for libkolab */
-
-// Enable caching of Kolab objects in local database
-$config['kolab_cache'] = true;
-
-// Cache refresh interval (default is 12 hours)
-// after this period, cache is forced to synchronize with IMAP
-$config['kolab_cache_refresh'] = '12h';
-
-// Specify format version to write Kolab objects (must be a string value!)
-$config['kolab_format_version']  = '3.0';
-
-// Optional override of the URL to read and trigger Free/Busy information of Kolab users
-// Defaults to /freebusy or https://<imap-server->/freebusy
-$config['kolab_freebusy_server'] = null;
-
-// Enables listing of only subscribed folders. This e.g. will limit
-// folders in calendar view or available addressbooks
-$config['kolab_use_subscriptions'] = false;
-
-// List any of 'personal','shared','other' namespaces to be excluded from groupware folder listing
-// example: array('other');
-$config['kolab_skip_namespace'] = null;
-
-// Enables the use of displayname folder annotations as introduced in KEP:?
-// for displaying resource folder names (experimental!)
-$config['kolab_custom_display_names'] = false;
-
-// Configuration of HTTP requests.
-// See http://pear.php.net/manual/en/package.http.http-request2.config.php
-// for list of supported configuration options (array keys)
-$config['kolab_http_request'] = array();
-
-// When kolab_cache is enabled Roundcube's messages cache will be redundant
-// when working on kolab folders. Here we can:
-// 2 - bypass messages/indexes cache completely
-// 1 - bypass only messages, but use index cache
-$config['kolab_messages_cache_bypass'] = 0;
-
-// These event properties contribute to a significant revision to the calendar component
-// and if changed will increment the sequence number relevant for scheduling according to RFC 5545
-$config['kolab_event_scheduling_properties'] = array('start', 'end', 'allday', 'recurrence', 'location', 'status', 'cancelled');
-
-// These task properties contribute to a significant revision to the calendar component
-// and if changed will increment the sequence number relevant for scheduling according to RFC 5545
-$config['kolab_task_scheduling_properties'] = array('start', 'due', 'summary', 'status');
-
-// LDAP directory to find avilable users for folder sharing.
-// Either contains an array with LDAP addressbook configuration or refers to entry in $config['ldap_public'].
-// If not specified, the configuraton from 'kolab_auth_addressbook' will be used.
-// Should be provided for multi-domain setups with placeholders like %dc, %d, %u, %fu or %dn.
-$config['kolab_users_directory'] = null;
-
-// Filter to be used for resolving user folders in LDAP.
-// Defaults to the 'kolab_auth_filter' configuration option.
-$config['kolab_users_filter'] = '(&(objectclass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)))';
-
-// Which property of the LDAP user record to use for user folder mapping in IMAP.
-// Defaults to the 'kolab_auth_login' configuration option.
-$config['kolab_users_id_attrib'] = null;
-
-// Use these attributes when searching users in LDAP
-$config['kolab_users_search_attrib'] = array('cn','mail','alias');
-
-// JSON-RPC endpoint configuration of the Bonnie web service providing historic data for groupware objects
-$config['kolab_bonnie_api'] = array(
-    'uri'    => 'https://<kolab-hostname>:8080/api/rpc',
-    'user'   => 'webclient',
-    'pass'   => 'Welcome2KolabSystems',
-    'secret' => '8431f191707fffffff00000000cccc',
-    'debug'  => true,   // logs requests/responses to <log-dir>/bonnie
-    'timeout' => 30,
-);
diff --git a/lib/drivers/kolab/plugins/libkolab/js/audittrail.js b/lib/drivers/kolab/plugins/libkolab/js/audittrail.js
deleted file mode 100644
index 84fdf61..0000000
--- a/lib/drivers/kolab/plugins/libkolab/js/audittrail.js
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- * Kolab groupware audit trail utilities
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * @licstart  The following is the entire license notice for the
- * JavaScript code in this file.
- *
- * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @licend  The above is the entire license notice
- * for the JavaScript code in this file.
- */
-
-var libkolab_audittrail = {}
-
-libkolab_audittrail.quote_html = function(str)
-{
-    return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-};
-
-
-// show object changelog in a dialog
-libkolab_audittrail.object_history_dialog = function(p)
-{
-    // render dialog
-    var $dialog = $(p.container);
-
-    // close show dialog first
-    if ($dialog.is(':ui-dialog'))
-        $dialog.dialog('close');
-
-    // hide and reset changelog table
-    $dialog.find('div.notfound-message').remove();
-    $dialog.find('.changelog-table').show().children('tbody')
-        .html('<tr><td colspan="4"><span class="loading">' + rcmail.gettext('loading') + '</span></td></tr>');
-
-    // open jquery UI dialog
-    $dialog.dialog({
-        modal: false,
-        resizable: true,
-        closeOnEscape: true,
-        title: p.title,
-        open: function() {
-            $dialog.attr('aria-hidden', 'false');
-        },
-        close: function() {
-            $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
-        },
-        buttons: [
-            {
-                text: rcmail.gettext('close'),
-                click: function() { $dialog.dialog('close'); },
-                autofocus: true
-            }
-        ],
-        minWidth: 450,
-        width: 650,
-        height: 350,
-        minHeight: 200
-    })
-    .show().children('.compare-button').hide();
-
-    // initialize event handlers for history dialog UI elements
-    if (!$dialog.data('initialized')) {
-      // compare button
-      $dialog.find('.compare-button input').click(function(e) {
-        var rev1 = $dialog.find('.changelog-table input.diff-rev1:checked').val(),
-          rev2 = $dialog.find('.changelog-table input.diff-rev2:checked').val();
-
-          if (rev1 && rev2 && rev1 != rev2) {
-            // swap revisions if the user got it wrong
-            if (rev1 > rev2) {
-              var tmp = rev2;
-              rev2 = rev1;
-              rev1 = tmp;
-            }
-
-            if (p.comparefunc) {
-                p.comparefunc(rev1, rev2);
-            }
-          }
-          else {
-              alert('Invalid selection!')
-          }
-
-          if (!rcube_event.is_keyboard(e) && this.blur) {
-              this.blur();
-          }
-          return false;
-      });
-
-      // delegate handlers for list actions
-      $dialog.find('.changelog-table tbody').on('click', 'td.actions a', function(e) {
-          var link = $(this),
-            action = link.hasClass('restore') ? 'restore' : 'show',
-            event = $('#eventhistory').data('event'),
-            rev = link.attr('data-rev');
-
-            // ignore clicks on first row (current revision)
-            if (link.closest('tr').hasClass('first')) {
-                return false;
-            }
-
-            // let the user confirm the restore action
-            if (action == 'restore' && !confirm(rcmail.gettext('revisionrestoreconfirm', p.module).replace('$rev', rev))) {
-                return false;
-            }
-
-            if (p.listfunc) {
-                p.listfunc(action, rev);
-            }
-
-            if (!rcube_event.is_keyboard(e) && this.blur) {
-                this.blur();
-            }
-            return false;
-      })
-      .on('click', 'input.diff-rev1', function(e) {
-          if (!this.checked) return true;
-
-          var rev1 = this.value, selection_valid = false;
-          $dialog.find('.changelog-table input.diff-rev2').each(function(i, elem) {
-              $(elem).prop('disabled', elem.value <= rev1);
-              if (elem.checked && elem.value > rev1) {
-                  selection_valid = true;
-              }
-          });
-          if (!selection_valid) {
-              $dialog.find('.changelog-table input.diff-rev2:not([disabled])').last().prop('checked', true);
-          }
-      });
-
-      $dialog.addClass('changelog-dialog').data('initialized', true);
-    }
-
-    return $dialog;
-};
-
-// callback from server with changelog data
-libkolab_audittrail.render_changelog = function(data, object, folder)
-{
-    var Q = libkolab_audittrail.quote_html;
-
-    var $dialog = $('.changelog-dialog')
-    if (data === false || !data.length) {
-        return false;
-    }
-
-    var i, change, accessible, op_append,
-      first = data.length - 1, last = 0,
-      is_writeable = !!folder.editable,
-      op_labels = {
-          RECEIVE:   'actionreceive',
-          APPEND:    'actionappend',
-          MOVE:      'actionmove',
-          DELETE:    'actiondelete',
-          READ:      'actionread',
-          FLAGSET:   'actionflagset',
-          FLAGCLEAR: 'actionflagclear'
-      },
-      actions = '<a href="#show" class="iconbutton preview" title="'+ rcmail.gettext('showrevision','libkolab') +'" data-rev="{rev}" /> ' +
-          (is_writeable ? '<a href="#restore" class="iconbutton restore" title="'+ rcmail.gettext('restore','libkolab') + '" data-rev="{rev}" />' : ''),
-      tbody = $dialog.find('.changelog-table tbody').html('');
-
-    for (i=first; i >= 0; i--) {
-        change = data[i];
-        accessible = change.date && change.user;
-
-        if (change.op == 'MOVE' && change.mailbox) {
-            op_append = ' ⇢ ' + change.mailbox;
-        }
-        else if ((change.op == 'FLAGSET' || change.op == 'FLAGCLEAR') && change.flags) {
-            op_append = ': ' + change.flags;
-        }
-        else {
-            op_append = '';
-        }
-
-        $('<tr class="' + (i == first ? 'first' : (i == last ? 'last' : '')) + (accessible ? '' : 'undisclosed') + '">')
-            .append('<td class="diff">' + (accessible && change.op != 'DELETE' ? 
-                '<input type="radio" name="rev1" class="diff-rev1" value="' + change.rev + '" title="" '+ (i == last ? 'checked="checked"' : '') +' /> '+
-                '<input type="radio" name="rev2" class="diff-rev2" value="' + change.rev + '" title="" '+ (i == first ? 'checked="checked"' : '') +' /></td>'
-                : ''))
-            .append('<td class="revision">' + Q(i+1) + '</td>')
-            .append('<td class="date">' + Q(change.date || '') + '</td>')
-            .append('<td class="user">' + Q(change.user || 'undisclosed') + '</td>')
-            .append('<td class="operation" title="' + op_append + '">' + Q(rcmail.gettext(op_labels[change.op] || '', 'libkolab') + op_append) + '</td>')
-            .append('<td class="actions">' + (accessible && change.op != 'DELETE' ? actions.replace(/\{rev\}/g, change.rev) : '') + '</td>')
-            .appendTo(tbody);
-    }
-
-    if (first > 0) {
-        $dialog.find('.compare-button').fadeIn(200);
-        $dialog.find('.changelog-table tr.last input.diff-rev1').click();
-    }
-
-    // set dialog size according to content
-    libkolab_audittrail.dialog_resize($dialog.get(0), $dialog.height() + 15, 600);
-
-    return $dialog;
-};
-
-// resize and reposition (center) the dialog window
-libkolab_audittrail.dialog_resize = function(id, height, width)
-{
-    var win = $(window), w = win.width(), h = win.height();
-        $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) })
-            .dialog('option', 'position', ['center', 'center']);  // only works in a separate call (!?)
-};
-
-
-// register handlers for mail message history
-window.rcmail && rcmail.addEventListener('init', function(e) {
-    var loading_lock;
-
-    if (rcmail.env.task == 'mail') {
-        rcmail.register_command('kolab-mail-history', function() {
-            var dialog, uid = rcmail.get_single_uid(), rec = { uid: uid, mbox: rcmail.get_message_mailbox(uid) };
-            if (!uid || !window.libkolab_audittrail) {
-                return false;
-            }
-
-            // render dialog
-            $dialog = libkolab_audittrail.object_history_dialog({
-                module: 'libkolab',
-                container: '#mailmessagehistory',
-                title: rcmail.gettext('objectchangelog','libkolab')
-            });
-
-            $dialog.data('rec', rec);
-
-            // fetch changelog data
-            loading_lock = rcmail.set_busy(true, 'loading', loading_lock);
-            rcmail.http_post('plugin.message-changelog', { _uid: rec.uid, _mbox: rec.mbox }, loading_lock);
-
-        }, rcmail.env.action == 'show');
-
-        rcmail.addEventListener('plugin.message_render_changelog', function(data) {
-            var $dialog = $('#mailmessagehistory'),
-                rec = $dialog.data('rec');
-
-            if (data === false || !data.length || !rec) {
-              // display 'unavailable' message
-              $('<div class="notfound-message dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','libkolab') + '</div>')
-                  .insertBefore($dialog.find('.changelog-table').hide());
-              return;
-            }
-
-            data.module = 'libkolab';
-            libkolab_audittrail.render_changelog(data, rec, {});
-        });
-
-        rcmail.env.message_commands.push('kolab-mail-history');
-    }
-});
diff --git a/lib/drivers/kolab/plugins/libkolab/js/folderlist.js b/lib/drivers/kolab/plugins/libkolab/js/folderlist.js
deleted file mode 100644
index 64f8a35..0000000
--- a/lib/drivers/kolab/plugins/libkolab/js/folderlist.js
+++ /dev/null
@@ -1,353 +0,0 @@
-/**
- * Kolab groupware folders treelist widget
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * @licstart  The following is the entire license notice for the
- * JavaScript code in this file.
- *
- * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @licend  The above is the entire license notice
- * for the JavaScript code in this file.
- */
-
-function kolab_folderlist(node, p)
-{
-    // extends treelist.js
-    rcube_treelist_widget.call(this, node, p);
-
-    // private vars
-    var me = this;
-    var search_results;
-    var search_results_widget;
-    var search_results_container;
-    var listsearch_request;
-    var search_messagebox;
-
-    var Q = rcmail.quote_html;
-
-    // render the results for folderlist search
-    function render_search_results(results)
-    {
-        if (results.length) {
-          // create treelist widget to present the search results
-          if (!search_results_widget) {
-              var list_id = (me.container.attr('id') || p.id_prefix || '0')
-              search_results_container = $('<div class="searchresults"></div>')
-                  .html(p.search_title ? '<h2 class="boxtitle" id="st:' + list_id + '">' + p.search_title + '</h2>' : '')
-                  .insertAfter(me.container);
-
-              search_results_widget = new rcube_treelist_widget('<ul>', {
-                  id_prefix: p.id_prefix,
-                  id_encode: p.id_encode,
-                  id_decode: p.id_decode,
-                  selectable: false
-              });
-              // copy classes from main list
-              search_results_widget.container.addClass(me.container.attr('class')).attr('aria-labelledby', 'st:' + list_id);
-
-              // register click handler on search result's checkboxes to select the given item for listing
-              search_results_widget.container
-                  .appendTo(search_results_container)
-                  .on('click', 'input[type=checkbox], a.subscribed, span.subscribed', function(e) {
-                      var node, has_children, li = $(this).closest('li'),
-                          id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '');
-                      if (p.id_decode)
-                          id = p.id_decode(id);
-                      node = search_results_widget.get_node(id);
-                      has_children = node.children && node.children.length;
-
-                      e.stopPropagation();
-                      e.bubbles = false;
-
-                      // activate + subscribe
-                      if ($(e.target).hasClass('subscribed')) {
-                          search_results[id].subscribed = true;
-                          $(e.target).attr('aria-checked', 'true');
-                          li.children().first()
-                              .toggleClass('subscribed')
-                              .find('input[type=checkbox]').get(0).checked = true;
-
-                          if (has_children && search_results[id].group == 'other user') {
-                              li.find('ul li > div').addClass('subscribed')
-                                  .find('a.subscribed').attr('aria-checked', 'true');;
-                          }
-                      }
-                      else if (!this.checked) {
-                          return;
-                      }
-
-                      // copy item to the main list
-                      add_result2list(id, li, true);
-
-                      if (has_children) {
-                          li.find('input[type=checkbox]').first().prop('disabled', true).prop('checked', true);
-                          li.find('a.subscribed, span.subscribed').first().hide();
-                      }
-                      else {
-                          li.remove();
-                      }
-
-                      // set partial subscription status
-                      if (search_results[id].subscribed && search_results[id].parent && search_results[id].group == 'other') {
-                          parent_subscription_status($(me.get_item(id, true)));
-                      }
-
-                      // set focus to cloned checkbox
-                      if (rcube_event.is_keyboard(e)) {
-                        $(me.get_item(id, true)).find('input[type=checkbox]').first().focus();
-                      }
-                  })
-                  .on('click', function(e) {
-                      var prop, id = String($(e.target).closest('li').attr('id')).replace(new RegExp('^'+p.id_prefix), '');
-                      if (p.id_decode)
-                          id = p.id_decode(id);
-
-                      if (!rcube_event.is_keyboard(e) && e.target.blur)
-                        e.target.blur();
-
-                      // forward event
-                      if (prop = search_results[id]) {
-                        e.data = prop;
-                        if (me.triggerEvent('click-item', e) === false) {
-                          e.stopPropagation();
-                          return false;
-                        }
-                      }
-                  });
-          }
-
-          // add results to list
-          for (var prop, item, i=0; i < results.length; i++) {
-              prop = results[i];
-              item = $(prop.html);
-              search_results[prop.id] = prop;
-              search_results_widget.insert({
-                  id: prop.id,
-                  classes: [ prop.group || '' ],
-                  html: item,
-                  collapsed: true,
-                  virtual: prop.virtual
-              }, prop.parent);
-
-              // disable checkbox if item already exists in main list
-              if (me.get_node(prop.id) && !me.get_node(prop.id).virtual) {
-                  item.find('input[type=checkbox]').first().prop('disabled', true).prop('checked', true);
-                  item.find('a.subscribed, span.subscribed').hide();
-              }
-          }
-
-          search_results_container.show();
-        }
-    }
-
-    // helper method to (recursively) add a search result item to the main list widget
-    function add_result2list(id, li, active)
-    {
-        var node = search_results_widget.get_node(id),
-            prop = search_results[id],
-            parent_id = prop.parent || null,
-            has_children = node.children && node.children.length,
-            dom_node = has_children ? li.children().first().clone(true, true) : li.children().first(),
-            childs = [];
-
-        // find parent node and insert at the right place
-        if (parent_id && me.get_node(parent_id)) {
-            dom_node.children('span,a').first().html(Q(prop.editname || prop.listname));
-        }
-        else if (parent_id && search_results[parent_id]) {
-            // copy parent tree from search results
-            add_result2list(parent_id, $(search_results_widget.get_item(parent_id)), false);
-        }
-        else if (parent_id) {
-            // use full name for list display
-            dom_node.children('span,a').first().html(Q(prop.name));
-        }
-
-        // replace virtual node with a real one
-        if (me.get_node(id)) {
-            $(me.get_item(id, true)).children().first()
-                .replaceWith(dom_node)
-                .removeClass('virtual');
-        }
-        else {
-            // copy childs, too
-            if (has_children && prop.group == 'other user') {
-                for (var cid, j=0; j < node.children.length; j++) {
-                    if ((cid = node.children[j].id) && search_results[cid]) {
-                        childs.push(search_results_widget.get_node(cid));
-                    }
-                }
-            }
-
-            // move this result item to the main list widget
-            me.insert({
-                id: id,
-                classes: [ prop.group || '' ],
-                virtual: prop.virtual,
-                html: dom_node,
-                level: node.level,
-                collapsed: true,
-                children: childs
-            }, parent_id, prop.group);
-        }
-
-        delete prop.html;
-        prop.active = active;
-        me.triggerEvent('insert-item', { id: id, data: prop, item: li });
-
-        // register childs, too
-        if (childs.length) {
-            for (var cid, j=0; j < node.children.length; j++) {
-                if ((cid = node.children[j].id) && search_results[cid]) {
-                    prop = search_results[cid];
-                    delete prop.html;
-                    prop.active = false;
-                    me.triggerEvent('insert-item', { id: cid, data: prop });
-                }
-            }
-        }
-    }
-
-    // update the given item's parent's (partial) subscription state
-    function parent_subscription_status(li)
-    {
-        var top_li = li.closest(me.container.children('li')),
-            all_childs = $('li > div:not(.treetoggle)', top_li),
-            subscribed = all_childs.filter('.subscribed').length;
-
-        if (subscribed == 0) {
-            top_li.children('div:first').removeClass('subscribed partial');
-        }
-        else {
-            top_li.children('div:first')
-                .addClass('subscribed')[subscribed < all_childs.length ? 'addClass' : 'removeClass']('partial');
-        }
-    }
-
-    // do some magic when search is performed on the widget
-    this.addEventListener('search', function(search) {
-        // hide search results
-        if (search_results_widget) {
-            search_results_container.hide();
-            search_results_widget.reset();
-        }
-        search_results = {};
-
-        if (search_messagebox)
-            rcmail.hide_message(search_messagebox);
-
-        // send search request(s) to server
-        if (search.query && search.execute) {
-            // require a minimum length for the search string
-            if (rcmail.env.autocomplete_min_length && search.query.length < rcmail.env.autocomplete_min_length && search.query != '*') {
-                search_messagebox = rcmail.display_message(
-                    rcmail.get_label('autocompletechars').replace('$min', rcmail.env.autocomplete_min_length));
-                return;
-            }
-
-            if (listsearch_request) {
-                // ignore, let the currently running request finish
-                if (listsearch_request.query == search.query) {
-                    return;
-                }
-                else { // cancel previous search request
-                    rcmail.multi_thread_request_abort(listsearch_request.id);
-                    listsearch_request = null;
-                }
-            }
-
-            var sources = p.search_sources || [ 'folders' ];
-            var reqid = rcmail.multi_thread_http_request({
-                items: sources,
-                threads: rcmail.env.autocomplete_threads || 1,
-                action:  p.search_action || 'listsearch',
-                postdata: { action:'search', q:search.query, source:'%s' },
-                lock: rcmail.display_message(rcmail.get_label('searching'), 'loading'),
-                onresponse: render_search_results,
-                whendone: function(data){
-                  listsearch_request = null;
-                  me.triggerEvent('search-complete', data);
-                }
-            });
-
-            listsearch_request = { id:reqid, query:search.query };
-        }
-        else if (!search.query && listsearch_request) {
-            rcmail.multi_thread_request_abort(listsearch_request.id);
-            listsearch_request = null;
-        }
-    });
-
-    this.container.on('click', 'a.subscribed, span.subscribed', function(e) {
-        var li = $(this).closest('li'),
-            id = li.attr('id').replace(new RegExp('^'+p.id_prefix), ''),
-            div = li.children().first(),
-            is_subscribed;
-
-        if (me.is_search()) {
-            id = id.replace(/--xsR$/, '');
-            li = $(me.get_item(id, true));
-            div = $(div).add(li.children().first());
-        }
-
-        if (p.id_decode)
-            id = p.id_decode(id);
-
-        div.toggleClass('subscribed');
-        is_subscribed = div.hasClass('subscribed');
-        $(this).attr('aria-checked', is_subscribed ? 'true' : 'false');
-        me.triggerEvent('subscribe', { id: id, subscribed: is_subscribed, item: li });
-
-        // update subscribe state of all 'virtual user' child folders
-        if (li.hasClass('other user')) {
-            $('ul li > div', li).each(function() {
-                $(this)[is_subscribed ? 'addClass' : 'removeClass']('subscribed');
-                $('.subscribed', div).attr('aria-checked', is_subscribed ? 'true' : 'false');
-            });
-            div.removeClass('partial');
-        }
-        // propagate subscription state to parent  'virtual user' folder
-        else if (li.closest('li.other.user').length) {
-            parent_subscription_status(li);
-        }
-
-        e.stopPropagation();
-        return false;
-    });
-
-    this.container.on('click', 'a.remove', function(e) {
-      var li = $(this).closest('li'),
-          id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '');
-
-      if (me.is_search()) {
-          id = id.replace(/--xsR$/, '');
-          li = $(me.get_item(id, true));
-      }
-
-      if (p.id_decode)
-          id = p.id_decode(id);
-
-      me.triggerEvent('remove', { id: id, item: li });
-
-      e.stopPropagation();
-      return false;
-    });
-}
-
-// link prototype from base class
-kolab_folderlist.prototype = rcube_treelist_widget.prototype;
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api.php
deleted file mode 100644
index 6905dca..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * Provider class for accessing historic groupware object data through the Bonnie service
- *
- * API Specification at https://wiki.kolabsys.com/User:Bruederli/Draft:Bonnie_Client_API
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_bonnie_api
-{
-    public $ready = false;
-
-    private $config = array();
-    private $client = null;
-
-
-    /**
-     * Default constructor
-     */
-    public function __construct($config)
-    {
-        $this->config = $config;
-
-        $this->client = new kolab_bonnie_api_client($config['uri'], $config['timeout'] ?: 30, (bool)$config['debug']);
-
-        $this->client->set_secret($config['secret']);
-        $this->client->set_authentication($config['user'], $config['pass']);
-        $this->client->set_request_user(rcube::get_instance()->get_user_name());
-
-        $this->ready = !empty($config['secret']) && !empty($config['user']) && !empty($config['pass']);
-    }
-
-    /**
-     * Wrapper function for <object>.changelog() API call
-     */
-    public function changelog($type, $uid, $mailbox, $msguid=null)
-    {
-        return $this->client->execute($type.'.changelog', array('uid' => $uid, 'mailbox' => $mailbox, 'msguid' => $msguid));
-    }
-
-    /**
-     * Wrapper function for <object>.diff() API call
-     */
-    public function diff($type, $uid, $rev1, $rev2, $mailbox, $msguid=null, $instance=null)
-    {
-        return $this->client->execute($type.'.diff', array(
-          'uid' => $uid,
-          'rev1' => $rev1,
-          'rev2' => $rev2,
-          'mailbox' => $mailbox,
-          'msguid' => $msguid,
-          'instance' => $instance,
-        ));
-    }
-
-    /**
-     * Wrapper function for <object>.get() API call
-     */
-    public function get($type, $uid, $rev, $mailbox, $msguid=null)
-    {
-      return $this->client->execute($type.'.get', array('uid' => $uid, 'rev' => $rev, 'mailbox' => $mailbox, 'msguid' => $msguid));
-    }
-
-    /**
-     * Wrapper function for <object>.rawdata() API call
-     */
-    public function rawdata($type, $uid, $rev, $mailbox, $msguid=null)
-    {
-      return $this->client->execute($type.'.rawdata', array('uid' => $uid, 'rev' => $rev, 'mailbox' => $mailbox, 'msguid' => $msguid));
-    }
-
-    /**
-     * Generic wrapper for direct API calls
-     */
-    public function _execute($method, $params = array())
-    {
-        return $this->client->execute($method, $params);
-    }
-
-}
\ No newline at end of file
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api_client.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api_client.php
deleted file mode 100644
index bc209f4..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api_client.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-
-/**
- * JSON-RPC client class with some extra features for communicating with the Bonnie API service.
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_bonnie_api_client
-{
-    /**
-     * URL of the RPC endpoint
-     * @var string
-     */
-    protected $url;
-
-    /**
-     * HTTP client timeout in seconds
-     * @var integer
-     */
-    protected $timeout;
-
-    /**
-     * Debug flag
-     * @var bool
-     */
-    protected $debug;
-
-    /**
-     * Username for authentication
-     * @var string
-     */
-    protected $username;
-
-    /**
-     * Password for authentication
-     * @var string
-     */
-    protected $password;
-
-    /**
-     * Secret key for request signing
-     * @var string
-     */
-    protected $secret;
-
-    /**
-     * Default HTTP headers to send to the server
-     * @var array
-     */
-    protected $headers = array(
-        'Connection' => 'close',
-        'Content-Type' => 'application/json',
-        'Accept' => 'application/json',
-    );
-
-    /**
-     * Constructor
-     *
-     * @param  string  $url      Server URL
-     * @param  integer $timeout  Request timeout
-     * @param  bool    $debug    Enabled debug logging
-     * @param  array   $headers  Custom HTTP headers
-     */
-    public function __construct($url, $timeout = 5, $debug = false, $headers = array())
-    {
-        $this->url = $url;
-        $this->timeout = $timeout;
-        $this->debug = $debug;
-        $this->headers = array_merge($this->headers, $headers);
-    }
-
-    /**
-     * Setter for secret key for request signing
-     */
-    public function set_secret($secret)
-    {
-        $this->secret = $secret;
-    }
-
-    /**
-     * Setter for the X-Request-User header
-     */
-    public function set_request_user($username)
-    {
-        $this->headers['X-Request-User'] = $username;
-    }
-
-    /**
-     * Set authentication parameters
-     *
-     * @param  string $username  Username
-     * @param  string $password  Password
-     */
-    public function set_authentication($username, $password)
-    {
-        $this->username = $username;
-        $this->password = $password;
-    }
-
-    /**
-     * Automatic mapping of procedures
-     *
-     * @param  string $method  Procedure name
-     * @param  array  $params  Procedure arguments
-     * @return mixed
-     */
-    public function __call($method, $params)
-    {
-        return $this->execute($method, $params);
-    }
-
-    /**
-     * Execute an RPC command
-     *
-     * @param  string $method  Procedure name
-     * @param  array  $params  Procedure arguments
-     * @return mixed
-     */
-    public function execute($method, array $params = array())
-    {
-        $id = mt_rand();
-
-        $payload = array(
-            'jsonrpc' => '2.0',
-            'method' => $method,
-            'id' => $id,
-        );
-
-        if (!empty($params)) {
-            $payload['params'] = $params;
-        }
-
-        $result = $this->send_request($payload, $method != 'system.keygen');
-
-        if (isset($result['id']) && $result['id'] == $id && array_key_exists('result', $result)) {
-            return $result['result'];
-        }
-        else if (isset($result['error'])) {
-            $this->_debug('ERROR', $result);
-        }
-
-        return null;
-    }
-
-    /**
-     * Do the HTTP request
-     *
-     * @param  string  $payload  Data to send
-     */
-    protected function send_request($payload, $sign = true)
-    {
-        try {
-            $payload_ = json_encode($payload);
-
-            // add request signature
-            if ($sign && !empty($this->secret)) {
-                $this->headers['X-Request-Sign'] = $this->request_signature($payload_);
-            }
-            else if ($this->headers['X-Request-Sign']) {
-                unset($this->headers['X-Request-Sign']);
-            }
-
-            $this->_debug('REQUEST', $payload, $this->headers);
-            $request = libkolab::http_request($this->url, 'POST', array('timeout' => $this->timeout));
-            $request->setHeader($this->headers);
-            $request->setAuth($this->username, $this->password);
-            $request->setBody($payload_);
-
-            $response = $request->send();
-
-            if ($response->getStatus() == 200) {
-                $result = json_decode($response->getBody(), true);
-                $this->_debug('RESPONSE', $result);
-            }
-            else {
-                throw new Exception(sprintf("HTTP %d %s", $response->getStatus(), $response->getReasonPhrase()));
-            }
-        }
-        catch (Exception $e) {
-            rcube::raise_error(array(
-                'code' => 500,
-                'type' => 'php',
-                'message' => "Bonnie API request failed: " . $e->getMessage(),
-            ), true);
-
-            return array('id' => $payload['id'], 'error' => $e->getMessage(), 'code' => -32000);
-        }
-
-        return is_array($result) ? $result : array();
-    }
-
-    /**
-     * Compute the hmac signature for the current event payload using
-     * the secret key configured for this API client
-     *
-     * @param string $data The request payload data
-     * @return string The request signature
-     */
-    protected function request_signature($data)
-    {
-        // TODO: get the session key with a system.keygen call
-        return hash_hmac('sha256', $this->headers['X-Request-User'] . ':' . $data, $this->secret);
-    }
-
-    /**
-     * Write debug log
-     */
-    protected function _debug(/* $message, $data1, data2, ...*/)
-    {
-        if (!$this->debug)
-            return;
-
-        $args = func_get_args();
-
-        $msg = array();
-        foreach ($args as $arg) {
-            $msg[] = !is_string($arg) ? var_export($arg, true) : $arg;
-        }
-
-        rcube::write_log('bonnie', join(";\n", $msg));
-    }
-
-}
\ No newline at end of file
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_date_recurrence.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_date_recurrence.php
deleted file mode 100644
index f2483c9..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_date_recurrence.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * Recurrence computation class for xcal-based Kolab format objects
- *
- * Utility class to compute instances of recurring events.
- * It requires the libcalendaring PHP module to be installed and loaded.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class kolab_date_recurrence
-{
-    private /* EventCal */ $engine;
-    private /* kolab_format_xcal */ $object;
-    private /* DateTime */ $start;
-    private /* DateTime */ $next;
-    private /* cDateTime */ $cnext;
-    private /* DateInterval */ $duration;
-
-    /**
-     * Default constructor
-     *
-     * @param array The Kolab object to operate on
-     */
-    function __construct($object)
-    {
-        $data = $object->to_array();
-
-        $this->object = $object;
-        $this->engine = $object->to_libcal();
-        $this->start = $this->next = $data['start'];
-        $this->cnext = kolab_format::get_datetime($this->next);
-
-        if (is_object($data['start']) && is_object($data['end']))
-            $this->duration = $data['start']->diff($data['end']);
-        else
-            $this->duration = new DateInterval('PT' . ($data['end'] - $data['start']) . 'S');
-    }
-
-    /**
-     * Get date/time of the next occurence of this event
-     *
-     * @param boolean Return a Unix timestamp instead of a DateTime object
-     * @return mixed  DateTime object/unix timestamp or False if recurrence ended
-     */
-    public function next_start($timestamp = false)
-    {
-        $time = false;
-
-        if ($this->engine && $this->next) {
-            if (($cnext = new cDateTime($this->engine->getNextOccurence($this->cnext))) && $cnext->isValid()) {
-                $next = kolab_format::php_datetime($cnext);
-                $time = $timestamp ? $next->format('U') : $next;
-                $this->cnext = $cnext;
-                $this->next = $next;
-            }
-        }
-
-        return $time;
-    }
-
-    /**
-     * Get the next recurring instance of this event
-     *
-     * @return mixed Array with event properties or False if recurrence ended
-     */
-    public function next_instance()
-    {
-        if ($next_start = $this->next_start()) {
-            $next_end = clone $next_start;
-            $next_end->add($this->duration);
-
-            $next = $this->object->to_array();
-            $next['start'] = $next_start;
-            $next['end'] = $next_end;
-
-            $recurrence_id_format = libkolab::recurrence_id_format($next);
-            $next['recurrence_date'] = clone $next_start;
-            $next['_instance'] = $next_start->format($recurrence_id_format);
-
-            unset($next['_formatobj']);
-
-            return $next;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the end date of the occurence of this recurrence cycle
-     *
-     * @return DateTime|bool End datetime of the last event or False if recurrence exceeds limit
-     */
-    public function end()
-    {
-        $event = $this->object->to_array();
-
-        // recurrence end date is given
-        if ($event['recurrence']['UNTIL'] instanceof DateTime) {
-            return $event['recurrence']['UNTIL'];
-        }
-
-        // let libkolab do the work
-        if ($this->engine && ($cend = $this->engine->getLastOccurrence()) && ($end_dt = kolab_format::php_datetime(new cDateTime($cend)))) {
-            return $end_dt;
-        }
-
-        // determine a reasonable end date if none given
-        if (!$event['recurrence']['COUNT'] && $event['end'] instanceof DateTime) {
-          switch ($event['recurrence']['FREQ']) {
-            case 'YEARLY':  $intvl = 'P100Y'; break;
-            case 'MONTHLY': $intvl = 'P20Y';  break;
-            default:        $intvl = 'P10Y';  break;
-          }
-
-          $end_dt = clone $event['end'];
-          $end_dt->add(new DateInterval($intvl));
-          return $end_dt;
-        }
-
-        return false;
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_format.php
deleted file mode 100644
index 5041dd3..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format.php
+++ /dev/null
@@ -1,707 +0,0 @@
-<?php
-
-/**
- * Kolab format model class wrapping libkolabxml bindings
- *
- * Abstract base class for different Kolab groupware objects read from/written
- * to the new Kolab 3 format using the PHP bindings of libkolabxml.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-abstract class kolab_format
-{
-    public static $timezone;
-
-    public /*abstract*/ $CTYPE;
-    public /*abstract*/ $CTYPEv2;
-
-    protected /*abstract*/ $objclass;
-    protected /*abstract*/ $read_func;
-    protected /*abstract*/ $write_func;
-
-    protected $obj;
-    protected $data;
-    protected $xmldata;
-    protected $xmlobject;
-    protected $formaterror;
-    protected $loaded = false;
-    protected $version = '3.0';
-
-    const KTYPE_PREFIX = 'application/x-vnd.kolab.';
-    const PRODUCT_ID   = 'Roundcube-libkolab-1.1';
-
-    // mapping table for valid PHP timezones not supported by libkolabxml
-    // basically the entire list of ftp://ftp.iana.org/tz/data/backward
-    protected static $timezone_map = array(
-        'Africa/Asmera' => 'Africa/Asmara',
-        'Africa/Timbuktu' => 'Africa/Abidjan',
-        'America/Argentina/ComodRivadavia' => 'America/Argentina/Catamarca',
-        'America/Atka' => 'America/Adak',
-        'America/Buenos_Aires' => 'America/Argentina/Buenos_Aires',
-        'America/Catamarca' => 'America/Argentina/Catamarca',
-        'America/Coral_Harbour' => 'America/Atikokan',
-        'America/Cordoba' => 'America/Argentina/Cordoba',
-        'America/Ensenada' => 'America/Tijuana',
-        'America/Fort_Wayne' => 'America/Indiana/Indianapolis',
-        'America/Indianapolis' => 'America/Indiana/Indianapolis',
-        'America/Jujuy' => 'America/Argentina/Jujuy',
-        'America/Knox_IN' => 'America/Indiana/Knox',
-        'America/Louisville' => 'America/Kentucky/Louisville',
-        'America/Mendoza' => 'America/Argentina/Mendoza',
-        'America/Porto_Acre' => 'America/Rio_Branco',
-        'America/Rosario' => 'America/Argentina/Cordoba',
-        'America/Virgin' => 'America/Port_of_Spain',
-        'Asia/Ashkhabad' => 'Asia/Ashgabat',
-        'Asia/Calcutta' => 'Asia/Kolkata',
-        'Asia/Chungking' => 'Asia/Shanghai',
-        'Asia/Dacca' => 'Asia/Dhaka',
-        'Asia/Katmandu' => 'Asia/Kathmandu',
-        'Asia/Macao' => 'Asia/Macau',
-        'Asia/Saigon' => 'Asia/Ho_Chi_Minh',
-        'Asia/Tel_Aviv' => 'Asia/Jerusalem',
-        'Asia/Thimbu' => 'Asia/Thimphu',
-        'Asia/Ujung_Pandang' => 'Asia/Makassar',
-        'Asia/Ulan_Bator' => 'Asia/Ulaanbaatar',
-        'Atlantic/Faeroe' => 'Atlantic/Faroe',
-        'Atlantic/Jan_Mayen' => 'Europe/Oslo',
-        'Australia/ACT' => 'Australia/Sydney',
-        'Australia/Canberra' => 'Australia/Sydney',
-        'Australia/LHI' => 'Australia/Lord_Howe',
-        'Australia/NSW' => 'Australia/Sydney',
-        'Australia/North' => 'Australia/Darwin',
-        'Australia/Queensland' => 'Australia/Brisbane',
-        'Australia/South' => 'Australia/Adelaide',
-        'Australia/Tasmania' => 'Australia/Hobart',
-        'Australia/Victoria' => 'Australia/Melbourne',
-        'Australia/West' => 'Australia/Perth',
-        'Australia/Yancowinna' => 'Australia/Broken_Hill',
-        'Brazil/Acre' => 'America/Rio_Branco',
-        'Brazil/DeNoronha' => 'America/Noronha',
-        'Brazil/East' => 'America/Sao_Paulo',
-        'Brazil/West' => 'America/Manaus',
-        'Canada/Atlantic' => 'America/Halifax',
-        'Canada/Central' => 'America/Winnipeg',
-        'Canada/East-Saskatchewan' => 'America/Regina',
-        'Canada/Eastern' => 'America/Toronto',
-        'Canada/Mountain' => 'America/Edmonton',
-        'Canada/Newfoundland' => 'America/St_Johns',
-        'Canada/Pacific' => 'America/Vancouver',
-        'Canada/Saskatchewan' => 'America/Regina',
-        'Canada/Yukon' => 'America/Whitehorse',
-        'Chile/Continental' => 'America/Santiago',
-        'Chile/EasterIsland' => 'Pacific/Easter',
-        'Cuba' => 'America/Havana',
-        'Egypt' => 'Africa/Cairo',
-        'Eire' => 'Europe/Dublin',
-        'Europe/Belfast' => 'Europe/London',
-        'Europe/Tiraspol' => 'Europe/Chisinau',
-        'GB' => 'Europe/London',
-        'GB-Eire' => 'Europe/London',
-        'Greenwich' => 'Etc/GMT',
-        'Hongkong' => 'Asia/Hong_Kong',
-        'Iceland' => 'Atlantic/Reykjavik',
-        'Iran' => 'Asia/Tehran',
-        'Israel' => 'Asia/Jerusalem',
-        'Jamaica' => 'America/Jamaica',
-        'Japan' => 'Asia/Tokyo',
-        'Kwajalein' => 'Pacific/Kwajalein',
-        'Libya' => 'Africa/Tripoli',
-        'Mexico/BajaNorte' => 'America/Tijuana',
-        'Mexico/BajaSur' => 'America/Mazatlan',
-        'Mexico/General' => 'America/Mexico_City',
-        'NZ' => 'Pacific/Auckland',
-        'NZ-CHAT' => 'Pacific/Chatham',
-        'Navajo' => 'America/Denver',
-        'PRC' => 'Asia/Shanghai',
-        'Pacific/Ponape' => 'Pacific/Pohnpei',
-        'Pacific/Samoa' => 'Pacific/Pago_Pago',
-        'Pacific/Truk' => 'Pacific/Chuuk',
-        'Pacific/Yap' => 'Pacific/Chuuk',
-        'Poland' => 'Europe/Warsaw',
-        'Portugal' => 'Europe/Lisbon',
-        'ROC' => 'Asia/Taipei',
-        'ROK' => 'Asia/Seoul',
-        'Singapore' => 'Asia/Singapore',
-        'Turkey' => 'Europe/Istanbul',
-        'UCT' => 'Etc/UCT',
-        'US/Alaska' => 'America/Anchorage',
-        'US/Aleutian' => 'America/Adak',
-        'US/Arizona' => 'America/Phoenix',
-        'US/Central' => 'America/Chicago',
-        'US/East-Indiana' => 'America/Indiana/Indianapolis',
-        'US/Eastern' => 'America/New_York',
-        'US/Hawaii' => 'Pacific/Honolulu',
-        'US/Indiana-Starke' => 'America/Indiana/Knox',
-        'US/Michigan' => 'America/Detroit',
-        'US/Mountain' => 'America/Denver',
-        'US/Pacific' => 'America/Los_Angeles',
-        'US/Samoa' => 'Pacific/Pago_Pago',
-        'Universal' => 'Etc/UTC',
-        'W-SU' => 'Europe/Moscow',
-        'Zulu' => 'Etc/UTC',
-    );
-
-    /**
-     * Factory method to instantiate a kolab_format object of the given type and version
-     *
-     * @param string Object type to instantiate
-     * @param float  Format version
-     * @param string Cached xml data to initialize with
-     * @return object kolab_format
-     */
-    public static function factory($type, $version = '3.0', $xmldata = null)
-    {
-        if (!isset(self::$timezone))
-            self::$timezone = new DateTimeZone('UTC');
-
-        if (!self::supports($version))
-            return PEAR::raiseError("No support for Kolab format version " . $version);
-
-        $type = preg_replace('/configuration\.[a-z._]+$/', 'configuration', $type);
-        $suffix = preg_replace('/[^a-z]+/', '', $type);
-        $classname = 'kolab_format_' . $suffix;
-        if (class_exists($classname))
-            return new $classname($xmldata, $version);
-
-        return PEAR::raiseError("Failed to load Kolab Format wrapper for type " . $type);
-    }
-
-    /**
-     * Determine support for the given format version
-     *
-     * @param float Format version to check
-     * @return boolean True if supported, False otherwise
-     */
-    public static function supports($version)
-    {
-        if ($version == '2.0')
-            return class_exists('kolabobject');
-        // default is version 3
-        return class_exists('kolabformat');
-    }
-
-    /**
-     * Convert the given date/time value into a cDateTime object
-     *
-     * @param mixed         Date/Time value either as unix timestamp, date string or PHP DateTime object
-     * @param DateTimeZone  The timezone the date/time is in. Use global default if Null, local time if False
-     * @param boolean       True of the given date has no time component
-     * @return object       The libkolabxml date/time object
-     */
-    public static function get_datetime($datetime, $tz = null, $dateonly = false)
-    {
-        // use timezone information from datetime of global setting
-        if (!$tz && $tz !== false) {
-            if ($datetime instanceof DateTime)
-                $tz = $datetime->getTimezone();
-            if (!$tz)
-                $tz = self::$timezone;
-        }
-        $result = new cDateTime();
-
-        try {
-            // got a unix timestamp (in UTC)
-            if (is_numeric($datetime)) {
-                $datetime = new DateTime('@'.$datetime, new DateTimeZone('UTC'));
-                if ($tz) $datetime->setTimezone($tz);
-            }
-            else if (is_string($datetime) && strlen($datetime)) {
-                $datetime = $tz ? new DateTime($datetime, $tz) : new DateTime($datetime);
-            }
-        }
-        catch (Exception $e) {}
-
-        if ($datetime instanceof DateTime) {
-            $result->setDate($datetime->format('Y'), $datetime->format('n'), $datetime->format('j'));
-
-            if (!$dateonly)
-                $result->setTime($datetime->format('G'), $datetime->format('i'), $datetime->format('s'));
-
-            if ($tz && in_array($tz->getName(), array('UTC', 'GMT', '+00:00', 'Z'))) {
-                $result->setUTC(true);
-            }
-            else if ($tz !== false) {
-                $tzid = $tz->getName();
-                if (array_key_exists($tzid, self::$timezone_map))
-                    $tzid = self::$timezone_map[$tzid];
-                $result->setTimezone($tzid);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Convert the given cDateTime into a PHP DateTime object
-     *
-     * @param object cDateTime  The libkolabxml datetime object
-     * @return object DateTime  PHP datetime instance
-     */
-    public static function php_datetime($cdt)
-    {
-        if (!is_object($cdt) || !$cdt->isValid())
-            return null;
-
-        $d = new DateTime;
-        $d->setTimezone(self::$timezone);
-
-        try {
-            if ($tzs = $cdt->timezone()) {
-                $tz = new DateTimeZone($tzs);
-                $d->setTimezone($tz);
-            }
-            else if ($cdt->isUTC()) {
-                $d->setTimezone(new DateTimeZone('UTC'));
-            }
-        }
-        catch (Exception $e) { }
-
-        $d->setDate($cdt->year(), $cdt->month(), $cdt->day());
-
-        if ($cdt->isDateOnly()) {
-            $d->_dateonly = true;
-            $d->setTime(12, 0, 0);  // set time to noon to avoid timezone troubles
-        }
-        else {
-            $d->setTime($cdt->hour(), $cdt->minute(), $cdt->second());
-        }
-
-        return $d;
-    }
-
-    /**
-     * Convert a libkolabxml vector to a PHP array
-     *
-     * @param object vector Object
-     * @return array Indexed array containing vector elements
-     */
-    public static function vector2array($vec, $max = PHP_INT_MAX)
-    {
-        $arr = array();
-        for ($i=0; $i < $vec->size() && $i < $max; $i++)
-            $arr[] = $vec->get($i);
-        return $arr;
-    }
-
-    /**
-     * Build a libkolabxml vector (string) from a PHP array
-     *
-     * @param array Array with vector elements
-     * @return object vectors
-     */
-    public static function array2vector($arr)
-    {
-        $vec = new vectors;
-        foreach ((array)$arr as $val) {
-            if (strlen($val))
-                $vec->push($val);
-        }
-        return $vec;
-    }
-
-    /**
-     * Parse the X-Kolab-Type header from MIME messages and return the object type in short form
-     *
-     * @param string X-Kolab-Type header value
-     * @return string Kolab object type (contact,event,task,note,etc.)
-     */
-    public static function mime2object_type($x_kolab_type)
-    {
-        return preg_replace(
-            array('/dictionary.[a-z.]+$/', '/contact.distlist$/'),
-            array( 'dictionary',            'distribution-list'),
-            substr($x_kolab_type, strlen(self::KTYPE_PREFIX))
-        );
-    }
-
-
-    /**
-     * Default constructor of all kolab_format_* objects
-     */
-    public function __construct($xmldata = null, $version = null)
-    {
-        $this->obj = new $this->objclass;
-        $this->xmldata = $xmldata;
-
-        if ($version)
-            $this->version = $version;
-
-        // use libkolab module if available
-        if (class_exists('kolabobject'))
-            $this->xmlobject = new XMLObject();
-    }
-
-    /**
-     * Check for format errors after calling kolabformat::write*()
-     *
-     * @return boolean True if there were errors, False if OK
-     */
-    protected function format_errors()
-    {
-        $ret = $log = false;
-        switch (kolabformat::error()) {
-            case kolabformat::NoError:
-                $ret = false;
-                break;
-            case kolabformat::Warning:
-                $ret = false;
-                $uid = is_object($this->obj) ? $this->obj->uid() : $this->data['uid'];
-                $log = "Warning @ $uid";
-                break;
-            default:
-                $ret = true;
-                $log = "Error";
-        }
-
-        if ($log && !isset($this->formaterror)) {
-            rcube::raise_error(array(
-                'code' => 660,
-                'type' => 'php',
-                'file' => __FILE__,
-                'line' => __LINE__,
-                'message' => "kolabformat $log: " . kolabformat::errorMessage(),
-            ), true);
-
-            $this->formaterror = $ret;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Save the last generated UID to the object properties.
-     * Should be called after kolabformat::writeXXXX();
-     */
-    protected function update_uid()
-    {
-        // get generated UID
-        if (!$this->data['uid']) {
-            if ($this->xmlobject) {
-                $this->data['uid'] = $this->xmlobject->getSerializedUID();
-            }
-            if (empty($this->data['uid'])) {
-                $this->data['uid'] = kolabformat::getSerializedUID();
-            }
-            $this->obj->setUid($this->data['uid']);
-        }
-    }
-
-    /**
-     * Initialize libkolabxml object with cached xml data
-     */
-    protected function init()
-    {
-        if (!$this->loaded) {
-            if ($this->xmldata) {
-                $this->load($this->xmldata);
-                $this->xmldata = null;
-            }
-            $this->loaded = true;
-        }
-    }
-
-    /**
-     * Get constant value for libkolab's version parameter
-     *
-     * @param float Version value to convert
-     * @return int Constant value of either kolabobject::KolabV2 or kolabobject::KolabV3 or false if kolabobject module isn't available
-     */
-    protected function libversion($v = null)
-    {
-        if (class_exists('kolabobject')) {
-            $version = $v ?: $this->version;
-            if ($version <= '2.0')
-                return kolabobject::KolabV2;
-            else
-                return kolabobject::KolabV3;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determine the correct libkolab(xml) wrapper function for the given call
-     * depending on the available PHP modules
-     */
-    protected function libfunc($func)
-    {
-        if (is_array($func) || strpos($func, '::'))
-            return $func;
-        else if (class_exists('kolabobject'))
-            return array($this->xmlobject, $func);
-        else
-            return 'kolabformat::' . $func;
-    }
-
-    /**
-     * Direct getter for object properties
-     */
-    public function __get($var)
-    {
-        return $this->data[$var];
-    }
-
-    /**
-     * Load Kolab object data from the given XML block
-     *
-     * @param string XML data
-     * @return boolean True on success, False on failure
-     */
-    public function load($xml)
-    {
-        $this->formaterror = null;
-        $read_func = $this->libfunc($this->read_func);
-
-        if (is_array($read_func))
-            $r = call_user_func($read_func, $xml, $this->libversion());
-        else
-            $r = call_user_func($read_func, $xml, false);
-
-        if (is_resource($r))
-            $this->obj = new $this->objclass($r);
-        else if (is_a($r, $this->objclass))
-            $this->obj = $r;
-
-        $this->loaded = !$this->format_errors();
-    }
-
-    /**
-     * Write object data to XML format
-     *
-     * @param float Format version to write
-     * @return string XML data
-     */
-    public function write($version = null)
-    {
-        $this->formaterror = null;
-
-        $this->init();
-        $write_func = $this->libfunc($this->write_func);
-        if (is_array($write_func))
-            $this->xmldata = call_user_func($write_func, $this->obj, $this->libversion($version), self::PRODUCT_ID);
-        else
-            $this->xmldata = call_user_func($write_func, $this->obj, self::PRODUCT_ID);
-
-        if (!$this->format_errors())
-            $this->update_uid();
-        else
-            $this->xmldata = null;
-
-        return $this->xmldata;
-    }
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        $this->init();
-
-        if (!empty($object['uid']))
-            $this->obj->setUid($object['uid']);
-
-        // set some automatic values if missing
-        if (empty($object['created']) && method_exists($this->obj, 'setCreated')) {
-            $cdt = $this->obj->created();
-            $object['created'] = $cdt && $cdt->isValid() ? self::php_datetime($cdt) : new DateTime('now', new DateTimeZone('UTC'));
-            if (!$cdt || !$cdt->isValid())
-                $this->obj->setCreated(self::get_datetime($object['created']));
-        }
-
-        $object['changed'] = new DateTime('now', new DateTimeZone('UTC'));
-        $this->obj->setLastModified(self::get_datetime($object['changed']));
-
-        // Save custom properties of the given object
-        if (isset($object['x-custom']) && method_exists($this->obj, 'setCustomProperties')) {
-            $vcustom = new vectorcs;
-            foreach ((array)$object['x-custom'] as $cp) {
-                if (is_array($cp))
-                    $vcustom->push(new CustomProperty($cp[0], $cp[1]));
-            }
-            $this->obj->setCustomProperties($vcustom);
-        }
-        // load custom properties from XML for caching (#2238) if method exists (#3125)
-        else if (method_exists($this->obj, 'customProperties')) {
-            $object['x-custom'] = array();
-            $vcustom = $this->obj->customProperties();
-            for ($i=0; $i < $vcustom->size(); $i++) {
-                $cp = $vcustom->get($i);
-                $object['x-custom'][] = array($cp->identifier, $cp->value);
-            }
-        }
-    }
-
-    /**
-     * Convert the Kolab object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Kolab object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        $this->init();
-
-        // read object properties into local data object
-        $object = array(
-            'uid'     => $this->obj->uid(),
-            'changed' => self::php_datetime($this->obj->lastModified()),
-        );
-
-        // not all container support the created property
-        if (method_exists($this->obj, 'created')) {
-            $object['created'] = self::php_datetime($this->obj->created());
-        }
-
-        // read custom properties
-        if (method_exists($this->obj, 'customProperties')) {
-            $vcustom = $this->obj->customProperties();
-            for ($i=0; $i < $vcustom->size(); $i++) {
-                $cp = $vcustom->get($i);
-                $object['x-custom'][] = array($cp->identifier, $cp->value);
-            }
-        }
-
-        // merge with additional data, e.g. attachments from the message
-        if ($data) {
-            foreach ($data as $idx => $value) {
-                if (is_array($value)) {
-                    $object[$idx] = array_merge((array)$object[$idx], $value);
-                }
-                else {
-                    $object[$idx] = $value;
-                }
-            }
-        }
-
-        return $object;
-    }
-
-    /**
-     * Object validation method to be implemented by derived classes
-     */
-    abstract public function is_valid();
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        return array();
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get words to index for fulltext search
-     *
-     * @return array List of words to save in cache
-     */
-    public function get_words()
-    {
-        return array();
-    }
-
-    /**
-     * Utility function to extract object attachment data
-     *
-     * @param array Hash array reference to append attachment data into
-     */
-    public function get_attachments(&$object, $all = false)
-    {
-        $this->init();
-
-        // handle attachments
-        $vattach = $this->obj->attachments();
-        for ($i=0; $i < $vattach->size(); $i++) {
-            $attach = $vattach->get($i);
-
-            // skip cid: attachments which are mime message parts handled by kolab_storage_folder
-            if (substr($attach->uri(), 0, 4) != 'cid:' && $attach->label()) {
-                $name    = $attach->label();
-                $key     = $name . (isset($object['_attachments'][$name]) ? '.'.$i : '');
-                $content = $attach->data();
-                $object['_attachments'][$key] = array(
-                    'id'       => 'i:'.$i,
-                    'name'     => $name,
-                    'mimetype' => $attach->mimetype(),
-                    'size'     => strlen($content),
-                    'content'  => $content,
-                );
-            }
-            else if ($all && substr($attach->uri(), 0, 4) == 'cid:') {
-                $key = $attach->uri();
-                $object['_attachments'][$key] = array(
-                    'id'       => $key,
-                    'name'     => $attach->label(),
-                    'mimetype' => $attach->mimetype(),
-                );
-            }
-            else if (in_array(substr($attach->uri(), 0, 4), array('http','imap'))) {
-                $object['links'][] = $attach->uri();
-            }
-        }
-    }
-
-    /**
-     * Utility function to set attachment properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     * @param boolean True to always overwrite attachment information
-     */
-    protected function set_attachments($object, $write = true)
-    {
-        // save attachments
-        $vattach = new vectorattachment;
-        foreach ((array) $object['_attachments'] as $cid => $attr) {
-            if (empty($attr))
-                continue;
-            $attach = new Attachment;
-            $attach->setLabel((string)$attr['name']);
-            $attach->setUri('cid:' . $cid, $attr['mimetype'] ?: 'application/octet-stream');
-            if ($attach->isValid()) {
-                $vattach->push($attach);
-                $write = true;
-            }
-            else {
-                rcube::raise_error(array(
-                    'code' => 660,
-                    'type' => 'php',
-                    'file' => __FILE__,
-                    'line' => __LINE__,
-                    'message' => "Invalid attributes for attachment $cid: " . var_export($attr, true),
-                ), true);
-            }
-        }
-
-        foreach ((array) $object['links'] as $link) {
-            $attach = new Attachment;
-            $attach->setUri($link, 'unknown');
-            $vattach->push($attach);
-            $write = true;
-        }
-
-        if ($write) {
-            $this->obj->setAttachments($vattach);
-        }
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_configuration.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_configuration.php
deleted file mode 100644
index ceb7ebb..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_configuration.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-
-/**
- * Kolab Configuration data model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_format_configuration extends kolab_format
-{
-    public $CTYPE   = 'application/vnd.kolab+xml';
-    public $CTYPEv2 = 'application/x-vnd.kolab.configuration';
-
-    protected $objclass   = 'Configuration';
-    protected $read_func  = 'readConfiguration';
-    protected $write_func = 'writeConfiguration';
-
-    private $type_map = array(
-        'category'    => Configuration::TypeCategoryColor,
-        'dictionary'  => Configuration::TypeDictionary,
-        'file_driver' => Configuration::TypeFileDriver,
-        'relation'    => Configuration::TypeRelation,
-        'snippet'     => Configuration::TypeSnippet,
-    );
-
-    private $driver_settings_fields = array('host', 'port', 'username', 'password');
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        // read type-specific properties
-        switch ($object['type']) {
-        case 'dictionary':
-            $dict = new Dictionary($object['language']);
-            $dict->setEntries(self::array2vector($object['e']));
-            $this->obj = new Configuration($dict);
-            break;
-
-        case 'category':
-            // TODO: implement this
-            $categories = new vectorcategorycolor;
-            $this->obj = new Configuration($categories);
-            break;
-
-        case 'file_driver':
-            $driver = new FileDriver($object['driver'], $object['title']);
-
-            $driver->setEnabled((bool) $object['enabled']);
-
-            foreach ($this->driver_settings_fields as $field) {
-                $value = $object[$field];
-                if ($value !== null) {
-                    $driver->{'set' . ucfirst($field)}($value);
-                }
-            }
-
-            $this->obj = new Configuration($driver);
-            break;
-
-        case 'relation':
-            $relation = new Relation(strval($object['name']), strval($object['category']));
-
-            if ($object['color']) {
-                $relation->setColor($object['color']);
-            }
-            if ($object['parent']) {
-                $relation->setParent($object['parent']);
-            }
-            if ($object['iconName']) {
-                $relation->setIconName($object['iconName']);
-            }
-            if ($object['priority'] > 0) {
-                $relation->setPriority((int) $object['priority']);
-            }
-            if (!empty($object['members'])) {
-                $relation->setMembers(self::array2vector($object['members']));
-            }
-
-            $this->obj = new Configuration($relation);
-            break;
-
-        case 'snippet':
-            $collection = new SnippetCollection($object['name']);
-            $snippets   = new vectorsnippets;
-
-            foreach ((array) $object['snippets'] as $item) {
-                $snippet = new snippet($item['name'], $item['text']);
-                $snippet->setTextType(strtolower($item['type']) == 'html' ? Snippet::HTML : Snippet::Plain);
-                if ($item['shortcut']) {
-                    $snippet->setShortCut($item['shortcut']);
-                }
-
-                $snippets->push($snippet);
-            }
-
-            $collection->setSnippets($snippets);
-
-            $this->obj = new Configuration($collection);
-            break;
-
-        default:
-            return false;
-        }
-
-        // adjust content-type string
-        $this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];
-
-        // reset old object data, otherwise set() will overwrite current data (#4095)
-        $this->xmldata = null;
-        // set common object properties
-        parent::set($object);
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     *
-     */
-    public function is_valid()
-    {
-        return $this->data || (is_object($this->obj) && $this->obj->isValid());
-    }
-
-    /**
-     * Convert the Configuration object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Config object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data)) {
-            return $this->data;
-        }
-
-        // read common object props into local data object
-        $object = parent::to_array($data);
-
-        $type_map = array_flip($this->type_map);
-
-        $object['type'] = $type_map[$this->obj->type()];
-
-        // read type-specific properties
-        switch ($object['type']) {
-        case 'dictionary':
-            $dict = $this->obj->dictionary();
-            $object['language'] = $dict->language();
-            $object['e'] = self::vector2array($dict->entries());
-            break;
-
-        case 'category':
-            // TODO: implement this
-            break;
-
-        case 'file_driver':
-            $driver = $this->obj->fileDriver();
-
-            $object['driver']  = $driver->driver();
-            $object['title']   = $driver->title();
-            $object['enabled'] = $driver->enabled();
-
-            foreach ($this->driver_settings_fields as $field) {
-                $object[$field] = $driver->{$field}();
-            }
-
-            break;
-
-        case 'relation':
-            $relation = $this->obj->relation();
-
-            $object['name']     = $relation->name();
-            $object['category'] = $relation->type();
-            $object['color']    = $relation->color();
-            $object['parent']   = $relation->parent();
-            $object['iconName'] = $relation->iconName();
-            $object['priority'] = $relation->priority();
-            $object['members']  = self::vector2array($relation->members());
-
-            break;
-
-        case 'snippet':
-            $collection = $this->obj->snippets();
-
-            $object['name']     = $collection->name();
-            $object['snippets'] = array();
-
-            $snippets = $collection->snippets();
-            for ($i=0; $i < $snippets->size(); $i++) {
-                $snippet = $snippets->get($i);
-                $object['snippets'][] = array(
-                    'name'     => $snippet->name(),
-                    'text'     => $snippet->text(),
-                    'type'     => $snippet->textType() == Snippet::HTML ? 'html' : 'plain',
-                    'shortcut' => $snippet->shortCut(),
-                );
-            }
-
-            break;
-        }
-
-        // adjust content-type string
-        if ($object['type']) {
-            $this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];
-        }
-
-        $this->data = $object;
-        return $this->data;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        $tags = array();
-
-        switch ($this->data['type']) {
-        case 'dictionary':
-            $tags = array($this->data['language']);
-            break;
-
-        case 'relation':
-            $tags = array('category:' . $this->data['category']);
-            break;
-        }
-
-        return $tags;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get words to index for fulltext search
-     *
-     * @return array List of words to save in cache
-     */
-    public function get_words()
-    {
-        $words = array();
-
-        foreach ((array)$this->data['members'] as $url) {
-            $member = kolab_storage_config::parse_member_url($url);
-
-            if (empty($member)) {
-                if (strpos($url, 'urn:uuid:') === 0) {
-                    $words[] = substr($url, 9);
-                }
-            }
-            else if (!empty($member['params']['message-id'])) {
-                $words[] = $member['params']['message-id'];
-            }
-            else {
-                // derive message identifier from URI
-                $words[] = md5($url);
-            }
-        }
-
-        return $words;
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_contact.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_contact.php
deleted file mode 100644
index 806a819..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_contact.php
+++ /dev/null
@@ -1,482 +0,0 @@
-<?php
-
-/**
- * Kolab Contact model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_format_contact extends kolab_format
-{
-    public $CTYPE = 'application/vcard+xml';
-    public $CTYPEv2 = 'application/x-vnd.kolab.contact';
-
-    protected $objclass = 'Contact';
-    protected $read_func = 'readContact';
-    protected $write_func = 'writeContact';
-
-    public static $fulltext_cols = array('name', 'firstname', 'surname', 'middlename', 'email:address');
-
-    public $phonetypes = array(
-        'home'    => Telephone::Home,
-        'work'    => Telephone::Work,
-        'text'    => Telephone::Text,
-        'main'    => Telephone::Voice,
-        'homefax' => Telephone::Fax,
-        'workfax' => Telephone::Fax,
-        'mobile'  => Telephone::Cell,
-        'video'   => Telephone::Video,
-        'pager'   => Telephone::Pager,
-        'car'     => Telephone::Car,
-        'other'   => Telephone::Textphone,
-    );
-
-    public $emailtypes = array(
-        'home' => Email::Home,
-        'work' => Email::Work,
-        'other' => Email::NoType,
-    );
-
-    public $addresstypes = array(
-        'home' => Address::Home,
-        'work' => Address::Work,
-        'office' => 0,
-    );
-
-    private $gendermap = array(
-        'female' => Contact::Female,
-        'male'   => Contact::Male,
-    );
-
-    private $relatedmap = array(
-        'manager'   => Related::Manager,
-        'assistant' => Related::Assistant,
-        'spouse'    => Related::Spouse,
-        'children'  => Related::Child,
-    );
-
-
-    /**
-     * Default constructor
-     */
-    function __construct($xmldata = null, $version = 3.0)
-    {
-        parent::__construct($xmldata, $version);
-
-        // complete phone types
-        $this->phonetypes['homefax'] |= Telephone::Home;
-        $this->phonetypes['workfax'] |= Telephone::Work;
-    }
-
-    /**
-     * Set contact properties to the kolabformat object
-     *
-     * @param array  Contact data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common object properties
-        parent::set($object);
-
-        // do the hard work of setting object values
-        $nc = new NameComponents;
-        $nc->setSurnames(self::array2vector($object['surname']));
-        $nc->setGiven(self::array2vector($object['firstname']));
-        $nc->setAdditional(self::array2vector($object['middlename']));
-        $nc->setPrefixes(self::array2vector($object['prefix']));
-        $nc->setSuffixes(self::array2vector($object['suffix']));
-        $this->obj->setNameComponents($nc);
-        $this->obj->setName($object['name']);
-        $this->obj->setCategories(self::array2vector($object['categories']));
-
-        if (isset($object['nickname']))
-            $this->obj->setNickNames(self::array2vector($object['nickname']));
-        if (isset($object['jobtitle']))
-            $this->obj->setTitles(self::array2vector($object['jobtitle']));
-
-        // organisation related properties (affiliation)
-        $org = new Affiliation;
-        $offices = new vectoraddress;
-        if ($object['organization'])
-            $org->setOrganisation($object['organization']);
-        if ($object['department'])
-            $org->setOrganisationalUnits(self::array2vector($object['department']));
-        if ($object['profession'])
-            $org->setRoles(self::array2vector($object['profession']));
-
-        $rels = new vectorrelated;
-        foreach (array('manager','assistant') as $field) {
-            if (!empty($object[$field])) {
-                $reltype = $this->relatedmap[$field];
-                foreach ((array)$object[$field] as $value) {
-                    $rels->push(new Related(Related::Text, $value, $reltype));
-                }
-            }
-        }
-        $org->setRelateds($rels);
-
-        // im, email, url
-        $this->obj->setIMaddresses(self::array2vector($object['im']));
-
-        if (class_exists('vectoremail')) {
-            $vemails = new vectoremail;
-            foreach ((array)$object['email'] as $email) {
-                $type = $this->emailtypes[$email['type']];
-                $vemails->push(new Email($email['address'], intval($type)));
-            }
-        }
-        else {
-            $vemails = self::array2vector(array_map(function($v){ return $v['address']; }, $object['email']));
-        }
-        $this->obj->setEmailAddresses($vemails);
-
-        $vurls = new vectorurl;
-        foreach ((array)$object['website'] as $url) {
-            $type = $url['type'] == 'blog' ? Url::Blog : Url::NoType;
-            $vurls->push(new Url($url['url'], $type));
-        }
-        $this->obj->setUrls($vurls);
-
-        // addresses
-        $adrs = new vectoraddress;
-        foreach ((array)$object['address'] as $address) {
-            $adr = new Address;
-            $type = $this->addresstypes[$address['type']];
-            if (isset($type))
-                $adr->setTypes($type);
-            else if ($address['type'])
-                $adr->setLabel($address['type']);
-            if ($address['street'])
-                $adr->setStreet($address['street']);
-            if ($address['locality'])
-                $adr->setLocality($address['locality']);
-            if ($address['code'])
-                $adr->setCode($address['code']);
-            if ($address['region'])
-                $adr->setRegion($address['region']);
-            if ($address['country'])
-                $adr->setCountry($address['country']);
-
-            if ($address['type'] == 'office')
-                $offices->push($adr);
-            else
-                $adrs->push($adr);
-        }
-        $this->obj->setAddresses($adrs);
-        $org->setAddresses($offices);
-
-        // add org affiliation after addresses are set
-        $orgs = new vectoraffiliation;
-        $orgs->push($org);
-        $this->obj->setAffiliations($orgs);
-
-        // telephones
-        $tels = new vectortelephone;
-        foreach ((array)$object['phone'] as $phone) {
-            $tel = new Telephone;
-            if (isset($this->phonetypes[$phone['type']]))
-                $tel->setTypes($this->phonetypes[$phone['type']]);
-            $tel->setNumber($phone['number']);
-            $tels->push($tel);
-        }
-        $this->obj->setTelephones($tels);
-
-        if (isset($object['gender']))
-            $this->obj->setGender($this->gendermap[$object['gender']] ? $this->gendermap[$object['gender']] : Contact::NotSet);
-        if (isset($object['notes']))
-            $this->obj->setNote($object['notes']);
-        if (isset($object['freebusyurl']))
-            $this->obj->setFreeBusyUrl($object['freebusyurl']);
-        if (isset($object['lang']))
-            $this->obj->setLanguages(self::array2vector($object['lang']));
-        if (isset($object['birthday']))
-            $this->obj->setBDay(self::get_datetime($object['birthday'], false, true));
-        if (isset($object['anniversary']))
-            $this->obj->setAnniversary(self::get_datetime($object['anniversary'], false, true));
-
-        if (!empty($object['photo'])) {
-            if ($type = rcube_mime::image_content_type($object['photo']))
-                $this->obj->setPhoto($object['photo'], $type);
-        }
-        else if (isset($object['photo']))
-            $this->obj->setPhoto('','');
-        else if ($this->obj->photoMimetype())  // load saved photo for caching
-            $object['photo'] = $this->obj->photo();
-
-        // spouse and children are relateds
-        $rels = new vectorrelated;
-        foreach (array('spouse','children') as $field) {
-            if (!empty($object[$field])) {
-                $reltype = $this->relatedmap[$field];
-                foreach ((array)$object[$field] as $value) {
-                    $rels->push(new Related(Related::Text, $value, $reltype));
-                }
-            }
-        }
-        // add other relateds
-        if (is_array($object['related'])) {
-            foreach ($object['related'] as $value) {
-                $rels->push(new Related(Related::Text, $value));
-            }
-        }
-        $this->obj->setRelateds($rels);
-
-        // insert/replace crypto keys
-        $pgp_index = $pkcs7_index = -1;
-        $keys = $this->obj->keys();
-        for ($i=0; $i < $keys->size(); $i++) {
-            $key = $keys->get($i);
-            if ($pgp_index < 0 && $key->type() == Key::PGP)
-                $pgp_index = $i;
-            else if ($pkcs7_index < 0 && $key->type() == Key::PKCS7_MIME)
-                $pkcs7_index = $i;
-        }
-
-        $pgpkey   = $object['pgppublickey']   ? new Key($object['pgppublickey'], Key::PGP) : new Key();
-        $pkcs7key = $object['pkcs7publickey'] ? new Key($object['pkcs7publickey'], Key::PKCS7_MIME) : new Key();
-
-        if ($pgp_index >= 0)
-            $keys->set($pgp_index, $pgpkey);
-        else if (!empty($object['pgppublickey']))
-            $keys->push($pgpkey);
-        if ($pkcs7_index >= 0)
-            $keys->set($pkcs7_index, $pkcs7key);
-        else if (!empty($object['pkcs7publickey']))
-            $keys->push($pkcs7key);
-
-        $this->obj->setKeys($keys);
-
-        // TODO: handle language, gpslocation, etc.
-
-        // set type property for proper caching
-        $object['_type'] = 'contact';
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     *
-     */
-    public function is_valid()
-    {
-        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->uid() /*$this->obj->isValid()*/));
-    }
-
-    /**
-     * Convert the Contact object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Contact data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data))
-            return $this->data;
-
-        // read common object props into local data object
-        $object = parent::to_array($data);
-
-        $object['name'] = $this->obj->name();
-
-        $nc = $this->obj->nameComponents();
-        $object['surname']    = join(' ', self::vector2array($nc->surnames()));
-        $object['firstname']  = join(' ', self::vector2array($nc->given()));
-        $object['middlename'] = join(' ', self::vector2array($nc->additional()));
-        $object['prefix']     = join(' ', self::vector2array($nc->prefixes()));
-        $object['suffix']     = join(' ', self::vector2array($nc->suffixes()));
-        $object['nickname']   = join(' ', self::vector2array($this->obj->nickNames()));
-        $object['jobtitle']   = join(' ', self::vector2array($this->obj->titles()));
-        $object['categories'] = self::vector2array($this->obj->categories());
-
-        // organisation related properties (affiliation)
-        $orgs = $this->obj->affiliations();
-        if ($orgs->size()) {
-            $org = $orgs->get(0);
-            $object['organization']   = $org->organisation();
-            $object['profession']     = join(' ', self::vector2array($org->roles()));
-            $object['department']     = join(' ', self::vector2array($org->organisationalUnits()));
-            $this->read_relateds($org->relateds(), $object);
-        }
-
-        $object['im'] = self::vector2array($this->obj->imAddresses());
-
-        $emails = $this->obj->emailAddresses();
-        if ($emails instanceof vectoremail) {
-            $emailtypes = array_flip($this->emailtypes);
-            for ($i=0; $i < $emails->size(); $i++) {
-                $email = $emails->get($i);
-                $object['email'][] = array('address' => $email->address(), 'type' => $emailtypes[$email->types()]);
-            }
-        }
-        else {
-            $object['email'] = self::vector2array($emails);
-        }
-
-        $urls = $this->obj->urls();
-        for ($i=0; $i < $urls->size(); $i++) {
-            $url = $urls->get($i);
-            $subtype = $url->type() == Url::Blog ? 'blog' : 'homepage';
-            $object['website'][] = array('url' => $url->url(), 'type' => $subtype);
-        }
-
-        // addresses
-        $this->read_addresses($this->obj->addresses(), $object);
-        if ($org && ($offices = $org->addresses()))
-            $this->read_addresses($offices, $object, 'office');
-
-        // telehones
-        $tels = $this->obj->telephones();
-        $teltypes = array_flip($this->phonetypes);
-        for ($i=0; $i < $tels->size(); $i++) {
-            $tel = $tels->get($i);
-            $object['phone'][] = array('number' => $tel->number(), 'type' => $teltypes[$tel->types()]);
-        }
-
-        $object['notes'] = $this->obj->note();
-        $object['freebusyurl'] = $this->obj->freeBusyUrl();
-        $object['lang'] = self::vector2array($this->obj->languages());
-
-        if ($bday = self::php_datetime($this->obj->bDay()))
-            $object['birthday'] = $bday;
-
-        if ($anniversary = self::php_datetime($this->obj->anniversary()))
-            $object['anniversary'] = $anniversary;
-
-        $gendermap = array_flip($this->gendermap);
-        if (($g = $this->obj->gender()) && $gendermap[$g])
-            $object['gender'] = $gendermap[$g];
-
-        if ($this->obj->photoMimetype())
-            $object['photo'] = $this->obj->photo();
-        else if ($this->xmlobject && ($photo_name = $this->xmlobject->pictureAttachmentName()))
-            $object['photo'] = $photo_name;
-
-        // relateds -> spouse, children
-        $this->read_relateds($this->obj->relateds(), $object, 'related');
-
-        // crypto settings: currently only key values are supported
-        $keys = $this->obj->keys();
-        for ($i=0; is_object($keys) && $i < $keys->size(); $i++) {
-            $key = $keys->get($i);
-            if ($key->type() == Key::PGP)
-                $object['pgppublickey'] = $key->key();
-            else if ($key->type() == Key::PKCS7_MIME)
-                $object['pkcs7publickey'] = $key->key();
-        }
-
-        $this->data = $object;
-        return $this->data;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get words to index for fulltext search
-     *
-     * @return array List of words to save in cache
-     */
-    public function get_words()
-    {
-        $data = '';
-        foreach (self::$fulltext_cols as $colname) {
-            list($col, $field) = explode(':', $colname);
-
-            if ($field) {
-                $a = array();
-                foreach ((array)$this->data[$col] as $attr)
-                    $a[] = $attr[$field];
-                $val = join(' ', $a);
-            }
-            else {
-                $val = is_array($this->data[$col]) ? join(' ', $this->data[$col]) : $this->data[$col];
-            }
-
-            if (strlen($val))
-                $data .= $val . ' ';
-        }
-
-        return array_unique(rcube_utils::normalize_string($data, true));
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        $tags = array();
-
-        if (!empty($this->data['birthday'])) {
-            $tags[] = 'x-has-birthday';
-        }
-
-        return $tags;
-    }
-
-    /**
-     * Helper method to copy contents of an Address vector to the contact data object
-     */
-    private function read_addresses($addresses, &$object, $type = null)
-    {
-        $adrtypes = array_flip($this->addresstypes);
-
-        for ($i=0; $i < $addresses->size(); $i++) {
-            $adr = $addresses->get($i);
-            $object['address'][] = array(
-                'type'     => $type ? $type : ($adrtypes[$adr->types()] ? $adrtypes[$adr->types()] : ''), /*$adr->label()),*/
-                'street'   => $adr->street(),
-                'code'     => $adr->code(),
-                'locality' => $adr->locality(),
-                'region'   => $adr->region(),
-                'country'  => $adr->country()
-            );
-        }
-    }
-
-    /**
-     * Helper method to map contents of a Related vector to the contact data object
-     */
-    private function read_relateds($rels, &$object, $catchall = null)
-    {
-        $typemap = array_flip($this->relatedmap);
-
-        for ($i=0; $i < $rels->size(); $i++) {
-            $rel = $rels->get($i);
-            if ($rel->type() != Related::Text)  // we can't handle UID relations yet
-                continue;
-
-            $known = false;
-            $types = $rel->relationTypes();
-            foreach ($typemap as $t => $field) {
-                if ($types & $t) {
-                    $object[$field][] = $rel->text();
-                    $known = true;
-                    break;
-                }
-            }
-
-            if (!$known && $catchall) {
-                $object[$catchall][] = $rel->text();
-            }
-        }
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_distributionlist.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_distributionlist.php
deleted file mode 100644
index 88c6f7b..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_distributionlist.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * Kolab Distribution List model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_format_distributionlist extends kolab_format
-{
-    public $CTYPE = 'application/vcard+xml';
-    public $CTYPEv2 = 'application/x-vnd.kolab.distribution-list';
-
-    protected $objclass = 'DistList';
-    protected $read_func = 'readDistlist';
-    protected $write_func = 'writeDistlist';
-
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common object properties
-        parent::set($object);
-
-        $this->obj->setName($object['name']);
-
-        $seen = array();
-        $members = new vectorcontactref;
-        foreach ((array)$object['member'] as $i => $member) {
-            if ($member['uid']) {
-                $key = 'uid:' . $member['uid'];
-                $m = new ContactReference(ContactReference::UidReference, $member['uid']);
-            }
-            else if ($member['email']) {
-                $key = 'mailto:' . $member['email'];
-                $m = new ContactReference(ContactReference::EmailReference, $member['email']);
-                $m->setName($member['name']);
-            }
-            else {
-                continue;
-            }
-
-            if (!$seen[$key]++) {
-                $members->push($m);
-            }
-            else {
-                // remove dupes for caching
-                unset($object['member'][$i]);
-            }
-        }
-
-        $this->obj->setMembers($members);
-
-        // set type property for proper caching
-        $object['_type'] = 'distribution-list';
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    public function is_valid()
-    {
-        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
-    }
-
-    /**
-     * Convert the Distlist object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Distribution list data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data))
-            return $this->data;
-
-        // read common object props into local data object
-        $object = parent::to_array($data);
-
-        // add object properties
-        $object += array(
-            'name'      => $this->obj->name(),
-            'member'    => array(),
-            '_type'     => 'distribution-list',
-        );
-
-        $members = $this->obj->members();
-        for ($i=0; $i < $members->size(); $i++) {
-            $member = $members->get($i);
-//            if ($member->type() == ContactReference::UidReference && ($uid = $member->uid()))
-                $object['member'][] = array(
-                    'uid'   => $member->uid(),
-                    'email' => $member->email(),
-                    'name'  => $member->name(),
-                );
-        }
-
-        $this->data = $object;
-        return $this->data;
-    }
-
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_event.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_event.php
deleted file mode 100644
index feea60d..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_event.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-
-/**
- * Kolab Event model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_format_event extends kolab_format_xcal
-{
-    public $CTYPEv2 = 'application/x-vnd.kolab.event';
-
-    public static $scheduling_properties = array('start', 'end', 'allday', 'recurrence', 'location', 'status', 'cancelled');
-
-    protected $objclass = 'Event';
-    protected $read_func = 'readEvent';
-    protected $write_func = 'writeEvent';
-
-    /**
-     * Default constructor
-     */
-    function __construct($data = null, $version = 3.0)
-    {
-        parent::__construct(is_string($data) ? $data : null, $version);
-
-        // got an Event object as argument
-        if (is_object($data) && is_a($data, $this->objclass)) {
-            $this->obj = $data;
-            $this->loaded = true;
-        }
-
-        // copy static property overriden by this class
-        $this->_scheduling_properties = self::$scheduling_properties;
-    }
-
-    /**
-     * Clones into an instance of libcalendaring's extended EventCal class
-     *
-     * @return mixed EventCal object or false on failure
-     */
-    public function to_libcal()
-    {
-        static $error_logged = false;
-
-        if (class_exists('kolabcalendaring')) {
-            return new EventCal($this->obj);
-        }
-        else if (!$error_logged) {
-            $error_logged = true;
-            rcube::raise_error(array(
-                'code' => 900, 'type' => 'php',
-                'message' => "required kolabcalendaring module not found"
-            ), true);
-        }
-
-        return false;
-    }
-
-    /**
-     * Set event properties to the kolabformat object
-     *
-     * @param array  Event data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common xcal properties
-        parent::set($object);
-
-        // do the hard work of setting object values
-        $this->obj->setStart(self::get_datetime($object['start'], null, $object['allday']));
-        $this->obj->setEnd(self::get_datetime($object['end'], null, $object['allday']));
-        $this->obj->setTransparency($object['free_busy'] == 'free');
-
-        $status = kolabformat::StatusUndefined;
-        if ($object['free_busy'] == 'tentative')
-            $status = kolabformat::StatusTentative;
-        if ($object['cancelled'])
-            $status = kolabformat::StatusCancelled;
-        else if ($object['status'] && array_key_exists($object['status'], $this->status_map))
-            $status = $this->status_map[$object['status']];
-        $this->obj->setStatus($status);
-
-        // save (recurrence) exceptions
-        if (is_array($object['recurrence']) && is_array($object['recurrence']['EXCEPTIONS']) && !isset($object['exceptions'])) {
-            $object['exceptions'] = $object['recurrence']['EXCEPTIONS'];
-        }
-
-        if (is_array($object['exceptions'])) {
-            $recurrence_id_format = libkolab::recurrence_id_format($object);
-            $vexceptions = new vectorevent;
-            foreach ($object['exceptions'] as $i => $exception) {
-                $exevent = new kolab_format_event;
-                $exevent->set(($compacted = $this->compact_exception($exception, $object)));  // only save differing values
-
-                // get value for recurrence-id
-                $recurrence_id = null;
-                if (!empty($exception['recurrence_date']) && is_a($exception['recurrence_date'], 'DateTime')) {
-                    $recurrence_id = $exception['recurrence_date'];
-                    $compacted['_instance'] = $recurrence_id->format($recurrence_id_format);
-                }
-                else if (!empty($exception['_instance']) && strlen($exception['_instance']) > 4) {
-                    $recurrence_id = rcube_utils::anytodatetime($exception['_instance'], $object['start']->getTimezone());
-                    $compacted['recurrence_date'] = $recurrence_id;
-                }
-
-                $exevent->obj->setRecurrenceID(self::get_datetime($recurrence_id ?: $exception['start'], null,  $object['allday']), (bool)$exception['thisandfuture']);
-
-                $vexceptions->push($exevent->obj);
-
-                // write cleaned-up exception data back to memory/cache
-                $object['exceptions'][$i] = $this->expand_exception($exevent->data, $object);
-            }
-            $this->obj->setExceptions($vexceptions);
-
-            // link with recurrence.EXCEPTIONS for compatibility
-            if (is_array($object['recurrence'])) {
-                $object['recurrence']['EXCEPTIONS'] = &$object['exceptions'];
-            }
-        }
-
-        if ($object['recurrence_date'] && $object['recurrence_date'] instanceof DateTime) {
-            if ($object['recurrence']) {
-                // unset recurrence_date for master events with rrule
-                $object['recurrence_date'] = null;
-            }
-            $this->obj->setRecurrenceID(self::get_datetime($object['recurrence_date'], null, $object['allday']), (bool)$object['thisandfuture']);
-        }
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     *
-     */
-    public function is_valid()
-    {
-        return !$this->formaterror && (($this->data && !empty($this->data['start']) && !empty($this->data['end'])) ||
-            (is_object($this->obj) && $this->obj->isValid() && $this->obj->uid()));
-    }
-
-    /**
-     * Convert the Event object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Event data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data))
-            return $this->data;
-
-        // read common xcal props
-        $object = parent::to_array($data);
-
-        // read object properties
-        $object += array(
-            'end'         => self::php_datetime($this->obj->end()),
-            'allday'      => $this->obj->start()->isDateOnly(),
-            'free_busy'   => $this->obj->transparency() ? 'free' : 'busy',  // TODO: transparency is only boolean
-            'attendees'   => array(),
-        );
-
-        // derive event end from duration (#1916)
-        if (!$object['end'] && $object['start'] && ($duration = $this->obj->duration()) && $duration->isValid()) {
-            $interval = new DateInterval('PT0S');
-            $interval->d = $duration->weeks() * 7 + $duration->days();
-            $interval->h = $duration->hours();
-            $interval->i = $duration->minutes();
-            $interval->s = $duration->seconds();
-            $object['end'] = clone $object['start'];
-            $object['end']->add($interval);
-        }
-
-        // organizer is part of the attendees list in Roundcube
-        if ($object['organizer']) {
-            $object['organizer']['role'] = 'ORGANIZER';
-            array_unshift($object['attendees'], $object['organizer']);
-        }
-
-        // status defines different event properties...
-        $status = $this->obj->status();
-        if ($status == kolabformat::StatusTentative)
-          $object['free_busy'] = 'tentative';
-        else if ($status == kolabformat::StatusCancelled)
-          $object['cancelled'] = true;
-
-        // this is an exception object
-        if ($this->obj->recurrenceID()->isValid()) {
-            $object['thisandfuture'] = $this->obj->thisAndFuture();
-            $object['recurrence_date'] = self::php_datetime($this->obj->recurrenceID());
-        }
-        // read exception event objects
-        if (($exceptions = $this->obj->exceptions()) && is_object($exceptions) && $exceptions->size()) {
-            $recurrence_exceptions = array();
-            $recurrence_id_format = libkolab::recurrence_id_format($object);
-            for ($i=0; $i < $exceptions->size(); $i++) {
-                if (($exobj = $exceptions->get($i))) {
-                    $exception = new kolab_format_event($exobj);
-                    if ($exception->is_valid()) {
-                        $exdata = $exception->to_array();
-
-                        // fix date-only recurrence ID saved by old versions
-                        if ($exdata['recurrence_date'] && $exdata['recurrence_date']->_dateonly && !$object['allday']) {
-                            $exdata['recurrence_date']->setTimezone($object['start']->getTimezone());
-                            $exdata['recurrence_date']->setTime($object['start']->format('G'), intval($object['start']->format('i')), intval($object['start']->format('s')));
-                        }
-
-                        $recurrence_id = $exdata['recurrence_date'] ?: $exdata['start'];
-                        $exdata['_instance'] = $recurrence_id->format($recurrence_id_format);
-                        $recurrence_exceptions[] = $this->expand_exception($exdata, $object);
-                    }
-                }
-            }
-            $object['exceptions'] = $recurrence_exceptions;
-
-            // also link with recurrence.EXCEPTIONS for compatibility
-            if (is_array($object['recurrence'])) {
-                $object['recurrence']['EXCEPTIONS'] = &$object['exceptions'];
-            }
-        }
-
-        return $this->data = $object;
-    }
-
-    /**
-     * Getter for a single instance from a recurrence series or stored subcomponents
-     *
-     * @param mixed The recurrence-id of the requested instance, either as string or a DateTime object
-     * @return array Event data as hash array or null if not found
-     */
-    public function get_instance($recurrence_id)
-    {
-        $result = null;
-        $object = $this->to_array();
-
-        $recurrence_id_format = libkolab::recurrence_id_format($object);
-        $instance_id = $recurrence_id instanceof DateTime ? $recurrence_id->format($recurrence_id_format) : strval($recurrence_id);
-
-        if ($object['recurrence_date'] instanceof DateTime) {
-            if ($object['recurrence_date']->format($recurrence_id_format) == $instance_id) {
-                $result = $object;
-            }
-        }
-
-        if (!$result && is_array($object['exceptions'])) {
-            foreach ($object['exceptions'] as $exception) {
-                if ($exception['_instance'] == $instance_id) {
-                    $result = $exception;
-                    $result['isexception'] = 1;
-                    break;
-                }
-            }
-        }
-
-        // TODO: compute instances from recurrence rule and return the matching instance
-        // clone from plugins/calendar/drivers/kolab/kolab_calendar::get_recurring_events()
-
-        return $result;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags($obj = null)
-    {
-        $tags = parent::get_tags($obj);
-        $object = $obj ?: $this->data;
-
-        foreach ((array)$object['categories'] as $cat) {
-            $tags[] = rcube_utils::normalize_string($cat);
-        }
-
-        return array_unique($tags);
-    }
-
-    /**
-     * Remove some attributes from the exception container
-     */
-    private function compact_exception($exception, $master)
-    {
-        $forbidden = array('recurrence','exceptions','organizer','_attachments');
-
-        foreach ($forbidden as $prop) {
-            if (array_key_exists($prop, $exception)) {
-                unset($exception[$prop]);
-            }
-        }
-
-        // preserve this property for date serialization
-        $exception['allday'] = $master['allday'];
-
-        return $exception;
-    }
-
-    /**
-     * Copy attributes not specified by the exception from the master event
-     */
-    private function expand_exception($exception, $master)
-    {
-        $is_recurring = !empty($master['recurrence']);
-
-        foreach ($master as $prop => $value) {
-            if (empty($exception[$prop]) && !empty($value) && $prop != 'exceptions' && $prop[0] != '_'
-                  && ($is_recurring || in_array($prop, array('uid','organizer','_attachments')))) {
-                $exception[$prop] = $value;
-                if ($prop == 'recurrence') {
-                    unset($exception[$prop]['EXCEPTIONS']);
-                }
-            }
-        }
-
-        return $exception;
-    }
-
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_file.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_file.php
deleted file mode 100644
index 34c0ca6..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_file.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-/**
- * Kolab File model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_format_file extends kolab_format
-{
-    public $CTYPE = 'application/vnd.kolab+xml';
-
-    protected $objclass = 'File';
-    protected $read_func = 'kolabformat::readKolabFile';
-    protected $write_func = 'kolabformat::writeKolabFile';
-
-    protected $sensitivity_map = array(
-        'public'       => kolabformat::ClassPublic,
-        'private'      => kolabformat::ClassPrivate,
-        'confidential' => kolabformat::ClassConfidential,
-    );
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common object properties
-        parent::set($object);
-
-        $this->obj->setClassification($this->sensitivity_map[$object['sensitivity']]);
-        $this->obj->setCategories(self::array2vector($object['categories']));
-
-        if (isset($object['notes'])) {
-            $this->obj->setNote($object['notes']);
-        }
-
-        // Add file attachment
-        if (!empty($object['_attachments'])) {
-            $cid         = key($object['_attachments']);
-            $attach_attr = $object['_attachments'][$cid];
-            $attach      = new Attachment;
-
-            $attach->setLabel((string)$attach_attr['name']);
-            $attach->setUri('cid:' . $cid, $attach_attr['mimetype']);
-            $this->obj->setFile($attach);
-
-            // make sure size is set, so object saved in cache contains this info
-            if (!isset($attach_attr['size'])) {
-                $size = 0;
-
-                if (!empty($attach_attr['content'])) {
-                    if (is_resource($attach_attr['content'])) {
-                        $stat = fstat($attach_attr['content']);
-                        $size = $stat ? $stat['size'] : 0;
-                    }
-                    else {
-                        $size = strlen($attach_attr['content']);
-                    }
-                }
-                else if (isset($attach_attr['path'])) {
-                    $size = @filesize($attach_attr['path']);
-                }
-
-                $object['_attachments'][$cid]['size'] = $size;
-            }
-        }
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     * Check if object's data validity
-     */
-    public function is_valid()
-    {
-        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
-    }
-
-    /**
-     * Convert the Configuration object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Config object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data)) {
-            return $this->data;
-        }
-
-        // read common object props into local data object
-        $object = parent::to_array($data);
-
-        $sensitivity_map = array_flip($this->sensitivity_map);
-
-        // read object properties
-        $object += array(
-            'sensitivity' => $sensitivity_map[$this->obj->classification()],
-            'categories'  => self::vector2array($this->obj->categories()),
-            'notes'       => $this->obj->note(),
-        );
-
-        return $this->data = $object;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        $tags = array();
-
-        foreach ((array)$this->data['categories'] as $cat) {
-            $tags[] = rcube_utils::normalize_string($cat);
-        }
-
-        // Add file mimetype to tags
-        if (!empty($this->data['_attachments'])) {
-            reset($this->data['_attachments']);
-            $key        = key($this->data['_attachments']);
-            $attachment = $this->data['_attachments'][$key];
-
-            if ($attachment['mimetype']) {
-                $tags[] = $attachment['mimetype'];
-            }
-        }
-
-        return $tags;
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_journal.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_journal.php
deleted file mode 100644
index f7ccd31..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_journal.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * Kolab Journal model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_format_journal extends kolab_format
-{
-    public $CTYPE = 'application/calendar+xml';
-    public $CTYPEv2 = 'application/x-vnd.kolab.journal';
-
-    protected $objclass = 'Journal';
-    protected $read_func = 'readJournal';
-    protected $write_func = 'writeJournal';
-
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common object properties
-        parent::set($object);
-
-        // TODO: set object propeties
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     *
-     */
-    public function is_valid()
-    {
-        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
-    }
-
-    /**
-     * Convert the Configuration object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Config object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data))
-            return $this->data;
-
-        // read common object props into local data object
-        $object = parent::to_array($data);
-
-        // TODO: read object properties
-
-        $this->data = $object;
-        return $this->data;
-    }
-
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_note.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_note.php
deleted file mode 100644
index bca5156..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_note.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-/**
- * Kolab Note model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_format_note extends kolab_format
-{
-    public $CTYPE = 'application/vnd.kolab+xml';
-    public $CTYPEv2 = 'application/x-vnd.kolab.note';
-
-    public static $fulltext_cols = array('title', 'description', 'categories');
-
-    protected $objclass = 'Note';
-    protected $read_func = 'readNote';
-    protected $write_func = 'writeNote';
-
-    protected $sensitivity_map = array(
-        'public'       => kolabformat::ClassPublic,
-        'private'      => kolabformat::ClassPrivate,
-        'confidential' => kolabformat::ClassConfidential,
-    );
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common object properties
-        parent::set($object);
-
-        $this->obj->setSummary($object['title']);
-        $this->obj->setDescription($object['description']);
-        $this->obj->setClassification($this->sensitivity_map[$object['sensitivity']]);
-        $this->obj->setCategories(self::array2vector($object['categories']));
-
-        $this->set_attachments($object);
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     *
-     */
-    public function is_valid()
-    {
-        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
-    }
-
-    /**
-     * Convert the Configuration object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Config object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data))
-            return $this->data;
-
-        // read common object props into local data object
-        $object = parent::to_array($data);
-
-        $sensitivity_map = array_flip($this->sensitivity_map);
-
-        // read object properties
-        $object += array(
-            'sensitivity' => $sensitivity_map[$this->obj->classification()],
-            'categories'  => self::vector2array($this->obj->categories()),
-            'title'       => $this->obj->summary(),
-            'description' => $this->obj->description(),
-        );
-
-        $this->get_attachments($object);
-
-        return $this->data = $object;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        $tags = array();
-
-        foreach ((array)$this->data['categories'] as $cat) {
-            $tags[] = rcube_utils::normalize_string($cat);
-        }
-
-        // add tag for message references
-        foreach ((array)$this->data['links'] as $link) {
-            $url = parse_url($link);
-            if ($url['scheme'] == 'imap') {
-                parse_str($url['query'], $param);
-                $tags[] = 'ref:' . trim($param['message-id'] ?: urldecode($url['fragment']), '<> ');
-            }
-        }
-
-        return $tags;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get words to index for fulltext search
-     *
-     * @return array List of words to save in cache
-     */
-    public function get_words()
-    {
-        $data = '';
-        foreach (self::$fulltext_cols as $col) {
-            // convert HTML content to plain text
-            if ($col == 'description' && preg_match('/<(html|body)(\s[a-z]|>)/', $this->data[$col], $m) && strpos($this->data[$col], '</'.$m[1].'>')) {
-                $converter = new rcube_html2text($this->data[$col], false, false, 0);
-                $val = $converter->get_text();
-            }
-            else {
-                $val = is_array($this->data[$col]) ? join(' ', $this->data[$col]) : $this->data[$col];
-            }
-
-            if (strlen($val))
-                $data .= $val . ' ';
-        }
-
-        return array_filter(array_unique(rcube_utils::normalize_string($data, true)));
-    }
-
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_task.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_task.php
deleted file mode 100644
index cb35f98..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_task.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/**
- * Kolab Task (ToDo) model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_format_task extends kolab_format_xcal
-{
-    public $CTYPEv2 = 'application/x-vnd.kolab.task';
-
-    public static $scheduling_properties = array('start', 'due', 'summary', 'status');
-
-    protected $objclass = 'Todo';
-    protected $read_func = 'readTodo';
-    protected $write_func = 'writeTodo';
-
-    /**
-     * Default constructor
-     */
-    function __construct($data = null, $version = 3.0)
-    {
-        parent::__construct(is_string($data) ? $data : null, $version);
-
-        // copy static property overriden by this class
-        $this->_scheduling_properties = self::$scheduling_properties;
-    }
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common xcal properties
-        parent::set($object);
-
-        $this->obj->setPercentComplete(intval($object['complete']));
-
-        $status = kolabformat::StatusUndefined;
-        if ($object['complete'] == 100 && !array_key_exists('status', $object))
-            $status = kolabformat::StatusCompleted;
-        else if ($object['status'] && array_key_exists($object['status'], $this->status_map))
-            $status = $this->status_map[$object['status']];
-        $this->obj->setStatus($status);
-
-        $this->obj->setStart(self::get_datetime($object['start'], null, $object['start']->_dateonly));
-        $this->obj->setDue(self::get_datetime($object['due'], null, $object['due']->_dateonly));
-
-        $related = new vectors;
-        if (!empty($object['parent_id']))
-            $related->push($object['parent_id']);
-        $this->obj->setRelatedTo($related);
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     *
-     */
-    public function is_valid()
-    {
-        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
-    }
-
-    /**
-     * Convert the Configuration object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Config object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data))
-            return $this->data;
-
-        // read common xcal props
-        $object = parent::to_array($data);
-
-        $object['complete'] = intval($this->obj->percentComplete());
-
-        // if due date is set
-        if ($due = $this->obj->due())
-            $object['due'] = self::php_datetime($due);
-
-        // related-to points to parent task; we only support one relation
-        $related = self::vector2array($this->obj->relatedTo());
-        if (count($related))
-            $object['parent_id'] = $related[0];
-
-        // TODO: map more properties
-
-        $this->data = $object;
-        return $this->data;
-    }
-
-    /**
-     * Return the reference date for recurrence and alarms
-     *
-     * @return mixed DateTime instance of null if no refdate is available
-     */
-    public function get_reference_date()
-    {
-        if ($this->data['due'] && $this->data['due'] instanceof DateTime) {
-            return $this->data['due'];
-        }
-
-        return self::php_datetime($this->obj->due()) ?: parent::get_reference_date();
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags($obj = null)
-    {
-        $tags = parent::get_tags($obj);
-        $object = $obj ?: $this->data;
-
-        if ($object['status'] == 'COMPLETED' || ($object['complete'] == 100 && empty($object['status'])))
-            $tags[] = 'x-complete';
-
-        if ($object['priority'] == 1)
-            $tags[] = 'x-flagged';
-
-        if ($object['parent_id'])
-            $tags[] = 'x-parent:' . $object['parent_id'];
-
-        return array_unique($tags);
-    }
-
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_xcal.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_xcal.php
deleted file mode 100644
index a9dd70c..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_format_xcal.php
+++ /dev/null
@@ -1,714 +0,0 @@
-<?php
-
-/**
- * Xcal based Kolab format class wrapping libkolabxml bindings
- *
- * Base class for xcal-based Kolab groupware objects such as event, todo, journal
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-abstract class kolab_format_xcal extends kolab_format
-{
-    public $CTYPE = 'application/calendar+xml';
-
-    public static $fulltext_cols = array('title', 'description', 'location', 'attendees:name', 'attendees:email', 'categories');
-
-    public static $scheduling_properties = array('start', 'end', 'location');
-
-    protected $_scheduling_properties = null;
-
-    protected $sensitivity_map = array(
-        'public'       => kolabformat::ClassPublic,
-        'private'      => kolabformat::ClassPrivate,
-        'confidential' => kolabformat::ClassConfidential,
-    );
-
-    protected $role_map = array(
-        'REQ-PARTICIPANT' => kolabformat::Required,
-        'OPT-PARTICIPANT' => kolabformat::Optional,
-        'NON-PARTICIPANT' => kolabformat::NonParticipant,
-        'CHAIR' => kolabformat::Chair,
-    );
-
-    protected $cutype_map = array(
-        'INDIVIDUAL' => kolabformat::CutypeIndividual,
-        'GROUP'      => kolabformat::CutypeGroup,
-        'ROOM'       => kolabformat::CutypeRoom,
-        'RESOURCE'   => kolabformat::CutypeResource,
-        'UNKNOWN'    => kolabformat::CutypeUnknown,
-    );
-
-    protected $rrule_type_map = array(
-        'MINUTELY' => RecurrenceRule::Minutely,
-        'HOURLY' => RecurrenceRule::Hourly,
-        'DAILY' => RecurrenceRule::Daily,
-        'WEEKLY' => RecurrenceRule::Weekly,
-        'MONTHLY' => RecurrenceRule::Monthly,
-        'YEARLY' => RecurrenceRule::Yearly,
-    );
-
-    protected $weekday_map = array(
-        'MO' => kolabformat::Monday,
-        'TU' => kolabformat::Tuesday,
-        'WE' => kolabformat::Wednesday,
-        'TH' => kolabformat::Thursday,
-        'FR' => kolabformat::Friday,
-        'SA' => kolabformat::Saturday,
-        'SU' => kolabformat::Sunday,
-    );
-
-    protected $alarm_type_map = array(
-        'DISPLAY' => Alarm::DisplayAlarm,
-        'EMAIL' => Alarm::EMailAlarm,
-        'AUDIO' => Alarm::AudioAlarm,
-    );
-
-    protected $status_map = array(
-        'NEEDS-ACTION' => kolabformat::StatusNeedsAction,
-        'IN-PROCESS'   => kolabformat::StatusInProcess,
-        'COMPLETED'    => kolabformat::StatusCompleted,
-        'CANCELLED'    => kolabformat::StatusCancelled,
-        'TENTATIVE'    => kolabformat::StatusTentative,
-        'CONFIRMED'    => kolabformat::StatusConfirmed,
-        'DRAFT'        => kolabformat::StatusDraft,
-        'FINAL'        => kolabformat::StatusFinal,
-    );
-
-    protected $part_status_map = array(
-        'UNKNOWN' => kolabformat::PartNeedsAction,
-        'NEEDS-ACTION' => kolabformat::PartNeedsAction,
-        'TENTATIVE' => kolabformat::PartTentative,
-        'ACCEPTED' => kolabformat::PartAccepted,
-        'DECLINED' => kolabformat::PartDeclined,
-        'DELEGATED' => kolabformat::PartDelegated,
-      );
-
-
-    /**
-     * Convert common xcard properties into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // read common object props
-        $object = parent::to_array($data);
-
-        $status_map = array_flip($this->status_map);
-        $sensitivity_map = array_flip($this->sensitivity_map);
-
-        $object += array(
-            'sequence'    => intval($this->obj->sequence()),
-            'title'       => $this->obj->summary(),
-            'location'    => $this->obj->location(),
-            'description' => $this->obj->description(),
-            'url'         => $this->obj->url(),
-            'status'      => $status_map[$this->obj->status()],
-            'sensitivity' => $sensitivity_map[$this->obj->classification()],
-            'priority'    => $this->obj->priority(),
-            'categories'  => self::vector2array($this->obj->categories()),
-            'start'       => self::php_datetime($this->obj->start()),
-        );
-
-        if (method_exists($this->obj, 'comment')) {
-            $object['comment'] = $this->obj->comment();
-        }
-
-        // read organizer and attendees
-        if (($organizer = $this->obj->organizer()) && ($organizer->email() || $organizer->name())) {
-            $object['organizer'] = array(
-                'email' => $organizer->email(),
-                'name' => $organizer->name(),
-            );
-        }
-
-        $role_map = array_flip($this->role_map);
-        $cutype_map = array_flip($this->cutype_map);
-        $part_status_map = array_flip($this->part_status_map);
-        $attvec = $this->obj->attendees();
-        for ($i=0; $i < $attvec->size(); $i++) {
-            $attendee = $attvec->get($i);
-            $cr = $attendee->contact();
-            if ($cr->email() != $object['organizer']['email']) {
-                $delegators = $delegatees = array();
-                $vdelegators = $attendee->delegatedFrom();
-                for ($j=0; $j < $vdelegators->size(); $j++) {
-                    $delegators[] = $vdelegators->get($j)->email();
-                }
-                $vdelegatees = $attendee->delegatedTo();
-                for ($j=0; $j < $vdelegatees->size(); $j++) {
-                    $delegatees[] = $vdelegatees->get($j)->email();
-                }
-
-                $object['attendees'][] = array(
-                    'role' => $role_map[$attendee->role()],
-                    'cutype' => $cutype_map[$attendee->cutype()],
-                    'status' => $part_status_map[$attendee->partStat()],
-                    'rsvp' => $attendee->rsvp(),
-                    'email' => $cr->email(),
-                    'name' => $cr->name(),
-                    'delegated-from' => $delegators,
-                    'delegated-to' => $delegatees,
-                );
-            }
-        }
-
-        // read recurrence rule
-        if (($rr = $this->obj->recurrenceRule()) && $rr->isValid()) {
-            $rrule_type_map = array_flip($this->rrule_type_map);
-            $object['recurrence'] = array('FREQ' => $rrule_type_map[$rr->frequency()]);
-
-            if ($intvl = $rr->interval())
-                $object['recurrence']['INTERVAL'] = $intvl;
-
-            if (($count = $rr->count()) && $count > 0) {
-                $object['recurrence']['COUNT'] = $count;
-            }
-            else if ($until = self::php_datetime($rr->end())) {
-                $refdate = $this->get_reference_date();
-                if ($refdate && $refdate instanceof DateTime && !$refdate->_dateonly) {
-                    $until->setTime($refdate->format('G'), $refdate->format('i'), 0);
-                }
-                $object['recurrence']['UNTIL'] = $until;
-            }
-
-            if (($byday = $rr->byday()) && $byday->size()) {
-                $weekday_map = array_flip($this->weekday_map);
-                $weekdays = array();
-                for ($i=0; $i < $byday->size(); $i++) {
-                    $daypos = $byday->get($i);
-                    $prefix = $daypos->occurence();
-                    $weekdays[] = ($prefix ? $prefix : '') . $weekday_map[$daypos->weekday()];
-                }
-                $object['recurrence']['BYDAY'] = join(',', $weekdays);
-            }
-
-            if (($bymday = $rr->bymonthday()) && $bymday->size()) {
-                $object['recurrence']['BYMONTHDAY'] = join(',', self::vector2array($bymday));
-            }
-
-            if (($bymonth = $rr->bymonth()) && $bymonth->size()) {
-                $object['recurrence']['BYMONTH'] = join(',', self::vector2array($bymonth));
-            }
-
-            if ($exdates = $this->obj->exceptionDates()) {
-                for ($i=0; $i < $exdates->size(); $i++) {
-                    if ($exdate = self::php_datetime($exdates->get($i)))
-                        $object['recurrence']['EXDATE'][] = $exdate;
-                }
-            }
-        }
-
-        if ($rdates = $this->obj->recurrenceDates()) {
-            for ($i=0; $i < $rdates->size(); $i++) {
-                if ($rdate = self::php_datetime($rdates->get($i)))
-                    $object['recurrence']['RDATE'][] = $rdate;
-            }
-        }
-
-        // read alarm
-        $valarms = $this->obj->alarms();
-        $alarm_types = array_flip($this->alarm_type_map);
-        $object['valarms'] = array();
-        for ($i=0; $i < $valarms->size(); $i++) {
-            $alarm = $valarms->get($i);
-            $type  = $alarm_types[$alarm->type()];
-
-            if ($type == 'DISPLAY' || $type == 'EMAIL' || $type == 'AUDIO') {  // only some alarms are supported
-                $valarm = array(
-                    'action'      => $type,
-                    'summary'     => $alarm->summary(),
-                    'description' => $alarm->description(),
-                );
-
-                if ($type == 'EMAIL') {
-                    $valarm['attendees'] = array();
-                    $attvec = $alarm->attendees();
-                    for ($j=0; $j < $attvec->size(); $j++) {
-                        $cr = $attvec->get($j);
-                        $valarm['attendees'][] = $cr->email();
-                    }
-                }
-                else if ($type == 'AUDIO') {
-                    $attach = $alarm->audioFile();
-                    $valarm['uri'] = $attach->uri();
-                }
-
-                if ($start = self::php_datetime($alarm->start())) {
-                    $object['alarms']  = '@' . $start->format('U');
-                    $valarm['trigger'] = $start;
-                }
-                else if ($offset = $alarm->relativeStart()) {
-                    $prefix = $offset->isNegative() ? '-' : '+';
-                    $value  = '';
-                    $time   = '';
-
-                    if      ($w = $offset->weeks())     $value .= $w . 'W';
-                    else if ($d = $offset->days())      $value .= $d . 'D';
-                    else if ($h = $offset->hours())     $time  .= $h . 'H';
-                    else if ($m = $offset->minutes())   $time  .= $m . 'M';
-                    else if ($s = $offset->seconds())   $time  .= $s . 'S';
-
-                    // assume 'at event time'
-                    if (empty($value) && empty($time)) {
-                        $prefix = '';
-                        $time   = '0S';
-                    }
-
-                    $object['alarms']  = $prefix . $value . $time;
-                    $valarm['trigger'] = $prefix . 'P' . $value . ($time ? 'T' . $time : '');
-
-                    if ($alarm->relativeTo() == kolabformat::End) {
-                        $valarm['related'] == 'END';
-                    }
-                }
-
-                // read alarm duration and repeat properties
-                if (($duration = $alarm->duration()) && $duration->isValid()) {
-                    $value = $time = '';
-
-                    if      ($w = $duration->weeks())     $value .= $w . 'W';
-                    else if ($d = $duration->days())      $value .= $d . 'D';
-                    else if ($h = $duration->hours())     $time  .= $h . 'H';
-                    else if ($m = $duration->minutes())   $time  .= $m . 'M';
-                    else if ($s = $duration->seconds())   $time  .= $s . 'S';
-
-                    $valarm['duration'] = 'P' . $value . ($time ? 'T' . $time : '');
-                    $valarm['repeat']   = $alarm->numrepeat();
-                }
-
-                $object['alarms']  .= ':' . $type;  // legacy property
-                $object['valarms'][] = array_filter($valarm);
-            }
-        }
-
-        $this->get_attachments($object);
-
-        return $object;
-    }
-
-
-    /**
-     * Set common xcal properties to the kolabformat object
-     *
-     * @param array  Event data as hash array
-     */
-    public function set(&$object)
-    {
-        $this->init();
-
-        $is_new = !$this->obj->uid();
-        $old_sequence = $this->obj->sequence();
-        $reschedule = $is_new;
-
-        // set common object properties
-        parent::set($object);
-
-        // set sequence value
-        if (!isset($object['sequence'])) {
-            if ($is_new) {
-                $object['sequence'] = 0;
-            }
-            else {
-                $object['sequence'] = $old_sequence;
-
-                // increment sequence when updating properties relevant for scheduling.
-                // RFC 5545: "It is incremented [...] each time the Organizer makes a significant revision to the calendar component."
-                if ($this->check_rescheduling($object)) {
-                    $object['sequence']++;
-                }
-            }
-        }
-        $this->obj->setSequence(intval($object['sequence']));
-
-        if ($object['sequence'] > $old_sequence) {
-            $reschedule = true;
-        }
-
-        $this->obj->setSummary($object['title']);
-        $this->obj->setLocation($object['location']);
-        $this->obj->setDescription($object['description']);
-        $this->obj->setPriority($object['priority']);
-        $this->obj->setClassification($this->sensitivity_map[$object['sensitivity']]);
-        $this->obj->setCategories(self::array2vector($object['categories']));
-        $this->obj->setUrl(strval($object['url']));
-
-        if (method_exists($this->obj, 'setComment')) {
-            $this->obj->setComment($object['comment']);
-        }
-
-        // process event attendees
-        $attendees = new vectorattendee;
-        foreach ((array)$object['attendees'] as $i => $attendee) {
-            if ($attendee['role'] == 'ORGANIZER') {
-                $object['organizer'] = $attendee;
-            }
-            else if ($attendee['email'] != $object['organizer']['email']) {
-                $cr = new ContactReference(ContactReference::EmailReference, $attendee['email']);
-                $cr->setName($attendee['name']);
-
-                // set attendee RSVP if missing
-                if (!isset($attendee['rsvp'])) {
-                    $object['attendees'][$i]['rsvp'] = $attendee['rsvp'] = $reschedule;
-                }
-
-                $att = new Attendee;
-                $att->setContact($cr);
-                $att->setPartStat($this->part_status_map[$attendee['status']]);
-                $att->setRole($this->role_map[$attendee['role']] ? $this->role_map[$attendee['role']] : kolabformat::Required);
-                $att->setCutype($this->cutype_map[$attendee['cutype']] ? $this->cutype_map[$attendee['cutype']] : kolabformat::CutypeIndividual);
-                $att->setRSVP((bool)$attendee['rsvp']);
-
-                if (!empty($attendee['delegated-from'])) {
-                    $vdelegators = new vectorcontactref;
-                    foreach ((array)$attendee['delegated-from'] as $delegator) {
-                        $vdelegators->push(new ContactReference(ContactReference::EmailReference, $delegator));
-                    }
-                    $att->setDelegatedFrom($vdelegators);
-                }
-                if (!empty($attendee['delegated-to'])) {
-                    $vdelegatees = new vectorcontactref;
-                    foreach ((array)$attendee['delegated-to'] as $delegatee) {
-                        $vdelegatees->push(new ContactReference(ContactReference::EmailReference, $delegatee));
-                    }
-                    $att->setDelegatedTo($vdelegatees);
-                }
-
-                if ($att->isValid()) {
-                    $attendees->push($att);
-                }
-                else {
-                    rcube::raise_error(array(
-                        'code' => 600, 'type' => 'php',
-                        'file' => __FILE__, 'line' => __LINE__,
-                        'message' => "Invalid event attendee: " . json_encode($attendee),
-                    ), true);
-                }
-            }
-        }
-        $this->obj->setAttendees($attendees);
-
-        if ($object['organizer']) {
-            $organizer = new ContactReference(ContactReference::EmailReference, $object['organizer']['email']);
-            $organizer->setName($object['organizer']['name']);
-            $this->obj->setOrganizer($organizer);
-        }
-
-        // save recurrence rule
-        $rr = new RecurrenceRule;
-        $rr->setFrequency(RecurrenceRule::FreqNone);
-
-        if ($object['recurrence'] && !empty($object['recurrence']['FREQ'])) {
-            $rr->setFrequency($this->rrule_type_map[$object['recurrence']['FREQ']]);
-
-            if ($object['recurrence']['INTERVAL'])
-                $rr->setInterval(intval($object['recurrence']['INTERVAL']));
-
-            if ($object['recurrence']['BYDAY']) {
-                $byday = new vectordaypos;
-                foreach (explode(',', $object['recurrence']['BYDAY']) as $day) {
-                    $occurrence = 0;
-                    if (preg_match('/^([\d-]+)([A-Z]+)$/', $day, $m)) {
-                        $occurrence = intval($m[1]);
-                        $day = $m[2];
-                    }
-                    if (isset($this->weekday_map[$day]))
-                        $byday->push(new DayPos($occurrence, $this->weekday_map[$day]));
-                }
-                $rr->setByday($byday);
-            }
-
-            if ($object['recurrence']['BYMONTHDAY']) {
-                $bymday = new vectori;
-                foreach (explode(',', $object['recurrence']['BYMONTHDAY']) as $day)
-                    $bymday->push(intval($day));
-                $rr->setBymonthday($bymday);
-            }
-
-            if ($object['recurrence']['BYMONTH']) {
-                $bymonth = new vectori;
-                foreach (explode(',', $object['recurrence']['BYMONTH']) as $month)
-                    $bymonth->push(intval($month));
-                $rr->setBymonth($bymonth);
-            }
-
-            if ($object['recurrence']['COUNT'])
-                $rr->setCount(intval($object['recurrence']['COUNT']));
-            else if ($object['recurrence']['UNTIL'])
-                $rr->setEnd(self::get_datetime($object['recurrence']['UNTIL'], null, true));
-
-            if ($rr->isValid()) {
-                // add exception dates (only if recurrence rule is valid)
-                $exdates = new vectordatetime;
-                foreach ((array)$object['recurrence']['EXDATE'] as $exdate)
-                    $exdates->push(self::get_datetime($exdate, null, true));
-                $this->obj->setExceptionDates($exdates);
-            }
-            else {
-                rcube::raise_error(array(
-                    'code' => 600, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Invalid event recurrence rule: " . json_encode($object['recurrence']),
-                ), true);
-            }
-        }
-
-        $this->obj->setRecurrenceRule($rr);
-
-        // save recurrence dates (aka RDATE)
-        if (!empty($object['recurrence']['RDATE'])) {
-            $rdates = new vectordatetime;
-            foreach ((array)$object['recurrence']['RDATE'] as $rdate)
-                $rdates->push(self::get_datetime($rdate, null, true));
-            $this->obj->setRecurrenceDates($rdates);
-        }
-
-        // save alarm
-        $valarms = new vectoralarm;
-        if ($object['valarms']) {
-            foreach ($object['valarms'] as $valarm) {
-                if (!array_key_exists($valarm['action'], $this->alarm_type_map)) {
-                    continue;  // skip unknown alarm types
-                }
-
-                if ($valarm['action'] == 'EMAIL') {
-                    $recipients = new vectorcontactref;
-                    foreach (($valarm['attendees'] ?: array($object['_owner'])) as $email) {
-                        $recipients->push(new ContactReference(ContactReference::EmailReference, $email));
-                    }
-                    $alarm = new Alarm(
-                        strval($valarm['summary'] ?: $object['title']),
-                        strval($valarm['description'] ?: $object['description']),
-                        $recipients
-                    );
-                }
-                else if ($valarm['action'] == 'AUDIO') {
-                    $attach = new Attachment;
-                    $attach->setUri($valarm['uri'] ?: 'null', 'unknown');
-                    $alarm = new Alarm($attach);
-                }
-                else {
-                    // action == DISPLAY
-                    $alarm = new Alarm(strval($valarm['summary'] ?: $object['title']));
-                }
-
-                if (is_object($valarm['trigger']) && $valarm['trigger'] instanceof DateTime) {
-                    $alarm->setStart(self::get_datetime($valarm['trigger'], new DateTimeZone('UTC')));
-                }
-                else {
-                    try {
-                        $period   = new DateInterval(preg_replace('/[^0-9PTWDHMS]/', '', $valarm['trigger']));
-                        $duration = new Duration($period->d, $period->h, $period->i, $period->s, $valarm['trigger'][0] == '-');
-                    }
-                    catch (Exception $e) {
-                        // skip alarm with invalid trigger values
-                        rcube::raise_error($e, true);
-                        continue;
-                    }
-
-                    $related = strtoupper($valarm['related']) == 'END' ? kolabformat::End : kolabformat::Start;
-                    $alarm->setRelativeStart($duration, $related);
-                }
-
-                if ($valarm['duration']) {
-                    try {
-                        $d = new DateInterval($valarm['duration']);
-                        $duration = new Duration($d->d, $d->h, $d->i, $d->s);
-                        $alarm->setDuration($duration, intval($valarm['repeat']));
-                    }
-                    catch (Exception $e) {
-                        // ignore
-                    }
-                }
-
-                $valarms->push($alarm);
-            }
-        }
-        // legacy support
-        else if ($object['alarms']) {
-            list($offset, $type) = explode(":", $object['alarms']);
-
-            if ($type == 'EMAIL' && !empty($object['_owner'])) {  // email alarms implicitly go to event owner
-                $recipients = new vectorcontactref;
-                $recipients->push(new ContactReference(ContactReference::EmailReference, $object['_owner']));
-                $alarm = new Alarm($object['title'], strval($object['description']), $recipients);
-            }
-            else {  // default: display alarm
-                $alarm = new Alarm($object['title']);
-            }
-
-            if (preg_match('/^@(\d+)/', $offset, $d)) {
-                $alarm->setStart(self::get_datetime($d[1], new DateTimeZone('UTC')));
-            }
-            else if (preg_match('/^([-+]?)P?T?(\d+)([SMHDW])/', $offset, $d)) {
-                $days = $hours = $minutes = $seconds = 0;
-                switch ($d[3]) {
-                    case 'W': $days  = 7*intval($d[2]); break;
-                    case 'D': $days    = intval($d[2]); break;
-                    case 'H': $hours   = intval($d[2]); break;
-                    case 'M': $minutes = intval($d[2]); break;
-                    case 'S': $seconds = intval($d[2]); break;
-                }
-                $alarm->setRelativeStart(new Duration($days, $hours, $minutes, $seconds, $d[1] == '-'), $d[1] == '-' ? kolabformat::Start : kolabformat::End);
-            }
-
-            $valarms->push($alarm);
-        }
-        $this->obj->setAlarms($valarms);
-
-        $this->set_attachments($object);
-    }
-
-    /**
-     * Return the reference date for recurrence and alarms
-     *
-     * @return mixed DateTime instance of null if no refdate is available
-     */
-    public function get_reference_date()
-    {
-        if ($this->data['start'] && $this->data['start'] instanceof DateTime) {
-            return $this->data['start'];
-        }
-
-        return self::php_datetime($this->obj->start());
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get words to index for fulltext search
-     *
-     * @return array List of words to save in cache
-     */
-    public function get_words($obj = null)
-    {
-        $data = '';
-        $object = $obj ?: $this->data;
-
-        foreach (self::$fulltext_cols as $colname) {
-            list($col, $field) = explode(':', $colname);
-
-            if ($field) {
-                $a = array();
-                foreach ((array)$object[$col] as $attr)
-                    $a[] = $attr[$field];
-                $val = join(' ', $a);
-            }
-            else {
-                $val = is_array($object[$col]) ? join(' ', $object[$col]) : $object[$col];
-            }
-
-            if (strlen($val))
-                $data .= $val . ' ';
-        }
-
-        $words = rcube_utils::normalize_string($data, true);
-
-        // collect words from recurrence exceptions
-        if (is_array($object['exceptions'])) {
-            foreach ($object['exceptions'] as $exception) {
-                $words = array_merge($words, $this->get_words($exception));
-            }
-        }
-
-        return array_unique($words);
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags($obj = null)
-    {
-        $tags = array();
-        $object = $obj ?: $this->data;
-
-        if (!empty($object['valarms'])) {
-            $tags[] = 'x-has-alarms';
-        }
-
-        // create tags reflecting participant status
-        if (is_array($object['attendees'])) {
-            foreach ($object['attendees'] as $attendee) {
-                if (!empty($attendee['email']) && !empty($attendee['status']))
-                    $tags[] = 'x-partstat:' . $attendee['email'] . ':' . strtolower($attendee['status']);
-            }
-        }
-
-        // collect tags from recurrence exceptions
-        if (is_array($object['exceptions'])) {
-            foreach ($object['exceptions'] as $exception) {
-                $tags = array_merge($tags, $this->get_tags($exception));
-            }
-        }
-
-        if (!empty($object['status'])) {
-          $tags[] = 'x-status:' . strtolower($object['status']);
-        }
-
-        return array_unique($tags);
-    }
-
-    /**
-     * Identify changes considered relevant for scheduling
-     * 
-     * @param array Hash array with NEW object properties
-     * @param array Hash array with OLD object properties
-     *
-     * @return boolean True if changes affect scheduling, False otherwise
-     */
-    public function check_rescheduling($object, $old = null)
-    {
-        $reschedule = false;
-
-        if (!is_array($old)) {
-            $old = $this->data['uid'] ? $this->data : $this->to_array();
-        }
-
-        foreach ($this->_scheduling_properties ?: self::$scheduling_properties as $prop) {
-            $a = $old[$prop];
-            $b = $object[$prop];
-            if ($object['allday'] && ($prop == 'start' || $prop == 'end') && $a instanceof DateTime && $b instanceof DateTime) {
-                $a = $a->format('Y-m-d');
-                $b = $b->format('Y-m-d');
-            }
-            if ($prop == 'recurrence' && is_array($a) && is_array($b)) {
-                unset($a['EXCEPTIONS'], $b['EXCEPTIONS']);
-                $a = array_filter($a);
-                $b = array_filter($b);
-
-                // advanced rrule comparison: no rescheduling if series was shortened
-                if ($a['COUNT'] && $b['COUNT'] && $b['COUNT'] < $a['COUNT']) {
-                  unset($a['COUNT'], $b['COUNT']);
-                }
-                else if ($a['UNTIL'] && $b['UNTIL'] && $b['UNTIL'] < $a['UNTIL']) {
-                  unset($a['UNTIL'], $b['UNTIL']);
-                }
-            }
-            if ($a != $b) {
-                $reschedule = true;
-                break;
-            }
-        }
-
-        return $reschedule;
-    }
-}
\ No newline at end of file
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage.php
deleted file mode 100644
index 9bafbe9..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage.php
+++ /dev/null
@@ -1,1603 +0,0 @@
-<?php
-
-/**
- * Kolab storage class providing static methods to access groupware objects on a Kolab server.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage
-{
-    const CTYPE_KEY = '/shared/vendor/kolab/folder-type';
-    const CTYPE_KEY_PRIVATE = '/private/vendor/kolab/folder-type';
-    const COLOR_KEY_SHARED  = '/shared/vendor/kolab/color';
-    const COLOR_KEY_PRIVATE = '/private/vendor/kolab/color';
-    const NAME_KEY_SHARED   = '/shared/vendor/kolab/displayname';
-    const NAME_KEY_PRIVATE  = '/private/vendor/kolab/displayname';
-    const UID_KEY_SHARED    = '/shared/vendor/kolab/uniqueid';
-    const UID_KEY_CYRUS     = '/shared/vendor/cmu/cyrus-imapd/uniqueid';
-
-    const ERROR_IMAP_CONN      = 1;
-    const ERROR_CACHE_DB       = 2;
-    const ERROR_NO_PERMISSION  = 3;
-    const ERROR_INVALID_FOLDER = 4;
-
-    public static $version = '3.0';
-    public static $last_error;
-    public static $encode_ids = false;
-
-    private static $ready = false;
-    private static $with_tempsubs = true;
-    private static $subscriptions;
-    private static $typedata = array();
-    private static $states;
-    private static $config;
-    private static $imap;
-    private static $ldap;
-
-    // Default folder names
-    private static $default_folders = array(
-        'event'         => 'Calendar',
-        'contact'       => 'Contacts',
-        'task'          => 'Tasks',
-        'note'          => 'Notes',
-        'file'          => 'Files',
-        'configuration' => 'Configuration',
-        'journal'       => 'Journal',
-        'mail.inbox'       => 'INBOX',
-        'mail.drafts'      => 'Drafts',
-        'mail.sentitems'   => 'Sent',
-        'mail.wastebasket' => 'Trash',
-        'mail.outbox'      => 'Outbox',
-        'mail.junkemail'   => 'Junk',
-    );
-
-
-    /**
-     * Setup the environment needed by the libs
-     */
-    public static function setup()
-    {
-        if (self::$ready)
-            return true;
-
-        $rcmail = rcube::get_instance();
-        self::$config = $rcmail->config;
-        self::$version = strval($rcmail->config->get('kolab_format_version', self::$version));
-        self::$imap = $rcmail->get_storage();
-        self::$ready = class_exists('kolabformat') &&
-            (self::$imap->get_capability('METADATA') || self::$imap->get_capability('ANNOTATEMORE') || self::$imap->get_capability('ANNOTATEMORE2'));
-
-        if (self::$ready) {
-            // set imap options
-            self::$imap->set_options(array(
-                'skip_deleted' => true,
-                'threading' => false,
-            ));
-        }
-        else if (!class_exists('kolabformat')) {
-            rcube::raise_error(array(
-                'code' => 900, 'type' => 'php',
-                'message' => "required kolabformat module not found"
-            ), true);
-        }
-        else {
-            rcube::raise_error(array(
-                'code' => 900, 'type' => 'php',
-                'message' => "IMAP server doesn't support METADATA or ANNOTATEMORE"
-            ), true);
-        }
-
-        // adjust some configurable settings
-        if ($event_scheduling_prop = $rcmail->config->get('kolab_event_scheduling_properties', null)) {
-            kolab_format_event::$scheduling_properties = (array)$event_scheduling_prop;
-        }
-        // adjust some configurable settings
-        if ($task_scheduling_prop = $rcmail->config->get('kolab_task_scheduling_properties', null)) {
-            kolab_format_task::$scheduling_properties = (array)$task_scheduling_prop;
-        }
-
-        return self::$ready;
-    }
-
-    /**
-     * Initializes LDAP object to resolve Kolab users
-     */
-    public static function ldap()
-    {
-        if (self::$ldap) {
-            return self::$ldap;
-        }
-
-        self::setup();
-
-        $config = self::$config->get('kolab_users_directory', self::$config->get('kolab_auth_addressbook'));
-
-        if (!is_array($config)) {
-            $ldap_config = (array)self::$config->get('ldap_public');
-            $config = $ldap_config[$config];
-        }
-
-        if (empty($config)) {
-            return null;
-        }
-
-        // overwrite filter option
-        if ($filter = self::$config->get('kolab_users_filter')) {
-            self::$config->set('kolab_auth_filter', $filter);
-        }
-
-        // re-use the LDAP wrapper class from kolab_auth plugin
-        require_once rtrim(RCUBE_PLUGINS_DIR, '/') . '/kolab_auth/kolab_auth_ldap.php';
-
-        self::$ldap = new kolab_auth_ldap($config);
-
-        return self::$ldap;
-    }
-
-    /**
-     * Get a list of storage folders for the given data type
-     *
-     * @param string Data type to list folders for (contact,distribution-list,event,task,note)
-     * @param boolean Enable to return subscribed folders only (null to use configured subscription mode)
-     *
-     * @return array List of Kolab_Folder objects (folder names in UTF7-IMAP)
-     */
-    public static function get_folders($type, $subscribed = null)
-    {
-        $folders = $folderdata = array();
-
-        if (self::setup()) {
-            foreach ((array)self::list_folders('', '*', $type, $subscribed, $folderdata) as $foldername) {
-                $folders[$foldername] = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-            }
-        }
-
-        return $folders;
-    }
-
-    /**
-     * Getter for the storage folder for the given type
-     *
-     * @param string Data type to list folders for (contact,distribution-list,event,task,note)
-     * @return object kolab_storage_folder  The folder object
-     */
-    public static function get_default_folder($type)
-    {
-        if (self::setup()) {
-            foreach ((array)self::list_folders('', '*', $type . '.default', false, $folderdata) as $foldername) {
-                return new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Getter for a specific storage folder
-     *
-     * @param string IMAP folder to access (UTF7-IMAP)
-     * @param string Expected folder type
-     *
-     * @return object kolab_storage_folder  The folder object
-     */
-    public static function get_folder($folder, $type = null)
-    {
-        return self::setup() ? new kolab_storage_folder($folder, $type) : null;
-    }
-
-    /**
-     * Getter for a single Kolab object, identified by its UID.
-     * This will search all folders storing objects of the given type.
-     *
-     * @param string Object UID
-     * @param string Object type (contact,event,task,journal,file,note,configuration)
-     * @return array The Kolab object represented as hash array or false if not found
-     */
-    public static function get_object($uid, $type)
-    {
-        self::setup();
-        $folder = null;
-        foreach ((array)self::list_folders('', '*', $type, null, $folderdata) as $foldername) {
-            if (!$folder)
-                $folder = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-            else
-                $folder->set_folder($foldername, $type, $folderdata[$foldername]);
-
-            if ($object = $folder->get_object($uid, '*'))
-                return $object;
-        }
-
-        return false;
-    }
-
-    /**
-     * Execute cross-folder searches with the given query.
-     *
-     * @param array  Pseudo-SQL query as list of filter parameter triplets
-     * @param string Object type (contact,event,task,journal,file,note,configuration)
-     * @return array List of Kolab data objects (each represented as hash array)
-     * @see kolab_storage_format::select()
-     */
-    public static function select($query, $type)
-    {
-        self::setup();
-        $folder = null;
-        $result = array();
-
-        foreach ((array)self::list_folders('', '*', $type, null, $folderdata) as $foldername) {
-            if (!$folder)
-                $folder = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-            else
-                $folder->set_folder($foldername, $type, $folderdata[$foldername]);
-
-            foreach ($folder->select($query, '*') as $object) {
-                $result[] = $object;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns Free-busy server URL
-     */
-    public static function get_freebusy_server()
-    {
-        self::setup();
-
-        $url = 'https://' . $_SESSION['imap_host'] . '/freebusy';
-        $url = self::$config->get('kolab_freebusy_server', $url);
-        $url = rcube_utils::resolve_url($url);
-
-        return unslashify($url);
-    }
-
-    /**
-     * Compose an URL to query the free/busy status for the given user
-     *
-     * @param string Email address of the user to get free/busy data for
-     * @param object DateTime Start of the query range (optional)
-     * @param object DateTime End of the query range (optional)
-     *
-     * @return string Fully qualified URL to query free/busy data
-     */
-    public static function get_freebusy_url($email, $start = null, $end = null)
-    {
-        $query = '';
-        $param = array();
-        $utc = new \DateTimeZone('UTC');
-
-        if ($start instanceof \DateTime) {
-            $start->setTimezone($utc);
-            $param['dtstart'] = $start->format('Ymd\THis\Z');
-        }
-        if ($end instanceof \DateTime) {
-            $end->setTimezone($utc);
-            $param['dtend'] = $end->format('Ymd\THis\Z');
-        }
-        if (!empty($param)) {
-            $query = '?' . http_build_query($param);
-        }
-
-        return self::get_freebusy_server() . '/' . $email . '.ifb' . $query;
-    }
-
-    /**
-     * Creates folder ID from folder name
-     *
-     * @param string  $folder Folder name (UTF7-IMAP)
-     * @param boolean $enc    Use lossless encoding
-     * @return string Folder ID string
-     */
-    public static function folder_id($folder, $enc = null)
-    {
-        return $enc == true || ($enc === null && self::$encode_ids) ?
-            self::id_encode($folder) :
-            asciiwords(strtr($folder, '/.-', '___'));
-    }
-
-    /**
-     * Encode the given ID to a safe ascii representation
-     *
-     * @param string $id Arbitrary identifier string
-     *
-     * @return string Ascii representation
-     */
-    public static function id_encode($id)
-    {
-        return rtrim(strtr(base64_encode($id), '+/', '-_'), '=');
-    }
-
-    /**
-     * Convert the given identifier back to it's raw value
-     *
-     * @param string $id Ascii identifier
-     * @return string Raw identifier string
-     */
-    public static function id_decode($id)
-    {
-      return base64_decode(str_pad(strtr($id, '-_', '+/'), strlen($id) % 4, '=', STR_PAD_RIGHT));
-    }
-
-    /**
-     * Return the (first) path of the requested IMAP namespace
-     *
-     * @param string  Namespace name (personal, shared, other)
-     * @return string IMAP root path for that namespace
-     */
-    public static function namespace_root($name)
-    {
-        foreach ((array)self::$imap->get_namespace($name) as $paths) {
-            if (strlen($paths[0]) > 1) {
-                return $paths[0];
-            }
-        }
-
-        return '';
-    }
-
-
-    /**
-     * Deletes IMAP folder
-     *
-     * @param string $name Folder name (UTF7-IMAP)
-     *
-     * @return bool True on success, false on failure
-     */
-    public static function folder_delete($name)
-    {
-        // clear cached entries first
-        if ($folder = self::get_folder($name))
-            $folder->cache->purge();
-
-        $rcmail = rcube::get_instance();
-        $plugin = $rcmail->plugins->exec_hook('folder_delete', array('name' => $name));
-
-        $success = self::$imap->delete_folder($name);
-        self::$last_error = self::$imap->get_error_str();
-
-        return $success;
-    }
-
-    /**
-     * Creates IMAP folder
-     *
-     * @param string $name       Folder name (UTF7-IMAP)
-     * @param string $type       Folder type
-     * @param bool   $subscribed Sets folder subscription
-     * @param bool   $active     Sets folder state (client-side subscription)
-     *
-     * @return bool True on success, false on failure
-     */
-    public static function folder_create($name, $type = null, $subscribed = false, $active = false)
-    {
-        self::setup();
-
-        $rcmail = rcube::get_instance();
-        $plugin = $rcmail->plugins->exec_hook('folder_create', array('record' => array(
-            'name' => $name,
-            'subscribe' => $subscribed,
-        )));
-
-        if ($saved = self::$imap->create_folder($name, $subscribed)) {
-            // set metadata for folder type
-            if ($type) {
-                $saved = self::set_folder_type($name, $type);
-
-                // revert if metadata could not be set
-                if (!$saved) {
-                    self::$imap->delete_folder($name);
-                }
-                // activate folder
-                else if ($active) {
-                    self::set_state($name, true);
-                }
-            }
-        }
-
-        if ($saved) {
-            return true;
-        }
-
-        self::$last_error = self::$imap->get_error_str();
-        return false;
-    }
-
-
-    /**
-     * Renames IMAP folder
-     *
-     * @param string $oldname Old folder name (UTF7-IMAP)
-     * @param string $newname New folder name (UTF7-IMAP)
-     *
-     * @return bool True on success, false on failure
-     */
-    public static function folder_rename($oldname, $newname)
-    {
-        self::setup();
-
-        $rcmail = rcube::get_instance();
-        $plugin = $rcmail->plugins->exec_hook('folder_rename', array(
-            'oldname' => $oldname, 'newname' => $newname));
-
-        $oldfolder = self::get_folder($oldname);
-        $active    = self::folder_is_active($oldname);
-        $success   = self::$imap->rename_folder($oldname, $newname);
-        self::$last_error = self::$imap->get_error_str();
-
-        // pass active state to new folder name
-        if ($success && $active) {
-            self::set_state($oldname, false);
-            self::set_state($newname, true);
-        }
-
-        // assign existing cache entries to new resource uri
-        if ($success && $oldfolder) {
-            $oldfolder->cache->rename($newname);
-        }
-
-        return $success;
-    }
-
-
-    /**
-     * Rename or Create a new IMAP folder.
-     *
-     * Does additional checks for permissions and folder name restrictions
-     *
-     * @param array Hash array with folder properties and metadata
-     *  - name:       Folder name
-     *  - oldname:    Old folder name when changed
-     *  - parent:     Parent folder to create the new one in
-     *  - type:       Folder type to create
-     *  - subscribed: Subscribed flag (IMAP subscription)
-     *  - active:     Activation flag (client-side subscription)
-     * @return mixed New folder name or False on failure
-     */
-    public static function folder_update(&$prop)
-    {
-        self::setup();
-
-        $folder    = rcube_charset::convert($prop['name'], RCUBE_CHARSET, 'UTF7-IMAP');
-        $oldfolder = $prop['oldname']; // UTF7
-        $parent    = $prop['parent']; // UTF7
-        $delimiter = self::$imap->get_hierarchy_delimiter();
-
-        if (strlen($oldfolder)) {
-            $options = self::$imap->folder_info($oldfolder);
-        }
-
-        if (!empty($options) && ($options['norename'] || $options['protected'])) {
-        }
-        // sanity checks (from steps/settings/save_folder.inc)
-        else if (!strlen($folder)) {
-            self::$last_error = 'cannotbeempty';
-            return false;
-        }
-        else if (strlen($folder) > 128) {
-            self::$last_error = 'nametoolong';
-            return false;
-        }
-        else {
-            // these characters are problematic e.g. when used in LIST/LSUB
-            foreach (array($delimiter, '%', '*') as $char) {
-                if (strpos($folder, $char) !== false) {
-                    self::$last_error = 'forbiddencharacter';
-                    return false;
-                }
-            }
-        }
-
-        if (!empty($options) && ($options['protected'] || $options['norename'])) {
-            $folder = $oldfolder;
-        }
-        else if (strlen($parent)) {
-            $folder = $parent . $delimiter . $folder;
-        }
-        else {
-            // add namespace prefix (when needed)
-            $folder = self::$imap->mod_folder($folder, 'in');
-        }
-
-        // Check access rights to the parent folder
-        if (strlen($parent) && (!strlen($oldfolder) || $oldfolder != $folder)) {
-            $parent_opts = self::$imap->folder_info($parent);
-            if ($parent_opts['namespace'] != 'personal'
-                && (empty($parent_opts['rights']) || !preg_match('/[ck]/', implode($parent_opts['rights'])))
-            ) {
-                self::$last_error = 'No permission to create folder';
-                return false;
-          }
-        }
-
-        // update the folder name
-        if (strlen($oldfolder)) {
-            if ($oldfolder != $folder) {
-                $result = self::folder_rename($oldfolder, $folder);
-          }
-          else
-              $result = true;
-        }
-        // create new folder
-        else {
-            $result = self::folder_create($folder, $prop['type'], $prop['subscribed'], $prop['active']);
-        }
-
-        if ($result) {
-            self::set_folder_props($folder, $prop);
-        }
-
-        return $result ? $folder : false;
-    }
-
-
-    /**
-     * Getter for human-readable name of Kolab object (folder)
-     * See http://wiki.kolab.org/UI-Concepts/Folder-Listing for reference
-     *
-     * @param string $folder    IMAP folder name (UTF7-IMAP)
-     * @param string $folder_ns Will be set to namespace name of the folder
-     *
-     * @return string Name of the folder-object
-     */
-    public static function object_name($folder, &$folder_ns=null)
-    {
-        self::setup();
-
-        // find custom display name in folder METADATA
-        if ($name = self::custom_displayname($folder)) {
-            return $name;
-        }
-
-        $found     = false;
-        $namespace = self::$imap->get_namespace();
-
-        if (!empty($namespace['shared'])) {
-            foreach ($namespace['shared'] as $ns) {
-                if (strlen($ns[0]) && strpos($folder, $ns[0]) === 0) {
-                    $prefix = '';
-                    $folder = substr($folder, strlen($ns[0]));
-                    $delim  = $ns[1];
-                    $found  = true;
-                    $folder_ns = 'shared';
-                    break;
-                }
-            }
-        }
-        if (!$found && !empty($namespace['other'])) {
-            foreach ($namespace['other'] as $ns) {
-                if (strlen($ns[0]) && strpos($folder, $ns[0]) === 0) {
-                    // remove namespace prefix
-                    $folder = substr($folder, strlen($ns[0]));
-                    $delim  = $ns[1];
-                    // get username
-                    $pos    = strpos($folder, $delim);
-                    if ($pos) {
-                        $prefix = '('.substr($folder, 0, $pos).')';
-                        $folder = substr($folder, $pos+1);
-                    }
-                    else {
-                        $prefix = '('.$folder.')';
-                        $folder = '';
-                    }
-
-                    $found  = true;
-                    $folder_ns = 'other';
-                    break;
-                }
-            }
-        }
-        if (!$found && !empty($namespace['personal'])) {
-            foreach ($namespace['personal'] as $ns) {
-                if (strlen($ns[0]) && strpos($folder, $ns[0]) === 0) {
-                    // remove namespace prefix
-                    $folder = substr($folder, strlen($ns[0]));
-                    $prefix = '';
-                    $delim  = $ns[1];
-                    $found  = true;
-                    break;
-                }
-            }
-        }
-
-        if (empty($delim))
-            $delim = self::$imap->get_hierarchy_delimiter();
-
-        $folder = rcube_charset::convert($folder, 'UTF7-IMAP');
-        $folder = html::quote($folder);
-        $folder = str_replace(html::quote($delim), ' &raquo; ', $folder);
-
-        if ($prefix)
-            $folder = html::quote($prefix) . ($folder !== '' ? ' ' . $folder : '');
-
-        if (!$folder_ns)
-            $folder_ns = 'personal';
-
-        return $folder;
-    }
-
-    /**
-     * Get custom display name (saved in metadata) for the given folder
-     */
-    public static function custom_displayname($folder)
-    {
-      // find custom display name in folder METADATA
-      if (self::$config->get('kolab_custom_display_names', true)) {
-          $metadata = self::$imap->get_metadata($folder, array(self::NAME_KEY_PRIVATE, self::NAME_KEY_SHARED));
-          if (($name = $metadata[$folder][self::NAME_KEY_PRIVATE]) || ($name = $metadata[$folder][self::NAME_KEY_SHARED])) {
-              return $name;
-          }
-      }
-
-      return false;
-    }
-
-    /**
-     * Helper method to generate a truncated folder name to display.
-     * Note: $origname is a string returned by self::object_name()
-     */
-    public static function folder_displayname($origname, &$names)
-    {
-        $name = $origname;
-
-        // find folder prefix to truncate
-        for ($i = count($names)-1; $i >= 0; $i--) {
-            if (strpos($name, $names[$i] . ' &raquo; ') === 0) {
-                $length = strlen($names[$i] . ' &raquo; ');
-                $prefix = substr($name, 0, $length);
-                $count  = count(explode(' &raquo; ', $prefix));
-                $diff   = 1;
-
-                // check if prefix folder is in other users namespace
-                for ($n = count($names)-1; $n >= 0; $n--) {
-                    if (strpos($prefix, '(' . $names[$n] . ') ') === 0) {
-                        $diff = 0;
-                        break;
-                    }
-                }
-
-                $name = str_repeat('&nbsp;&nbsp;&nbsp;', $count - $diff) . '&raquo; ' . substr($name, $length);
-                break;
-            }
-            // other users namespace and parent folder exists
-            else if (strpos($name, '(' . $names[$i] . ') ') === 0) {
-                $length = strlen('(' . $names[$i] . ') ');
-                $prefix = substr($name, 0, $length);
-                $count  = count(explode(' &raquo; ', $prefix));
-                $name   = str_repeat('&nbsp;&nbsp;&nbsp;', $count) . '&raquo; ' . substr($name, $length);
-                break;
-            }
-        }
-
-        $names[] = $origname;
-
-        return $name;
-    }
-
-
-    /**
-     * Creates a SELECT field with folders list
-     *
-     * @param string $type    Folder type
-     * @param array  $attrs   SELECT field attributes (e.g. name)
-     * @param string $current The name of current folder (to skip it)
-     *
-     * @return html_select SELECT object
-     */
-    public static function folder_selector($type, $attrs, $current = '')
-    {
-        // get all folders of specified type (sorted)
-        $folders = self::get_folders($type, true);
-
-        $delim = self::$imap->get_hierarchy_delimiter();
-        $names = array();
-        $len   = strlen($current);
-
-        if ($len && ($rpos = strrpos($current, $delim))) {
-            $parent = substr($current, 0, $rpos);
-            $p_len  = strlen($parent);
-        }
-
-        // Filter folders list
-        foreach ($folders as $c_folder) {
-            $name = $c_folder->name;
-
-            // skip current folder and it's subfolders
-            if ($len) {
-                if ($name == $current) {
-                    // Make sure parent folder is listed (might be skipped e.g. if it's namespace root)
-                    if ($p_len && !isset($names[$parent])) {
-                        $names[$parent] = self::object_name($parent);
-                    }
-                    continue;
-                }
-                if (strpos($name, $current.$delim) === 0) {
-                    continue;
-                }
-            }
-
-            // always show the parent of current folder
-            if ($p_len && $name == $parent) {
-            }
-            // skip folders where user have no rights to create subfolders
-            else if ($c_folder->get_owner() != $_SESSION['username']) {
-                $rights = $c_folder->get_myrights();
-                if (!preg_match('/[ck]/', $rights)) {
-                    continue;
-                }
-            }
-
-            $names[$name] = self::object_name($name);
-        }
-
-        // Build SELECT field of parent folder
-        $attrs['is_escaped'] = true;
-        $select = new html_select($attrs);
-        $select->add('---', '');
-
-        $listnames = array();
-        foreach (array_keys($names) as $imap_name) {
-            $name = $origname = $names[$imap_name];
-
-            // find folder prefix to truncate
-            for ($i = count($listnames)-1; $i >= 0; $i--) {
-                if (strpos($name, $listnames[$i].' &raquo; ') === 0) {
-                    $length = strlen($listnames[$i].' &raquo; ');
-                    $prefix = substr($name, 0, $length);
-                    $count  = count(explode(' &raquo; ', $prefix));
-                    $name   = str_repeat('&nbsp;&nbsp;', $count-1) . '&raquo; ' . substr($name, $length);
-                    break;
-                }
-            }
-
-            $listnames[] = $origname;
-            $select->add($name, $imap_name);
-        }
-
-        return $select;
-    }
-
-
-    /**
-     * Returns a list of folder names
-     *
-     * @param string  Optional root folder
-     * @param string  Optional name pattern
-     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param boolean Enable to return subscribed folders only (null to use configured subscription mode)
-     * @param array   Will be filled with folder-types data
-     *
-     * @return array List of folders
-     */
-    public static function list_folders($root = '', $mbox = '*', $filter = null, $subscribed = null, &$folderdata = array())
-    {
-        if (!self::setup()) {
-            return null;
-        }
-
-        // use IMAP subscriptions
-        if ($subscribed === null && self::$config->get('kolab_use_subscriptions')) {
-            $subscribed = true;
-        }
-
-        if (!$filter) {
-            // Get ALL folders list, standard way
-            if ($subscribed) {
-                $folders = self::$imap->list_folders_subscribed($root, $mbox);
-                // add temporarily subscribed folders
-                if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
-                    $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
-                }
-            }
-            else {
-                $folders = self::_imap_list_folders($root, $mbox);
-            }
-
-            return $folders;
-        }
-        $prefix = $root . $mbox;
-        $regexp = '/^' . preg_quote($filter, '/') . '(\..+)?$/';
-
-        // get folders types for all folders
-        if (!$subscribed || $prefix == '*' || !self::$config->get('kolab_skip_namespace')) {
-            $folderdata = self::folders_typedata($prefix);
-        }
-        else {
-            // fetch folder types for the effective list of (subscribed) folders when post-filtering
-            $folderdata = array();
-        }
-
-        if (!is_array($folderdata)) {
-            return array();
-        }
-
-        // In some conditions we can skip LIST command (?)
-        if (!$subscribed && $filter != 'mail' && $prefix == '*') {
-            foreach ($folderdata as $folder => $type) {
-                if (!preg_match($regexp, $type)) {
-                    unset($folderdata[$folder]);
-                }
-            }
-
-            return self::$imap->sort_folder_list(array_keys($folderdata), true);
-        }
-
-        // Get folders list
-        if ($subscribed) {
-            $folders = self::$imap->list_folders_subscribed($root, $mbox);
-
-            // add temporarily subscribed folders
-            if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
-                $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
-            }
-        }
-        else {
-            $folders = self::_imap_list_folders($root, $mbox);
-        }
-
-        // In case of an error, return empty list (?)
-        if (!is_array($folders)) {
-            return array();
-        }
-
-        // Filter folders list
-        foreach ($folders as $idx => $folder) {
-            // lookup folder type
-            if (!array_key_exists($folder, $folderdata)) {
-                $folderdata[$folder] = self::folder_type($folder);
-            }
-
-            $type = $folderdata[$folder];
-
-            if ($filter == 'mail' && empty($type)) {
-                continue;
-            }
-            if (empty($type) || !preg_match($regexp, $type)) {
-                unset($folders[$idx]);
-            }
-        }
-
-        return $folders;
-    }
-
-    /**
-     * Wrapper for rcube_imap::list_folders() with optional post-filtering
-     */
-    protected static function _imap_list_folders($root, $mbox)
-    {
-        $postfilter = null;
-
-        // compose a post-filter expression for the excluded namespaces
-        if ($root . $mbox == '*' && ($skip_ns = self::$config->get('kolab_skip_namespace'))) {
-            $excludes = array();
-            foreach ((array)$skip_ns as $ns) {
-                if ($ns_root = self::namespace_root($ns)) {
-                    $excludes[] = $ns_root;
-                }
-            }
-
-            if (count($excludes)) {
-                $postfilter = '!^(' . join(')|(', array_map('preg_quote', $excludes)) . ')!';
-            }
-        }
-
-        // use normal LIST command to return all folders, it's fast enough
-        $folders = self::$imap->list_folders($root, $mbox, null, null, !empty($postfilter));
-
-        if (!empty($postfilter)) {
-            $folders = array_filter($folders, function($folder) use ($postfilter) { return !preg_match($postfilter, $folder); });
-            $folders = self::$imap->sort_folder_list($folders);
-        }
-
-        return $folders;
-    }
-
-
-    /**
-     * Search for shared or otherwise not listed groupware folders the user has access
-     *
-     * @param string Folder type of folders to search for
-     * @param string Search string
-     * @param array  Namespace(s) to exclude results from
-     *
-     * @return array List of matching kolab_storage_folder objects
-     */
-    public static function search_folders($type, $query, $exclude_ns = array())
-    {
-        if (!self::setup()) {
-            return array();
-        }
-
-        $folders = array();
-        $query = str_replace('*', '', $query);
-
-        // find unsubscribed IMAP folders of the given type
-        foreach ((array)self::list_folders('', '*', $type, false, $folderdata) as $foldername) {
-            // FIXME: only consider the last part of the folder path for searching?
-            $realname = strtolower(rcube_charset::convert($foldername, 'UTF7-IMAP'));
-            if (($query == '' || strpos($realname, $query) !== false) &&
-                !self::folder_is_subscribed($foldername, true) &&
-                !in_array(self::$imap->folder_namespace($foldername), (array)$exclude_ns)
-              ) {
-                $folders[] = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-            }
-        }
-
-        return $folders;
-    }
-
-
-    /**
-     * Sort the given list of kolab folders by namespace/name
-     *
-     * @param array List of kolab_storage_folder objects
-     * @return array Sorted list of folders
-     */
-    public static function sort_folders($folders)
-    {
-        $pad     = '  ';
-        $out     = array();
-        $nsnames = array('personal' => array(), 'shared' => array(), 'other' => array());
-
-        foreach ($folders as $folder) {
-            $folders[$folder->name] = $folder;
-            $ns = $folder->get_namespace();
-            $nsnames[$ns][$folder->name] = strtolower(html_entity_decode(self::object_name($folder->name, $ns), ENT_COMPAT, RCUBE_CHARSET)) . $pad;  // decode &raquo;
-        }
-
-        // $folders is a result of get_folders() we can assume folders were already sorted
-        foreach (array_keys($nsnames) as $ns) {
-            asort($nsnames[$ns], SORT_LOCALE_STRING);
-            foreach (array_keys($nsnames[$ns]) as $utf7name) {
-                $out[] = $folders[$utf7name];
-            }
-        }
-
-        return $out;
-    }
-
-
-    /**
-     * Check the folder tree and add the missing parents as virtual folders
-     *
-     * @param array $folders Folders list
-     * @param object $tree   Reference to the root node of the folder tree
-     *
-     * @return array Flat folders list
-     */
-    public static function folder_hierarchy($folders, &$tree = null)
-    {
-        $_folders = array();
-        $delim    = self::$imap->get_hierarchy_delimiter();
-        $other_ns = rtrim(self::namespace_root('other'), $delim);
-        $tree     = new kolab_storage_folder_virtual('', '<root>', '');  // create tree root
-        $refs     = array('' => $tree);
-
-        foreach ($folders as $idx => $folder) {
-            $path = explode($delim, $folder->name);
-            array_pop($path);
-            $folder->parent = join($delim, $path);
-            $folder->children = array();  // reset list
-
-            // skip top folders or ones with a custom displayname
-            if (count($path) < 1 || kolab_storage::custom_displayname($folder->name)) {
-                $tree->children[] = $folder;
-            }
-            else {
-                $parents = array();
-                $depth = $folder->get_namespace() == 'personal' ? 1 : 2;
-
-                while (count($path) >= $depth && ($parent = join($delim, $path))) {
-                    array_pop($path);
-                    $parent_parent = join($delim, $path);
-                    if (!$refs[$parent]) {
-                        if ($folder->type && self::folder_type($parent) == $folder->type) {
-                            $refs[$parent] = new kolab_storage_folder($parent, $folder->type, $folder->type);
-                            $refs[$parent]->parent = $parent_parent;
-                        }
-                        else if ($parent_parent == $other_ns) {
-                            $refs[$parent] = new kolab_storage_folder_user($parent, $parent_parent);
-                        }
-                        else {
-                            $name = kolab_storage::object_name($parent, $folder->get_namespace());
-                            $refs[$parent] = new kolab_storage_folder_virtual($parent, $name, $folder->get_namespace(), $parent_parent);
-                        }
-                        $parents[] = $refs[$parent];
-                    }
-                }
-
-                if (!empty($parents)) {
-                    $parents = array_reverse($parents);
-                    foreach ($parents as $parent) {
-                        $parent_node = $refs[$parent->parent] ?: $tree;
-                        $parent_node->children[] = $parent;
-                        $_folders[] = $parent;
-                    }
-                }
-
-                $parent_node = $refs[$folder->parent] ?: $tree;
-                $parent_node->children[] = $folder;
-            }
-
-            $refs[$folder->name] = $folder;
-            $_folders[] = $folder;
-            unset($folders[$idx]);
-        }
-
-        return $_folders;
-    }
-
-
-    /**
-     * Returns folder types indexed by folder name
-     *
-     * @param string $prefix Folder prefix (Default '*' for all folders)
-     *
-     * @return array|bool List of folders, False on failure
-     */
-    public static function folders_typedata($prefix = '*')
-    {
-        if (!self::setup()) {
-            return false;
-        }
-
-        // return cached result
-        if (is_array(self::$typedata[$prefix])) {
-            return self::$typedata[$prefix];
-        }
-
-        $type_keys = array(self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE);
-
-        // fetch metadata from *some* folders only
-        if (($prefix == '*' || $prefix == '') && ($skip_ns = self::$config->get('kolab_skip_namespace'))) {
-            $delimiter = self::$imap->get_hierarchy_delimiter();
-            $folderdata = $blacklist = array();
-            foreach ((array)$skip_ns as $ns) {
-                if ($ns_root = rtrim(self::namespace_root($ns), $delimiter)) {
-                    $blacklist[] = $ns_root;
-                }
-            }
-            foreach (array('personal','other','shared') as $ns) {
-                if (!in_array($ns, (array)$skip_ns)) {
-                    $ns_root = rtrim(self::namespace_root($ns), $delimiter);
-
-                    // list top-level folders and their childs one by one
-                    // GETMETADATA "%" doesn't list shared or other namespace folders but "*" would
-                    if ($ns_root == '') {
-                        foreach ((array)self::$imap->get_metadata('%', $type_keys) as $folder => $metadata) {
-                            if (!in_array($folder, $blacklist)) {
-                                $folderdata[$folder] = $metadata;
-                                $opts = self::$imap->folder_attributes($folder);
-                                if (!in_array('\\HasNoChildren', $opts) && ($data = self::$imap->get_metadata($folder.$delimiter.'*', $type_keys))) {
-                                    $folderdata += $data;
-                                }
-                            }
-                        }
-                    }
-                    else if ($data = self::$imap->get_metadata($ns_root.$delimiter.'*', $type_keys)) {
-                        $folderdata += $data;
-                    }
-                }
-            }
-        }
-        else {
-            $folderdata = self::$imap->get_metadata($prefix, $type_keys);
-        }
-
-        if (!is_array($folderdata)) {
-            return false;
-        }
-
-        // keep list in memory
-        self::$typedata[$prefix] = array_map(array('kolab_storage', 'folder_select_metadata'), $folderdata);
-
-        return self::$typedata[$prefix];
-    }
-
-
-    /**
-     * Callback for array_map to select the correct annotation value
-     */
-    public static function folder_select_metadata($types)
-    {
-        if (!empty($types[self::CTYPE_KEY_PRIVATE])) {
-            return $types[self::CTYPE_KEY_PRIVATE];
-        }
-        else if (!empty($types[self::CTYPE_KEY])) {
-            list($ctype, ) = explode('.', $types[self::CTYPE_KEY]);
-            return $ctype;
-        }
-        return null;
-    }
-
-
-    /**
-     * Returns type of IMAP folder
-     *
-     * @param string $folder Folder name (UTF7-IMAP)
-     *
-     * @return string Folder type
-     */
-    public static function folder_type($folder)
-    {
-        self::setup();
-
-        // return in-memory cached result
-        foreach (self::$typedata as $typedata) {
-            if (array_key_exists($folder, $typedata)) {
-                return $typedata[$folder];
-            }
-        }
-
-        $metadata = self::$imap->get_metadata($folder, array(self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE));
-
-        if (!is_array($metadata)) {
-            return null;
-        }
-
-        if (!empty($metadata[$folder])) {
-            return self::folder_select_metadata($metadata[$folder]);
-        }
-
-        return 'mail';
-    }
-
-
-    /**
-     * Sets folder content-type.
-     *
-     * @param string $folder Folder name
-     * @param string $type   Content type
-     *
-     * @return boolean True on success
-     */
-    public static function set_folder_type($folder, $type='mail')
-    {
-        self::setup();
-
-        list($ctype, $subtype) = explode('.', $type);
-
-        $success = self::$imap->set_metadata($folder, array(self::CTYPE_KEY => $ctype, self::CTYPE_KEY_PRIVATE => $subtype ? $type : null));
-
-        if (!$success)  // fallback: only set private annotation
-            $success |= self::$imap->set_metadata($folder, array(self::CTYPE_KEY_PRIVATE => $type));
-
-        return $success;
-    }
-
-
-    /**
-     * Check subscription status of this folder
-     *
-     * @param string $folder Folder name
-     * @param boolean $temp  Include temporary/session subscriptions
-     *
-     * @return boolean True if subscribed, false if not
-     */
-    public static function folder_is_subscribed($folder, $temp = false)
-    {
-        if (self::$subscriptions === null) {
-            self::setup();
-            self::$with_tempsubs = false;
-            self::$subscriptions = self::$imap->list_folders_subscribed();
-            self::$with_tempsubs = true;
-        }
-
-        return in_array($folder, self::$subscriptions) ||
-            ($temp && in_array($folder, (array)$_SESSION['kolab_subscribed_folders']));
-    }
-
-
-    /**
-     * Change subscription status of this folder
-     *
-     * @param string $folder Folder name
-     * @param boolean $temp  Only subscribe temporarily for the current session
-     *
-     * @return True on success, false on error
-     */
-    public static function folder_subscribe($folder, $temp = false)
-    {
-        self::setup();
-
-        // temporary/session subscription
-        if ($temp) {
-            if (self::folder_is_subscribed($folder)) {
-                return true;
-            }
-            else if (!is_array($_SESSION['kolab_subscribed_folders']) || !in_array($folder, $_SESSION['kolab_subscribed_folders'])) {
-                $_SESSION['kolab_subscribed_folders'][] = $folder;
-                return true;
-            }
-        }
-        else if (self::$imap->subscribe($folder)) {
-            self::$subscriptions = null;
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Change subscription status of this folder
-     *
-     * @param string $folder Folder name
-     * @param boolean $temp  Only remove temporary subscription
-     *
-     * @return True on success, false on error
-     */
-    public static function folder_unsubscribe($folder, $temp = false)
-    {
-        self::setup();
-
-        // temporary/session subscription
-        if ($temp) {
-            if (is_array($_SESSION['kolab_subscribed_folders']) && ($i = array_search($folder, $_SESSION['kolab_subscribed_folders'])) !== false) {
-                unset($_SESSION['kolab_subscribed_folders'][$i]);
-            }
-            return true;
-        }
-        else if (self::$imap->unsubscribe($folder)) {
-            self::$subscriptions = null;
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Check activation status of this folder
-     *
-     * @param string $folder Folder name
-     *
-     * @return boolean True if active, false if not
-     */
-    public static function folder_is_active($folder)
-    {
-        $active_folders = self::get_states();
-
-        return in_array($folder, $active_folders);
-    }
-
-
-    /**
-     * Change activation status of this folder
-     *
-     * @param string $folder Folder name
-     *
-     * @return True on success, false on error
-     */
-    public static function folder_activate($folder)
-    {
-        // activation implies temporary subscription
-        self::folder_subscribe($folder, true);
-        return self::set_state($folder, true);
-    }
-
-
-    /**
-     * Change activation status of this folder
-     *
-     * @param string $folder Folder name
-     *
-     * @return True on success, false on error
-     */
-    public static function folder_deactivate($folder)
-    {
-        // remove from temp subscriptions, really?
-        self::folder_unsubscribe($folder, true);
-
-        return self::set_state($folder, false);
-    }
-
-
-    /**
-     * Return list of active folders
-     */
-    private static function get_states()
-    {
-        if (self::$states !== null) {
-            return self::$states;
-        }
-
-        $rcube   = rcube::get_instance();
-        $folders = $rcube->config->get('kolab_active_folders');
-
-        if ($folders !== null) {
-            self::$states = !empty($folders) ? explode('**', $folders) : array();
-        }
-        // for backward-compatibility copy server-side subscriptions to activation states
-        else {
-            self::setup();
-            if (self::$subscriptions === null) {
-                self::$with_tempsubs = false;
-                self::$subscriptions = self::$imap->list_folders_subscribed();
-                self::$with_tempsubs = true;
-            }
-            self::$states = self::$subscriptions;
-            $folders = implode(self::$states, '**');
-            $rcube->user->save_prefs(array('kolab_active_folders' => $folders));
-        }
-
-        return self::$states;
-    }
-
-
-    /**
-     * Update list of active folders
-     */
-    private static function set_state($folder, $state)
-    {
-        self::get_states();
-
-        // update in-memory list
-        $idx = array_search($folder, self::$states);
-        if ($state && $idx === false) {
-            self::$states[] = $folder;
-        }
-        else if (!$state && $idx !== false) {
-            unset(self::$states[$idx]);
-        }
-
-        // update user preferences
-        $folders = implode(self::$states, '**');
-        $rcube   = rcube::get_instance();
-        return $rcube->user->save_prefs(array('kolab_active_folders' => $folders));
-    }
-
-    /**
-     * Creates default folder of specified type
-     * To be run when none of subscribed folders (of specified type) is found
-     *
-     * @param string $type  Folder type
-     * @param string $props Folder properties (color, etc)
-     *
-     * @return string Folder name
-     */
-    public static function create_default_folder($type, $props = array())
-    {
-        if (!self::setup()) {
-            return;
-        }
-
-        $folders = self::$imap->get_metadata('*', array(kolab_storage::CTYPE_KEY_PRIVATE));
-
-        // from kolab_folders config
-        $folder_type  = strpos($type, '.') ? str_replace('.', '_', $type) : $type . '_default';
-        $default_name = self::$config->get('kolab_folders_' . $folder_type);
-        $folder_type  = str_replace('_', '.', $folder_type);
-
-        // check if we have any folder in personal namespace
-        // folder(s) may exist but not subscribed
-        foreach ((array)$folders as $f => $data) {
-            if (strpos($data[self::CTYPE_KEY_PRIVATE], $type) === 0) {
-                $folder = $f;
-                break;
-            }
-        }
-
-        if (!$folder) {
-            if (!$default_name) {
-                $default_name = self::$default_folders[$type];
-            }
-
-            if (!$default_name) {
-                return;
-            }
-
-            $folder = rcube_charset::convert($default_name, RCUBE_CHARSET, 'UTF7-IMAP');
-            $prefix = self::$imap->get_namespace('prefix');
-
-            // add personal namespace prefix if needed
-            if ($prefix && strpos($folder, $prefix) !== 0 && $folder != 'INBOX') {
-                $folder = $prefix . $folder;
-            }
-
-            if (!self::$imap->folder_exists($folder)) {
-                if (!self::$imap->create_folder($folder)) {
-                    return;
-                }
-            }
-
-            self::set_folder_type($folder, $folder_type);
-        }
-
-        self::folder_subscribe($folder);
-
-        if ($props['active']) {
-            self::set_state($folder, true);
-        }
-
-        if (!empty($props)) {
-            self::set_folder_props($folder, $props);
-        }
-
-        return $folder;
-    }
-
-    /**
-     * Sets folder metadata properties
-     *
-     * @param string $folder Folder name
-     * @param array  $prop   Folder properties
-     */
-    public static function set_folder_props($folder, &$prop)
-    {
-        if (!self::setup()) {
-            return;
-        }
-
-        // TODO: also save 'showalarams' and other properties here
-        $ns        = self::$imap->folder_namespace($folder);
-        $supported = array(
-            'color'       => array(self::COLOR_KEY_SHARED, self::COLOR_KEY_PRIVATE),
-            'displayname' => array(self::NAME_KEY_SHARED, self::NAME_KEY_PRIVATE),
-        );
-
-        foreach ($supported as $key => $metakeys) {
-            if (array_key_exists($key, $prop)) {
-                $meta_saved = false;
-                if ($ns == 'personal')  // save in shared namespace for personal folders
-                    $meta_saved = self::$imap->set_metadata($folder, array($metakeys[0] => $prop[$key]));
-                if (!$meta_saved)    // try in private namespace
-                    $meta_saved = self::$imap->set_metadata($folder, array($metakeys[1] => $prop[$key]));
-                if ($meta_saved)
-                    unset($prop[$key]);  // unsetting will prevent fallback to local user prefs
-            }
-        }
-    }
-
-
-    /**
-     *
-     * @param mixed   $query    Search value (or array of field => value pairs)
-     * @param int     $mode     Matching mode: 0 - partial (*abc*), 1 - strict (=), 2 - prefix (abc*)
-     * @param array   $required List of fields that shall ot be empty
-     * @param int     $limit    Maximum number of records
-     * @param int     $count    Returns the number of records found
-     *
-     * @return array List or false on error
-     */
-    public static function search_users($query, $mode = 1, $required = array(), $limit = 0, &$count = 0)
-    {
-        $query = str_replace('*', '', $query);
-
-        // requires a working LDAP setup
-        if (!self::ldap() || strlen($query) == 0) {
-            return array();
-        }
-
-        // search users using the configured attributes
-        $results = self::$ldap->dosearch(self::$config->get('kolab_users_search_attrib', array('cn','mail','alias')), $query, $mode, $required, $limit, $count);
-
-        // exclude myself
-        if ($_SESSION['kolab_dn']) {
-            unset($results[$_SESSION['kolab_dn']]);
-        }
-
-        // resolve to IMAP folder name
-        $root = self::namespace_root('other');
-        $user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
-
-        array_walk($results, function(&$user, $dn) use ($root, $user_attrib) {
-            list($localpart, ) = explode('@', $user[$user_attrib]);
-            $user['kolabtargetfolder'] = $root . $localpart;
-        });
-
-        return $results;
-    }
-
-
-    /**
-     * Returns a list of IMAP folders shared by the given user
-     *
-     * @param array   User entry from LDAP
-     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param boolean Return subscribed folders only (null to use configured subscription mode)
-     * @param array   Will be filled with folder-types data
-     *
-     * @return array List of folders
-     */
-    public static function list_user_folders($user, $type, $subscribed = null, &$folderdata = array())
-    {
-        self::setup();
-
-        $folders = array();
-
-        // use localpart of user attribute as root for folder listing
-        $user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
-        if (!empty($user[$user_attrib])) {
-            list($mbox) = explode('@', $user[$user_attrib]);
-
-            $delimiter = self::$imap->get_hierarchy_delimiter();
-            $other_ns = self::namespace_root('other');
-            $folders = self::list_folders($other_ns . $mbox . $delimiter, '*', $type, $subscribed, $folderdata);
-        }
-
-        return $folders;
-    }
-
-
-    /**
-     * Get a list of (virtual) top-level folders from the other users namespace
-     *
-     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param boolean Enable to return subscribed folders only (null to use configured subscription mode)
-     *
-     * @return array List of kolab_storage_folder_user objects
-     */
-    public static function get_user_folders($type, $subscribed)
-    {
-        $folders = $folderdata = array();
-
-        if (self::setup()) {
-            $delimiter = self::$imap->get_hierarchy_delimiter();
-            $other_ns = rtrim(self::namespace_root('other'), $delimiter);
-            $path_len = count(explode($delimiter, $other_ns));
-
-            foreach ((array)self::list_folders($other_ns . $delimiter, '*', '', $subscribed) as $foldername) {
-                if ($foldername == 'INBOX')  // skip INBOX which is added by default
-                    continue;
-
-                $path = explode($delimiter, $foldername);
-
-                // compare folder type if a subfolder is listed
-                if ($type && count($path) > $path_len + 1 && $type != self::folder_type($foldername)) {
-                    continue;
-                }
-
-                // truncate folder path to top-level folders of the 'other' namespace
-                $foldername = join($delimiter, array_slice($path, 0, $path_len + 1));
-
-                if (!$folders[$foldername]) {
-                    $folders[$foldername] = new kolab_storage_folder_user($foldername, $other_ns);
-                }
-            }
-
-            // for every (subscribed) user folder, list all (unsubscribed) subfolders
-            foreach ($folders as $userfolder) {
-                foreach ((array)self::list_folders($userfolder->name . $delimiter, '*', $type, false, $folderdata) as $foldername) {
-                    if (!$folders[$foldername]) {
-                        $folders[$foldername] = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-                        $userfolder->children[] = $folders[$foldername];
-                    }
-                }
-            }
-        }
-
-        return $folders;
-    }
-
-
-    /**
-     * Handler for user_delete plugin hooks
-     *
-     * Remove all cache data from the local database related to the given user.
-     */
-    public static function delete_user_folders($args)
-    {
-        $db = rcmail::get_instance()->get_dbh();
-        $prefix = 'imap://' . urlencode($args['username']) . '@' . $args['host'] . '/%';
-        $db->query("DELETE FROM " . $db->table_name('kolab_folders', true) . " WHERE `resource` LIKE ?", $prefix);
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache.php
deleted file mode 100644
index 162c220..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache.php
+++ /dev/null
@@ -1,1171 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class providing a local caching layer for Kolab groupware objects.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012-2013, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage_cache
-{
-    const DB_DATE_FORMAT = 'Y-m-d H:i:s';
-
-    public $sync_complete = false;
-
-    protected $db;
-    protected $imap;
-    protected $folder;
-    protected $uid2msg;
-    protected $objects;
-    protected $metadata = array();
-    protected $folder_id;
-    protected $resource_uri;
-    protected $enabled = true;
-    protected $synched = false;
-    protected $synclock = false;
-    protected $ready = false;
-    protected $cache_table;
-    protected $cache_refresh = 3600;
-    protected $folders_table;
-    protected $max_sql_packet;
-    protected $max_sync_lock_time = 600;
-    protected $binary_items = array();
-    protected $extra_cols = array();
-    protected $order_by = null;
-    protected $limit = null;
-    protected $error = 0;
-    protected $server_timezone;
-
-
-    /**
-     * Factory constructor
-     */
-    public static function factory(kolab_storage_folder $storage_folder)
-    {
-        $subclass = 'kolab_storage_cache_' . $storage_folder->type;
-        if (class_exists($subclass)) {
-            return new $subclass($storage_folder);
-        }
-        else {
-            rcube::raise_error(array(
-                'code' => 900,
-                'type' => 'php',
-                'message' => "No kolab_storage_cache class found for folder '$storage_folder->name' of type '$storage_folder->type'"
-            ), true);
-
-            return new kolab_storage_cache($storage_folder);
-        }
-    }
-
-
-    /**
-     * Default constructor
-     */
-    public function __construct(kolab_storage_folder $storage_folder = null)
-    {
-        $rcmail = rcube::get_instance();
-        $this->db = $rcmail->get_dbh();
-        $this->imap = $rcmail->get_storage();
-        $this->enabled = $rcmail->config->get('kolab_cache', false);
-        $this->folders_table = $this->db->table_name('kolab_folders');
-        $this->cache_refresh = get_offset_sec($rcmail->config->get('kolab_cache_refresh', '12h'));
-        $this->server_timezone = new DateTimeZone(date_default_timezone_get());
-
-        if ($this->enabled) {
-            // always read folder cache and lock state from DB master
-            $this->db->set_table_dsn('kolab_folders', 'w');
-            // remove sync-lock on script termination
-            $rcmail->add_shutdown_function(array($this, '_sync_unlock'));
-        }
-
-        if ($storage_folder)
-            $this->set_folder($storage_folder);
-    }
-
-    /**
-     * Direct access to cache by folder_id
-     * (only for internal use)
-     */
-    public function select_by_id($folder_id)
-    {
-        $sql_arr = $this->db->fetch_assoc($this->db->query("SELECT * FROM `{$this->folders_table}` WHERE `folder_id` = ?", $folder_id));
-        if ($sql_arr) {
-            $this->metadata = $sql_arr;
-            $this->folder_id = $sql_arr['folder_id'];
-            $this->folder = new StdClass;
-            $this->folder->type = $sql_arr['type'];
-            $this->resource_uri = $sql_arr['resource'];
-            $this->cache_table = $this->db->table_name('kolab_cache_' . $sql_arr['type']);
-            $this->ready = true;
-        }
-    }
-
-    /**
-     * Connect cache with a storage folder
-     *
-     * @param kolab_storage_folder The storage folder instance to connect with
-     */
-    public function set_folder(kolab_storage_folder $storage_folder)
-    {
-        $this->folder = $storage_folder;
-
-        if (empty($this->folder->name) || !$this->folder->valid) {
-            $this->ready = false;
-            return;
-        }
-
-        // compose fully qualified ressource uri for this instance
-        $this->resource_uri = $this->folder->get_resource_uri();
-        $this->cache_table = $this->db->table_name('kolab_cache_' . $this->folder->type);
-        $this->ready = $this->enabled && !empty($this->folder->type);
-        $this->folder_id = null;
-    }
-
-    /**
-     * Returns true if this cache supports query by type
-     */
-    public function has_type_col()
-    {
-        return in_array('type', $this->extra_cols);
-    }
-
-    /**
-     * Getter for the numeric ID used in cache tables
-     */
-    public function get_folder_id()
-    {
-        $this->_read_folder_data();
-        return $this->folder_id;
-    }
-
-    /**
-     * Returns code of last error
-     *
-     * @return int Error code
-     */
-    public function get_error()
-    {
-        return $this->error;
-    }
-
-    /**
-     * Synchronize local cache data with remote
-     */
-    public function synchronize()
-    {
-        // only sync once per request cycle
-        if ($this->synched)
-            return;
-
-        // increase time limit
-        @set_time_limit($this->max_sync_lock_time - 60);
-
-        // get effective time limit we have for synchronization (~70% of the execution time)
-        $time_limit = ini_get('max_execution_time') * 0.7;
-        $sync_start = time();
-
-        // assume sync will be completed
-        $this->sync_complete = true;
-
-        if (!$this->ready) {
-            // kolab cache is disabled, synchronize IMAP mailbox cache only
-            $this->imap->folder_sync($this->folder->name);
-        }
-        else {
-            // read cached folder metadata
-            $this->_read_folder_data();
-
-            // check cache status ($this->metadata is set in _read_folder_data())
-            if (  empty($this->metadata['ctag']) ||
-                  empty($this->metadata['changed']) ||
-                  $this->metadata['objectcount'] === null ||
-                  $this->metadata['changed'] < date(self::DB_DATE_FORMAT, time() - $this->cache_refresh) ||
-                  $this->metadata['ctag'] != $this->folder->get_ctag() ||
-                  intval($this->metadata['objectcount']) !== $this->count()
-                ) {
-                // lock synchronization for this folder or wait if locked
-                $this->_sync_lock();
-
-                // disable messages cache if configured to do so
-                $this->bypass(true);
-
-                // synchronize IMAP mailbox cache
-                $this->imap->folder_sync($this->folder->name);
-
-                // compare IMAP index with object cache index
-                $imap_index = $this->imap->index($this->folder->name, null, null, true, true);
-
-                // determine objects to fetch or to invalidate
-                if (!$imap_index->is_error()) {
-                    $imap_index = $imap_index->get();
-
-                    // read cache index
-                    $sql_result = $this->db->query(
-                        "SELECT `msguid`, `uid` FROM `{$this->cache_table}` WHERE `folder_id` = ?",
-                        $this->folder_id
-                    );
-
-                    $old_index = array();
-                    while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                        $old_index[] = $sql_arr['msguid'];
-                    }
-
-                    // fetch new objects from imap
-                    $i = 0;
-                    foreach (array_diff($imap_index, $old_index) as $msguid) {
-                        if ($object = $this->folder->read_object($msguid, '*')) {
-                            $this->_extended_insert($msguid, $object);
-
-                            // check time limit and abort sync if running too long
-                            if (++$i % 50 == 0 && time() - $sync_start > $time_limit) {
-                                $this->sync_complete = false;
-                                break;
-                            }
-                        }
-                    }
-                    $this->_extended_insert(0, null);
-
-                    // delete invalid entries from local DB
-                    $del_index = array_diff($old_index, $imap_index);
-                    if (!empty($del_index)) {
-                        $quoted_ids = join(',', array_map(array($this->db, 'quote'), $del_index));
-                        $this->db->query(
-                            "DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `msguid` IN ($quoted_ids)",
-                            $this->folder_id
-                        );
-                    }
-
-                    // update ctag value (will be written to database in _sync_unlock())
-                    if ($this->sync_complete) {
-                        $this->metadata['ctag'] = $this->folder->get_ctag();
-                        $this->metadata['changed'] = date(self::DB_DATE_FORMAT, time());
-                        // remember the number of cache entries linked to this folder
-                        $this->metadata['objectcount'] = $this->count();
-                    }
-                }
-
-                $this->bypass(false);
-
-                // remove lock
-                $this->_sync_unlock();
-            }
-        }
-
-        $this->check_error();
-        $this->synched = time();
-    }
-
-
-    /**
-     * Read a single entry from cache or from IMAP directly
-     *
-     * @param string Related IMAP message UID
-     * @param string Object type to read
-     * @param string IMAP folder name the entry relates to
-     * @param array  Hash array with object properties or null if not found
-     */
-    public function get($msguid, $type = null, $foldername = null)
-    {
-        // delegate to another cache instance
-        if ($foldername && $foldername != $this->folder->name) {
-            $success = false;
-            if ($targetfolder = kolab_storage::get_folder($foldername)) {
-                $success = $targetfolder->cache->get($msguid, $type);
-                $this->error = $targetfolder->cache->get_error();
-            }
-            return $success;
-        }
-
-        // load object if not in memory
-        if (!isset($this->objects[$msguid])) {
-            if ($this->ready) {
-                $this->_read_folder_data();
-
-                $sql_result = $this->db->query(
-                    "SELECT * FROM `{$this->cache_table}` ".
-                    "WHERE `folder_id` = ? AND `msguid` = ?",
-                    $this->folder_id,
-                    $msguid
-                );
-
-                if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                    $this->objects = array($msguid => $this->_unserialize($sql_arr));  // store only this object in memory (#2827)
-                }
-            }
-
-            // fetch from IMAP if not present in cache
-            if (empty($this->objects[$msguid])) {
-                if ($object = $this->folder->read_object($msguid, $type ?: '*', $foldername)) {
-                    $this->objects = array($msguid => $object);
-                    $this->set($msguid, $object);
-                }
-            }
-        }
-
-        $this->check_error();
-        return $this->objects[$msguid];
-    }
-
-
-    /**
-     * Insert/Update a cache entry
-     *
-     * @param string Related IMAP message UID
-     * @param mixed  Hash array with object properties to save or false to delete the cache entry
-     * @param string IMAP folder name the entry relates to
-     */
-    public function set($msguid, $object, $foldername = null)
-    {
-        if (!$msguid) {
-            return;
-        }
-
-        // delegate to another cache instance
-        if ($foldername && $foldername != $this->folder->name) {
-          if ($targetfolder = kolab_storage::get_folder($foldername)) {
-              $targetfolder->cache->set($msguid, $object);
-              $this->error = $targetfolder->cache->get_error();
-          }
-          return;
-        }
-
-        // remove old entry
-        if ($this->ready) {
-            $this->_read_folder_data();
-            $this->db->query("DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `msguid` = ?",
-                $this->folder_id, $msguid);
-        }
-
-        if ($object) {
-            // insert new object data...
-            $this->save($msguid, $object);
-        }
-        else {
-            // ...or set in-memory cache to false
-            $this->objects[$msguid] = $object;
-        }
-
-        $this->check_error();
-    }
-
-
-    /**
-     * Insert (or update) a cache entry
-     *
-     * @param int    Related IMAP message UID
-     * @param mixed  Hash array with object properties to save or false to delete the cache entry
-     * @param int    Optional old message UID (for update)
-     */
-    public function save($msguid, $object, $olduid = null)
-    {
-        // write to cache
-        if ($this->ready) {
-            $this->_read_folder_data();
-
-            $sql_data = $this->_serialize($object);
-            $sql_data['folder_id'] = $this->folder_id;
-            $sql_data['msguid']    = $msguid;
-            $sql_data['uid']       = $object['uid'];
-
-            $args = array();
-            $cols = array('folder_id', 'msguid', 'uid', 'changed', 'data', 'xml', 'tags', 'words');
-            $cols = array_merge($cols, $this->extra_cols);
-
-            foreach ($cols as $idx => $col) {
-                $cols[$idx] = $this->db->quote_identifier($col);
-                $args[]     = $sql_data[$col];
-            }
-
-            if ($olduid) {
-                foreach ($cols as $idx => $col) {
-                    $cols[$idx] = "$col = ?";
-                }
-
-                $query = "UPDATE `{$this->cache_table}` SET " . implode(', ', $cols)
-                    . " WHERE `folder_id` = ? AND `msguid` = ?";
-                $args[] = $this->folder_id;
-                $args[] = $olduid;
-            }
-            else {
-                $query = "INSERT INTO `{$this->cache_table}` (`created`, " . implode(', ', $cols)
-                    . ") VALUES (" . $this->db->now() . str_repeat(', ?', count($cols)) . ")";
-            }
-
-            $result = $this->db->query($query, $args);
-
-            if (!$this->db->affected_rows($result)) {
-                rcube::raise_error(array(
-                    'code' => 900, 'type' => 'php',
-                    'message' => "Failed to write to kolab cache"
-                ), true);
-            }
-        }
-
-        // keep a copy in memory for fast access
-        $this->objects = array($msguid => $object);
-        $this->uid2msg = array($object['uid'] => $msguid);
-
-        $this->check_error();
-    }
-
-
-    /**
-     * Move an existing cache entry to a new resource
-     *
-     * @param string Entry's IMAP message UID
-     * @param string Entry's Object UID
-     * @param object kolab_storage_folder Target storage folder instance
-     */
-    public function move($msguid, $uid, $target)
-    {
-        if ($this->ready) {
-            // clear cached uid mapping and force new lookup
-            unset($target->cache->uid2msg[$uid]);
-
-            // resolve new message UID in target folder
-            if ($new_msguid = $target->cache->uid2msguid($uid)) {
-                $this->_read_folder_data();
-
-                $this->db->query(
-                    "UPDATE `{$this->cache_table}` SET `folder_id` = ?, `msguid` = ? ".
-                    "WHERE `folder_id` = ? AND `msguid` = ?",
-                    $target->cache->get_folder_id(),
-                    $new_msguid,
-                    $this->folder_id,
-                    $msguid
-                );
-
-                $result = $this->db->affected_rows();
-            }
-        }
-
-        if (empty($result)) {
-            // just clear cache entry
-            $this->set($msguid, false);
-        }
-
-        unset($this->uid2msg[$uid]);
-        $this->check_error();
-    }
-
-
-    /**
-     * Remove all objects from local cache
-     */
-    public function purge()
-    {
-        if (!$this->ready) {
-            return true;
-        }
-
-        $this->_read_folder_data();
-
-        $result = $this->db->query(
-            "DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ?",
-            $this->folder_id
-        );
-
-        return $this->db->affected_rows($result);
-    }
-
-    /**
-     * Update resource URI for existing cache entries
-     *
-     * @param string Target IMAP folder to move it to
-     */
-    public function rename($new_folder)
-    {
-        if (!$this->ready) {
-            return;
-        }
-
-        if ($target = kolab_storage::get_folder($new_folder)) {
-            // resolve new message UID in target folder
-            $this->db->query(
-                "UPDATE `{$this->folders_table}` SET `resource` = ? ".
-                "WHERE `resource` = ?",
-                $target->get_resource_uri(),
-                $this->resource_uri
-            );
-
-            $this->check_error();
-        }
-        else {
-            $this->error = kolab_storage::ERROR_IMAP_CONN;
-        }
-    }
-
-    /**
-     * Select Kolab objects filtered by the given query
-     *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     *   triplet: array('<colname>', '<comparator>', '<value>')
-     * @param boolean Set true to only return UIDs instead of complete objects
-     * @return array List of Kolab data objects (each represented as hash array) or UIDs
-     */
-    public function select($query = array(), $uids = false)
-    {
-        $result = $uids ? array() : new kolab_storage_dataset($this);
-
-        // read from local cache DB (assume it to be synchronized)
-        if ($this->ready) {
-            $this->_read_folder_data();
-
-            // fetch full object data on one query if a small result set is expected
-            $fetchall = !$uids && ($this->limit ? $this->limit[0] : ($count = $this->count($query))) < 500;
-
-            // skip SELECT if we know it will return nothing
-            if ($count === 0) {
-                return $result;
-            }
-
-            $sql_query = "SELECT " . ($fetchall ? '*' : "`msguid` AS `_msguid`, `uid`")
-                . " FROM `{$this->cache_table}` WHERE `folder_id` = ?"
-                . $this->_sql_where($query)
-                . (!empty($this->order_by) ? " ORDER BY " . $this->order_by : '');
-
-            $sql_result = $this->limit ?
-                $this->db->limitquery($sql_query, $this->limit[1], $this->limit[0], $this->folder_id) :
-                $this->db->query($sql_query, $this->folder_id);
-
-            if ($this->db->is_error($sql_result)) {
-                if ($uids) {
-                    return null;
-                }
-                $result->set_error(true);
-                return $result;
-            }
-
-            while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                if ($uids) {
-                    $this->uid2msg[$sql_arr['uid']] = $sql_arr['_msguid'];
-                    $result[] = $sql_arr['uid'];
-                }
-                else if ($fetchall && ($object = $this->_unserialize($sql_arr))) {
-                    $result[] = $object;
-                }
-                else if (!$fetchall) {
-                    // only add msguid to dataset index
-                    $result[] = $sql_arr;
-                }
-            }
-        }
-        // use IMAP
-        else {
-            $filter = $this->_query2assoc($query);
-
-            if ($filter['type']) {
-                $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_format::KTYPE_PREFIX . $filter['type'];
-                $index  = $this->imap->search_once($this->folder->name, $search);
-            }
-            else {
-                $index = $this->imap->index($this->folder->name, null, null, true, true);
-            }
-
-            if ($index->is_error()) {
-                $this->check_error();
-                if ($uids) {
-                    return null;
-                }
-                $result->set_error(true);
-                return $result;
-            }
-
-            $index  = $index->get();
-            $result = $uids ? $index : $this->_fetch($index, $filter['type']);
-
-            // TODO: post-filter result according to query
-        }
-
-        // We don't want to cache big results in-memory, however
-        // if we select only one object here, there's a big chance we will need it later
-        if (!$uids && count($result) == 1) {
-            if ($msguid = $result[0]['_msguid']) {
-                $this->uid2msg[$result[0]['uid']] = $msguid;
-                $this->objects = array($msguid => $result[0]);
-            }
-        }
-
-        $this->check_error();
-
-        return $result;
-    }
-
-
-    /**
-     * Get number of objects mathing the given query
-     *
-     * @param array  $query Pseudo-SQL query as list of filter parameter triplets
-     * @return integer The number of objects of the given type
-     */
-    public function count($query = array())
-    {
-        // read from local cache DB (assume it to be synchronized)
-        if ($this->ready) {
-            $this->_read_folder_data();
-
-            $sql_result = $this->db->query(
-                "SELECT COUNT(*) AS `numrows` FROM `{$this->cache_table}` ".
-                "WHERE `folder_id` = ?" . $this->_sql_where($query),
-                $this->folder_id
-            );
-
-            if ($this->db->is_error($sql_result)) {
-                return null;
-            }
-
-            $sql_arr = $this->db->fetch_assoc($sql_result);
-            $count   = intval($sql_arr['numrows']);
-        }
-        // use IMAP
-        else {
-            $filter = $this->_query2assoc($query);
-
-            if ($filter['type']) {
-                $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_format::KTYPE_PREFIX . $filter['type'];
-                $index  = $this->imap->search_once($this->folder->name, $search);
-            }
-            else {
-                $index = $this->imap->index($this->folder->name, null, null, true, true);
-            }
-
-            if ($index->is_error()) {
-                $this->check_error();
-                return null;
-            }
-
-            // TODO: post-filter result according to query
-
-            $count = $index->count();
-        }
-
-        $this->check_error();
-        return $count;
-    }
-
-    /**
-     * Define ORDER BY clause for cache queries
-     */
-    public function set_order_by($sortcols)
-    {
-        if (!empty($sortcols)) {
-            $this->order_by = '`' . join('`, `', (array)$sortcols) . '`';
-        }
-        else {
-            $this->order_by = null;
-        }
-    }
-
-    /**
-     * Define LIMIT clause for cache queries
-     */
-    public function set_limit($length, $offset = 0)
-    {
-        $this->limit = array($length, $offset);
-    }
-
-    /**
-     * Helper method to compose a valid SQL query from pseudo filter triplets
-     */
-    protected function _sql_where($query)
-    {
-        $sql_where = '';
-        foreach ((array) $query as $param) {
-            if (is_array($param[0])) {
-                $subq = array();
-                foreach ($param[0] as $q) {
-                    $subq[] = preg_replace('/^\s*AND\s+/i', '', $this->_sql_where(array($q)));
-                }
-                if (!empty($subq)) {
-                    $sql_where .= ' AND (' . implode($param[1] == 'OR' ? ' OR ' : ' AND ', $subq) . ')';
-                }
-                continue;
-            }
-            else if ($param[1] == '=' && is_array($param[2])) {
-                $qvalue = '(' . join(',', array_map(array($this->db, 'quote'), $param[2])) . ')';
-                $param[1] = 'IN';
-            }
-            else if ($param[1] == '~' || $param[1] == 'LIKE' || $param[1] == '!~' || $param[1] == '!LIKE') {
-                $not = ($param[1] == '!~' || $param[1] == '!LIKE') ? 'NOT ' : '';
-                $param[1] = $not . 'LIKE';
-                $qvalue = $this->db->quote('%'.preg_replace('/(^\^|\$$)/', ' ', $param[2]).'%');
-            }
-            else if ($param[0] == 'tags') {
-                $param[1] = ($param[1] == '!=' ? 'NOT ' : '' ) . 'LIKE';
-                $qvalue = $this->db->quote('% '.$param[2].' %');
-            }
-            else {
-                $qvalue = $this->db->quote($param[2]);
-            }
-
-            $sql_where .= sprintf(' AND %s %s %s',
-                $this->db->quote_identifier($param[0]),
-                $param[1],
-                $qvalue
-            );
-        }
-
-        return $sql_where;
-    }
-
-    /**
-     * Helper method to convert the given pseudo-query triplets into
-     * an associative filter array with 'equals' values only
-     */
-    protected function _query2assoc($query)
-    {
-        // extract object type from query parameter
-        $filter = array();
-        foreach ($query as $param) {
-            if ($param[1] == '=')
-                $filter[$param[0]] = $param[2];
-        }
-        return $filter;
-    }
-
-    /**
-     * Fetch messages from IMAP
-     *
-     * @param array  List of message UIDs to fetch
-     * @param string Requested object type or * for all
-     * @param string IMAP folder to read from
-     * @return array List of parsed Kolab objects
-     */
-    protected function _fetch($index, $type = null, $folder = null)
-    {
-        $results = new kolab_storage_dataset($this);
-        foreach ((array)$index as $msguid) {
-            if ($object = $this->folder->read_object($msguid, $type, $folder)) {
-                $results[] = $object;
-                $this->set($msguid, $object);
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = array('changed' => null, 'xml' => '', 'tags' => '', 'words' => '');
-
-        if ($object['changed']) {
-            $sql_data['changed'] = date(self::DB_DATE_FORMAT, is_object($object['changed']) ? $object['changed']->format('U') : $object['changed']);
-        }
-
-        if ($object['_formatobj']) {
-            $sql_data['xml']   = preg_replace('!(</?[a-z0-9:-]+>)[\n\r\t\s]+!ms', '$1', (string)$object['_formatobj']->write(3.0));
-            $sql_data['tags']  = ' ' . join(' ', $object['_formatobj']->get_tags()) . ' ';  // pad with spaces for strict/prefix search
-            $sql_data['words'] = ' ' . join(' ', $object['_formatobj']->get_words()) . ' ';
-        }
-
-        // extract object data
-        $data = array();
-        foreach ($object as $key => $val) {
-            // skip empty properties
-            if ($val === "" || $val === null) {
-                continue;
-            }
-            // mark binary data to be extracted from xml on unserialize()
-            if (isset($this->binary_items[$key])) {
-                $data[$key] = true;
-            }
-            else if ($key[0] != '_') {
-                $data[$key] = $val;
-            }
-            else if ($key == '_attachments') {
-                foreach ($val as $k => $att) {
-                    unset($att['content'], $att['path']);
-                    if ($att['id'])
-                        $data[$key][$k] = $att;
-                }
-            }
-        }
-
-        // use base64 encoding (Bug #1912, #2662)
-        $sql_data['data'] = base64_encode(serialize($data));
-
-        return $sql_data;
-    }
-
-    /**
-     * Helper method to turn stored cache data into a valid storage object
-     */
-    protected function _unserialize($sql_arr)
-    {
-        // check if data is a base64-encoded string, for backward compat.
-        if (strpos(substr($sql_arr['data'], 0, 64), ':') === false) {
-            $sql_arr['data'] = base64_decode($sql_arr['data']);
-        }
-
-        $object = unserialize($sql_arr['data']);
-
-        // de-serialization failed
-        if ($object === false) {
-            rcube::raise_error(array(
-                'code' => 900, 'type' => 'php',
-                'message' => "Malformed data for {$this->resource_uri}/{$sql_arr['msguid']} object."
-            ), true);
-
-            return null;
-        }
-
-        // decode binary properties
-        foreach ($this->binary_items as $key => $regexp) {
-            if (!empty($object[$key]) && preg_match($regexp, $sql_arr['xml'], $m)) {
-                $object[$key] = base64_decode($m[1]);
-            }
-        }
-
-        $object_type = $sql_arr['type'] ?: $this->folder->type;
-        $format_type = $this->folder->type == 'configuration' ? 'configuration' : $object_type;
-
-        // add meta data
-        $object['_type']      = $object_type;
-        $object['_msguid']    = $sql_arr['msguid'];
-        $object['_mailbox']   = $this->folder->name;
-        $object['_size']      = strlen($sql_arr['xml']);
-        $object['_formatobj'] = kolab_format::factory($format_type, 3.0, $sql_arr['xml']);
-
-        return $object;
-    }
-
-    /**
-     * Write records into cache using extended inserts to reduce the number of queries to be executed
-     *
-     * @param int  Message UID. Set 0 to commit buffered inserts
-     * @param array Kolab object to cache
-     */
-    protected function _extended_insert($msguid, $object)
-    {
-        static $buffer = '';
-
-        $line = '';
-        if ($object) {
-            $sql_data = $this->_serialize($object);
-
-            // Skip multifolder insert for Oracle, we can't put long data inline
-            if ($this->db->db_provider == 'oracle') {
-                $extra_cols = '';
-                if ($this->extra_cols) {
-                    $extra_cols = array_map(function($n) { return "`{$n}`"; }, $this->extra_cols);
-                    $extra_cols = ', ' . join(', ', $extra_cols);
-                    $extra_args = str_repeat(', ?', count($this->extra_cols));
-                }
-
-                $params = array($this->folder_id, $msguid, $object['uid'], $sql_data['changed'],
-                    $sql_data['data'], $sql_data['xml'], $sql_data['tags'], $sql_data['words']);
-
-                foreach ($this->extra_cols as $col) {
-                    $params[] = $sql_data[$col];
-                }
-
-                $result = $this->db->query(
-                    "INSERT INTO `{$this->cache_table}` "
-                    . " (`folder_id`, `msguid`, `uid`, `created`, `changed`, `data`, `xml`, `tags`, `words` $extra_cols)"
-                    . " VALUES (?, ?, ?, " . $this->db->now() . ", ?, ?, ?, ?, ? $extra_args)",
-                    $params
-                );
-
-                if (!$this->db->affected_rows($result)) {
-                    rcube::raise_error(array(
-                        'code' => 900, 'type' => 'php',
-                        'message' => "Failed to write to kolab cache"
-                    ), true);
-                }
-
-                return;
-            }
-
-            $values = array(
-                $this->db->quote($this->folder_id),
-                $this->db->quote($msguid),
-                $this->db->quote($object['uid']),
-                $this->db->now(),
-                $this->db->quote($sql_data['changed']),
-                $this->db->quote($sql_data['data']),
-                $this->db->quote($sql_data['xml']),
-                $this->db->quote($sql_data['tags']),
-                $this->db->quote($sql_data['words']),
-            );
-            foreach ($this->extra_cols as $col) {
-                $values[] = $this->db->quote($sql_data[$col]);
-            }
-            $line = '(' . join(',', $values) . ')';
-        }
-
-        if ($buffer && (!$msguid || (strlen($buffer) + strlen($line) > $this->max_sql_packet()))) {
-            $extra_cols = '';
-            if ($this->extra_cols) {
-                $extra_cols = array_map(function($n) { return "`{$n}`"; }, $this->extra_cols);
-                $extra_cols = ', ' . join(', ', $extra_cols);
-            }
-
-            $result = $this->db->query(
-                "INSERT INTO `{$this->cache_table}` ".
-                " (`folder_id`, `msguid`, `uid`, `created`, `changed`, `data`, `xml`, `tags`, `words` $extra_cols)".
-                " VALUES $buffer"
-            );
-
-            if (!$this->db->affected_rows($result)) {
-                rcube::raise_error(array(
-                    'code' => 900, 'type' => 'php',
-                    'message' => "Failed to write to kolab cache"
-                ), true);
-            }
-
-            $buffer = '';
-        }
-
-        $buffer .= ($buffer ? ',' : '') . $line;
-    }
-
-    /**
-     * Returns max_allowed_packet from mysql config
-     */
-    protected function max_sql_packet()
-    {
-        if (!$this->max_sql_packet) {
-            // mysql limit or max 4 MB
-            $value = $this->db->get_variable('max_allowed_packet', 1048500);
-            $this->max_sql_packet = min($value, 4*1024*1024) - 2000;
-        }
-
-        return $this->max_sql_packet;
-    }
-
-    /**
-     * Read this folder's ID and cache metadata
-     */
-    protected function _read_folder_data()
-    {
-        // already done
-        if (!empty($this->folder_id) || !$this->ready)
-            return;
-
-        $sql_arr = $this->db->fetch_assoc($this->db->query(
-                "SELECT `folder_id`, `synclock`, `ctag`, `changed`, `objectcount`"
-                . " FROM `{$this->folders_table}` WHERE `resource` = ?",
-                $this->resource_uri
-        ));
-
-        if ($sql_arr) {
-            $this->metadata = $sql_arr;
-            $this->folder_id = $sql_arr['folder_id'];
-        }
-        else {
-            $this->db->query("INSERT INTO `{$this->folders_table}` (`resource`, `type`)"
-                . " VALUES (?, ?)", $this->resource_uri, $this->folder->type);
-
-            $this->folder_id = $this->db->insert_id('kolab_folders');
-            $this->metadata = array();
-        }
-    }
-
-    /**
-     * Check lock record for this folder and wait if locked or set lock
-     */
-    protected function _sync_lock()
-    {
-        if (!$this->ready)
-            return;
-
-        $this->_read_folder_data();
-
-        // abort if database is not set-up
-        if ($this->db->is_error()) {
-            $this->check_error();
-            $this->ready = false;
-            return;
-        }
-
-        $read_query  = "SELECT `synclock`, `ctag` FROM `{$this->folders_table}` WHERE `folder_id` = ?";
-        $write_query = "UPDATE `{$this->folders_table}` SET `synclock` = ? WHERE `folder_id` = ? AND `synclock` = ?";
-
-        // wait if locked (expire locks after 10 minutes) ...
-        // ... or if setting lock fails (another process meanwhile set it)
-        while (
-            (intval($this->metadata['synclock']) + $this->max_sync_lock_time > time()) ||
-            (($res = $this->db->query($write_query, time(), $this->folder_id, intval($this->metadata['synclock']))) &&
-                !($affected = $this->db->affected_rows($res)))
-        ) {
-            usleep(500000);
-            $this->metadata = $this->db->fetch_assoc($this->db->query($read_query, $this->folder_id));
-        }
-
-        $this->synclock = $affected > 0;
-    }
-
-    /**
-     * Remove lock for this folder
-     */
-    public function _sync_unlock()
-    {
-        if (!$this->ready || !$this->synclock)
-            return;
-
-        $this->db->query(
-            "UPDATE `{$this->folders_table}` SET `synclock` = 0, `ctag` = ?, `changed` = ?, `objectcount` = ? WHERE `folder_id` = ?",
-            $this->metadata['ctag'],
-            $this->metadata['changed'],
-            $this->metadata['objectcount'],
-            $this->folder_id
-        );
-
-        $this->synclock = false;
-    }
-
-    /**
-     * Check IMAP connection error state
-     */
-    protected function check_error()
-    {
-        if (($err_code = $this->imap->get_error_code()) < 0) {
-            $this->error = kolab_storage::ERROR_IMAP_CONN;
-            if (($res_code = $this->imap->get_response_code()) !== 0 && in_array($res_code, array(rcube_storage::NOPERM, rcube_storage::READONLY))) {
-                $this->error = kolab_storage::ERROR_NO_PERMISSION;
-            }
-        }
-        else if ($this->db->is_error()) {
-            $this->error = kolab_storage::ERROR_CACHE_DB;
-        }
-    }
-
-    /**
-     * Resolve an object UID into an IMAP message UID
-     *
-     * @param string  Kolab object UID
-     * @param boolean Include deleted objects
-     * @return int The resolved IMAP message UID
-     */
-    public function uid2msguid($uid, $deleted = false)
-    {
-        // query local database if available
-        if (!isset($this->uid2msg[$uid]) && $this->ready) {
-            $this->_read_folder_data();
-
-            $sql_result = $this->db->query(
-                "SELECT `msguid` FROM `{$this->cache_table}` ".
-                "WHERE `folder_id` = ? AND `uid` = ? ORDER BY `msguid` DESC",
-                $this->folder_id,
-                $uid
-            );
-
-            if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                $this->uid2msg[$uid] = $sql_arr['msguid'];
-            }
-        }
-
-        if (!isset($this->uid2msg[$uid])) {
-            // use IMAP SEARCH to get the right message
-            $index = $this->imap->search_once($this->folder->name, ($deleted ? '' : 'UNDELETED ') .
-                'HEADER SUBJECT ' . rcube_imap_generic::escape($uid));
-            $results = $index->get();
-            $this->uid2msg[$uid] = end($results);
-        }
-
-        return $this->uid2msg[$uid];
-    }
-
-    /**
-     * Getter for protected member variables
-     */
-    public function __get($name)
-    {
-        if ($name == 'folder_id') {
-            $this->_read_folder_data();
-        }
-
-        return $this->$name;
-    }
-
-    /**
-     * Bypass Roundcube messages cache.
-     * Roundcube cache duplicates information already stored in kolab_cache.
-     *
-     * @param bool $disable True disables, False enables messages cache
-     */
-    public function bypass($disable = false)
-    {
-        // if kolab cache is disabled do nothing
-        if (!$this->enabled) {
-            return;
-        }
-
-        static $messages_cache, $cache_bypass;
-
-        if ($messages_cache === null) {
-            $rcmail = rcube::get_instance();
-            $messages_cache = (bool) $rcmail->config->get('messages_cache');
-            $cache_bypass   = (int) $rcmail->config->get('kolab_messages_cache_bypass');
-        }
-
-        if ($messages_cache) {
-            // handle recurrent (multilevel) bypass() calls
-            if ($disable) {
-                $this->cache_bypassed += 1;
-                if ($this->cache_bypassed > 1) {
-                    return;
-                }
-            }
-            else {
-                $this->cache_bypassed -= 1;
-                if ($this->cache_bypassed > 0) {
-                    return;
-                }
-            }
-
-            switch ($cache_bypass) {
-                case 2:
-                    // Disable messages cache completely
-                    $this->imap->set_messages_caching(!$disable);
-                    break;
-
-                case 1:
-                    // We'll disable messages cache, but keep index cache.
-                    // Default mode is both (MODE_INDEX | MODE_MESSAGE)
-                    $mode = rcube_imap_cache::MODE_INDEX;
-
-                    if (!$disable) {
-                        $mode |= rcube_imap_cache::MODE_MESSAGE;
-                    }
-
-                    $this->imap->set_messages_caching(true, $mode);
-            }
-        }
-    }
-
-    /**
-     * Converts DateTime or unix timestamp into sql date format
-     * using server timezone.
-     */
-    protected function _convert_datetime($datetime)
-    {
-        if (is_object($datetime)) {
-            $dt = clone $datetime;
-            $dt->setTimeZone($this->server_timezone);
-            return $dt->format(self::DB_DATE_FORMAT);
-        }
-        else if ($datetime) {
-            return date(self::DB_DATE_FORMAT, $datetime);
-        }
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_configuration.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_configuration.php
deleted file mode 100644
index c3c7ac4..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_configuration.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for configuration objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage_cache_configuration extends kolab_storage_cache
-{
-    protected $extra_cols = array('type');
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     *
-     * @override
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = parent::_serialize($object);
-        $sql_data['type'] = $object['type'];
-
-        return $sql_data;
-    }
-
-    /**
-     * Select Kolab objects filtered by the given query
-     *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     * @param boolean Set true to only return UIDs instead of complete objects
-     * @return array List of Kolab data objects (each represented as hash array) or UIDs
-     */
-    public function select($query = array(), $uids = false)
-    {
-        // modify query for IMAP search: query param 'type' is actually a subtype
-        if (!$this->ready) {
-            foreach ($query as $i => $tuple) {
-                if ($tuple[0] == 'type') {
-                    $tuple[2] = 'configuration.' . $tuple[2];
-                    $query[$i] = $tuple;
-                }
-            }
-        }
-
-        return parent::select($query, $uids);
-    }
-
-    /**
-     * Helper method to compose a valid SQL query from pseudo filter triplets
-     */
-    protected function _sql_where($query)
-    {
-        if (is_array($query)) {
-            foreach ($query as $idx => $param) {
-                // convert category filter
-                if ($param[0] == 'category') {
-                    $param[2] = array_map(function($n) { return 'category:' . $n; }, (array) $param[2]);
-
-                    $query[$idx][0] = 'tags';
-                    $query[$idx][2] = count($param[2]) > 1 ? $param[2] : $param[2][0];
-                }
-                // convert member filter (we support only = operator with single value)
-                else if ($param[0] == 'member') {
-                    $query[$idx][0] = 'words';
-                    $query[$idx][1] = '~';
-                    $query[$idx][2] = '^' . $param[2] . '$';
-                }
-            }
-        }
-
-        return parent::_sql_where($query);
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_contact.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_contact.php
deleted file mode 100644
index d526a0e..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_contact.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for contact objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage_cache_contact extends kolab_storage_cache
-{
-    protected $extra_cols = array('type','name','firstname','surname','email');
-    protected $binary_items = array(
-        'photo'          => '|<photo><uri>[^;]+;base64,([^<]+)</uri></photo>|i',
-        'pgppublickey'   => '|<key><uri>data:application/pgp-keys;base64,([^<]+)</uri></key>|i',
-        'pkcs7publickey' => '|<key><uri>data:application/pkcs7-mime;base64,([^<]+)</uri></key>|i',
-    );
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     *
-     * @override
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = parent::_serialize($object);
-        $sql_data['type'] = $object['_type'];
-
-        // columns for sorting
-        $sql_data['name']      = rcube_charset::clean($object['name'] . $object['prefix']);
-        $sql_data['firstname'] = rcube_charset::clean($object['firstname'] . $object['middlename'] . $object['surname']);
-        $sql_data['surname']   = rcube_charset::clean($object['surname']   . $object['firstname']  . $object['middlename']);
-        $sql_data['email']     = rcube_charset::clean(is_array($object['email']) ? $object['email'][0] : $object['email']);
-
-        if (is_array($sql_data['email'])) {
-            $sql_data['email'] = $sql_data['email']['address'];
-        }
-        // avoid value being null
-        if (empty($sql_data['email'])) {
-            $sql_data['email'] = '';
-        }
-
-        // use organization if name is empty
-        if (empty($sql_data['name']) && !empty($object['organization'])) {
-            $sql_data['name'] = rcube_charset::clean($object['organization']);
-        }
-
-        return $sql_data;
-    }
-}
\ No newline at end of file
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_event.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_event.php
deleted file mode 100644
index ae9c693..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_event.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for calendar event objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage_cache_event extends kolab_storage_cache
-{
-    protected $extra_cols = array('dtstart','dtend');
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     *
-     * @override
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = parent::_serialize($object);
-
-        $sql_data['dtstart'] = $this->_convert_datetime($object['start']);
-        $sql_data['dtend']   = $this->_convert_datetime($object['end']);
-
-        // extend date range for recurring events
-        if ($object['recurrence'] && $object['_formatobj']) {
-            $recurrence = new kolab_date_recurrence($object['_formatobj']);
-            $dtend = $recurrence->end() ?: new DateTime('now +10 years');
-            $sql_data['dtend'] = $this->_convert_datetime($dtend);
-        }
-
-        // extend start/end dates to spawn all exceptions
-        if (is_array($object['exceptions'])) {
-            foreach ($object['exceptions'] as $exception) {
-                if (is_a($exception['start'], 'DateTime')) {
-                    $exstart = $this->_convert_datetime($exception['start']);
-                    if ($exstart < $sql_data['dtstart']) {
-                        $sql_data['dtstart'] = $exstart;
-                    }
-                }
-                if (is_a($exception['end'], 'DateTime')) {
-                    $exend = $this->_convert_datetime($exception['end']);
-                    if ($exend > $sql_data['dtend']) {
-                        $sql_data['dtend'] = $exend;
-                    }
-                }
-            }
-        }
-
-        return $sql_data;
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_file.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_file.php
deleted file mode 100644
index ea1823d..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_file.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for file objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage_cache_file extends kolab_storage_cache
-{
-    protected $extra_cols = array('filename');
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     *
-     * @override
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = parent::_serialize($object);
-
-        if (!empty($object['_attachments'])) {
-            reset($object['_attachments']);
-            $sql_data['filename'] = $object['_attachments'][key($object['_attachments'])]['name'];
-        }
-
-        return $sql_data;
-    }
-}
\ No newline at end of file
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_freebusy.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_freebusy.php
deleted file mode 100644
index 50e4804..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_freebusy.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for freebusy objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage_cache_freebusy extends kolab_storage_cache
-{
-    protected $extra_cols = array('dtstart','dtend');
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     *
-     * @override
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = parent::_serialize($object) + array('dtstart' => null, 'dtend' => null);
-
-        $sql_data['dtstart'] = $this->_convert_datetime($object['start']);
-        $sql_data['dtend']   = $this->_convert_datetime($object['end']);
-
-        return $sql_data;
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_journal.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_journal.php
deleted file mode 100644
index 766f1da..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_journal.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for journal objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage_cache_journal extends kolab_storage_cache
-{
-    protected $extra_cols = array('dtstart','dtend');
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     *
-     * @override
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = parent::_serialize($object) + array('dtstart' => null, 'dtend' => null);
-
-        $sql_data['dtstart'] = $this->_convert_datetime($object['start']);
-        $sql_data['dtend']   = $this->_convert_datetime($object['end']);
-
-        return $sql_data;
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_mongodb.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_mongodb.php
deleted file mode 100644
index 8ae95e4..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_mongodb.php
+++ /dev/null
@@ -1,561 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class providing a local caching layer for Kolab groupware objects.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage_cache_mongodb
-{
-    private $db;
-    private $imap;
-    private $folder;
-    private $uid2msg;
-    private $objects;
-    private $index = array();
-    private $resource_uri;
-    private $enabled = true;
-    private $synched = false;
-    private $synclock = false;
-    private $ready = false;
-    private $max_sql_packet = 1046576;  // 1 MB - 2000 bytes
-    private $binary_cols = array('photo','pgppublickey','pkcs7publickey');
-
-
-    /**
-     * Default constructor
-     */
-    public function __construct(kolab_storage_folder $storage_folder = null)
-    {
-        $rcmail = rcube::get_instance();
-        $mongo = new Mongo();
-        $this->db = $mongo->kolab_cache;
-        $this->imap = $rcmail->get_storage();
-        $this->enabled = $rcmail->config->get('kolab_cache', false);
-
-        if ($this->enabled) {
-            // remove sync-lock on script termination
-            $rcmail->add_shutdown_function(array($this, '_sync_unlock'));
-        }
-
-        if ($storage_folder)
-            $this->set_folder($storage_folder);
-    }
-
-
-    /**
-     * Connect cache with a storage folder
-     *
-     * @param kolab_storage_folder The storage folder instance to connect with
-     */
-    public function set_folder(kolab_storage_folder $storage_folder)
-    {
-        $this->folder = $storage_folder;
-
-        if (empty($this->folder->name)) {
-            $this->ready = false;
-            return;
-        }
-
-        // compose fully qualified ressource uri for this instance
-        $this->resource_uri = $this->folder->get_resource_uri();
-        $this->ready = $this->enabled;
-    }
-
-
-    /**
-     * Synchronize local cache data with remote
-     */
-    public function synchronize()
-    {
-        // only sync once per request cycle
-        if ($this->synched)
-            return;
-
-        // increase time limit
-        @set_time_limit(500);
-
-        // lock synchronization for this folder or wait if locked
-        $this->_sync_lock();
-
-        // synchronize IMAP mailbox cache
-        $this->imap->folder_sync($this->folder->name);
-
-        // compare IMAP index with object cache index
-        $imap_index = $this->imap->index($this->folder->name);
-        $this->index = $imap_index->get();
-
-        // determine objects to fetch or to invalidate
-        if ($this->ready) {
-            // read cache index
-            $old_index = array();
-            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri), array('msguid' => 1, 'uid' => 1));
-            foreach ($cursor as $doc) {
-                $old_index[] = $doc['msguid'];
-                $this->uid2msg[$doc['uid']] = $doc['msguid'];
-            }
-
-            // fetch new objects from imap
-            foreach (array_diff($this->index, $old_index) as $msguid) {
-                if ($object = $this->folder->read_object($msguid, '*')) {
-                    try {
-                        $this->db->cache->insert($this->_serialize($object, $msguid));
-                    }
-                    catch (Exception $e) {
-                        rcmail::raise_error(array(
-                            'code' => 900, 'type' => 'php',
-                            'message' => "Failed to write to mongodb cache: " . $e->getMessage(),
-                        ), true);
-                    }
-                }
-            }
-
-            // delete invalid entries from local DB
-            $del_index = array_diff($old_index, $this->index);
-            if (!empty($del_index)) {
-                $this->db->cache->remove(array('resource' => $this->resource_uri, 'msguid' => array('$in' => $del_index)));
-            }
-        }
-
-        // remove lock
-        $this->_sync_unlock();
-
-        $this->synched = time();
-    }
-
-
-    /**
-     * Read a single entry from cache or from IMAP directly
-     *
-     * @param string Related IMAP message UID
-     * @param string Object type to read
-     * @param string IMAP folder name the entry relates to
-     * @param array  Hash array with object properties or null if not found
-     */
-    public function get($msguid, $type = null, $foldername = null)
-    {
-        // delegate to another cache instance
-        if ($foldername && $foldername != $this->folder->name) {
-            return kolab_storage::get_folder($foldername)->cache->get($msguid, $object);
-        }
-
-        // load object if not in memory
-        if (!isset($this->objects[$msguid])) {
-            if ($this->ready && ($doc = $this->db->cache->findOne(array('resource' => $this->resource_uri, 'msguid' => $msguid))))
-                $this->objects[$msguid] = $this->_unserialize($doc);
-
-            // fetch from IMAP if not present in cache
-            if (empty($this->objects[$msguid])) {
-                $result = $this->_fetch(array($msguid), $type, $foldername);
-                $this->objects[$msguid] = $result[0];
-            }
-        }
-
-        return $this->objects[$msguid];
-    }
-
-
-    /**
-     * Insert/Update a cache entry
-     *
-     * @param string Related IMAP message UID
-     * @param mixed  Hash array with object properties to save or false to delete the cache entry
-     * @param string IMAP folder name the entry relates to
-     */
-    public function set($msguid, $object, $foldername = null)
-    {
-        // delegate to another cache instance
-        if ($foldername && $foldername != $this->folder->name) {
-            kolab_storage::get_folder($foldername)->cache->set($msguid, $object);
-            return;
-        }
-
-        // write to cache
-        if ($this->ready) {
-            // remove old entry
-            $this->db->cache->remove(array('resource' => $this->resource_uri, 'msguid' => $msguid));
-
-            // write new object data if not false (wich means deleted)
-            if ($object) {
-                try {
-                    $this->db->cache->insert($this->_serialize($object, $msguid));
-                }
-                catch (Exception $e) {
-                    rcmail::raise_error(array(
-                        'code' => 900, 'type' => 'php',
-                        'message' => "Failed to write to mongodb cache: " . $e->getMessage(),
-                    ), true);
-                }
-            }
-        }
-
-        // keep a copy in memory for fast access
-        $this->objects[$msguid] = $object;
-
-        if ($object)
-            $this->uid2msg[$object['uid']] = $msguid;
-    }
-
-    /**
-     * Move an existing cache entry to a new resource
-     *
-     * @param string Entry's IMAP message UID
-     * @param string Entry's Object UID
-     * @param string Target IMAP folder to move it to
-     */
-    public function move($msguid, $objuid, $target_folder)
-    {
-        $target = kolab_storage::get_folder($target_folder);
-
-        // resolve new message UID in target folder
-        if ($new_msguid = $target->cache->uid2msguid($objuid)) {
-/*
-            $this->db->query(
-                "UPDATE kolab_cache SET resource=?, msguid=? ".
-                "WHERE resource=? AND msguid=? AND type<>?",
-                $target->get_resource_uri(),
-                $new_msguid,
-                $this->resource_uri,
-                $msguid,
-                'lock'
-            );
-*/
-        }
-        else {
-            // just clear cache entry
-            $this->set($msguid, false);
-        }
-
-        unset($this->uid2msg[$uid]);
-    }
-
-
-    /**
-     * Remove all objects from local cache
-     */
-    public function purge($type = null)
-    {
-        return $this->db->cache->remove(array(), array('safe' => true));
-    }
-
-
-    /**
-     * Select Kolab objects filtered by the given query
-     *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     *   triplet: array('<colname>', '<comparator>', '<value>')
-     * @return array List of Kolab data objects (each represented as hash array)
-     */
-    public function select($query = array())
-    {
-        $result = array();
-
-        // read from local cache DB (assume it to be synchronized)
-        if ($this->ready) {
-            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri) + $this->_mongo_filter($query));
-            foreach ($cursor as $doc) {
-                if ($object = $this->_unserialize($doc))
-                    $result[] = $object;
-            }
-        }
-        else {
-            // extract object type from query parameter
-            $filter = $this->_query2assoc($query);
-
-            // use 'list' for folder's default objects
-            if ($filter['type'] == $this->type) {
-                $index = $this->index;
-            }
-            else {  // search by object type
-                $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_storage_folder::KTYPE_PREFIX . $filter['type'];
-                $index = $this->imap->search_once($this->folder->name, $search)->get();
-            }
-
-            // fetch all messages in $index from IMAP
-            $result = $this->_fetch($index, $filter['type']);
-
-            // TODO: post-filter result according to query
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Get number of objects mathing the given query
-     *
-     * @param array  $query Pseudo-SQL query as list of filter parameter triplets
-     * @return integer The number of objects of the given type
-     */
-    public function count($query = array())
-    {
-        $count = 0;
-
-        // cache is in sync, we can count records in local DB
-        if ($this->synched) {
-            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri) + $this->_mongo_filter($query));
-            $count = $cursor->valid() ? $cursor->count() : 0;
-        }
-        else {
-            // search IMAP by object type
-            $filter = $this->_query2assoc($query);
-            $ctype  = kolab_storage_folder::KTYPE_PREFIX . $filter['type'];
-            $index = $this->imap->search_once($this->folder->name, 'UNDELETED HEADER X-Kolab-Type ' . $ctype);
-            $count = $index->count();
-        }
-
-        return $count;
-    }
-
-    /**
-     * Helper method to convert the pseudo-SQL query into a valid mongodb filter
-     */
-    private function _mongo_filter($query)
-    {
-        $filters = array();
-        foreach ($query as $param) {
-            $filter = array();
-            if ($param[1] == '=' && is_array($param[2])) {
-                $filter[$param[0]] = array('$in' => $param[2]);
-                $filters[] = $filter;
-            }
-            else if ($param[1] == '=') {
-                $filters[] = array($param[0] => $param[2]);
-            }
-            else if ($param[1] == 'LIKE' || $param[1] == '~') {
-                $filter[$param[0]] = array('$regex' => preg_quote($param[2]), '$options' => 'i');
-                $filters[] = $filter;
-            }
-            else if ($param[1] == '!~' || $param[1] == '!LIKE') {
-                $filter[$param[0]] = array('$not' => '/' . preg_quote($param[2]) . '/i');
-                $filters[] = $filter;
-            }
-            else {
-                $op = '';
-                switch ($param[1]) {
-                    case '>':  $op = '$gt';  break;
-                    case '>=': $op = '$gte'; break;
-                    case '<':  $op = '$lt';  break;
-                    case '<=': $op = '$lte'; break;
-                    case '!=':
-                    case '<>': $op = '$gte'; break;
-                }
-                if ($op) {
-                    $filter[$param[0]] = array($op => $param[2]);
-                    $filters[] = $filter;
-                }
-            }
-        }
-
-        return array('$and' => $filters);
-    }
-
-    /**
-     * Helper method to convert the given pseudo-query triplets into
-     * an associative filter array with 'equals' values only
-     */
-    private function _query2assoc($query)
-    {
-        // extract object type from query parameter
-        $filter = array();
-        foreach ($query as $param) {
-            if ($param[1] == '=')
-                $filter[$param[0]] = $param[2];
-        }
-        return $filter;
-    }
-
-    /**
-     * Fetch messages from IMAP
-     *
-     * @param array List of message UIDs to fetch
-     * @return array List of parsed Kolab objects
-     */
-    private function _fetch($index, $type = null, $folder = null)
-    {
-        $results = array();
-        foreach ((array)$index as $msguid) {
-            if ($object = $this->folder->read_object($msguid, $type, $folder)) {
-                $results[] = $object;
-                $this->set($msguid, $object);
-            }
-        }
-
-        return $results;
-    }
-
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     */
-    private function _serialize($object, $msguid)
-    {
-        $bincols = array_flip($this->binary_cols);
-        $doc = array(
-            'resource' => $this->resource_uri,
-            'type'     => $object['_type'] ? $object['_type'] : $this->folder->type,
-            'msguid'   => $msguid,
-            'uid'      => $object['uid'],
-            'xml'      => '',
-            'tags'     => array(),
-            'words'    => array(),
-            'objcols'  => array(),
-        );
-
-        // set type specific values
-        if ($this->folder->type == 'event') {
-            // database runs in server's timezone so using date() is what we want
-            $doc['dtstart'] = date('Y-m-d H:i:s', is_object($object['start']) ? $object['start']->format('U') : $object['start']);
-            $doc['dtend']   = date('Y-m-d H:i:s', is_object($object['end'])   ? $object['end']->format('U')   : $object['end']);
-
-            // extend date range for recurring events
-            if ($object['recurrence']) {
-                $doc['dtend'] = date('Y-m-d H:i:s', $object['recurrence']['UNTIL'] ?: strtotime('now + 2 years'));
-            }
-        }
-
-        if ($object['_formatobj']) {
-            $doc['xml'] = preg_replace('!(</?[a-z0-9:-]+>)[\n\r\t\s]+!ms', '$1', (string)$object['_formatobj']->write());
-            $doc['tags'] = $object['_formatobj']->get_tags();
-            $doc['words'] = $object['_formatobj']->get_words();
-        }
-
-        // extract object data
-        $data = array();
-        foreach ($object as $key => $val) {
-            if ($val === "" || $val === null) {
-                // skip empty properties
-                continue;
-            }
-            if (isset($bincols[$key])) {
-                $data[$key] = base64_encode($val);
-            }
-            else if (is_object($val)) {
-                if (is_a($val, 'DateTime')) {
-                    $data[$key] = array('_class' => 'DateTime', 'date' => $val->format('Y-m-d H:i:s'), 'timezone' => $val->getTimezone()->getName());
-                    $doc['objcols'][] = $key;
-                }
-            }
-            else if ($key[0] != '_') {
-                $data[$key] = $val;
-            }
-            else if ($key == '_attachments') {
-                foreach ($val as $k => $att) {
-                    unset($att['content'], $att['path']);
-                    if ($att['id'])
-                        $data[$key][$k] = $att;
-                }
-            }
-        }
-
-        $doc['data'] = $data;
-        return $doc;
-    }
-
-    /**
-     * Helper method to turn stored cache data into a valid storage object
-     */
-    private function _unserialize($doc)
-    {
-        $object = $doc['data'];
-
-        // decode binary properties
-        foreach ($this->binary_cols as $key) {
-            if (!empty($object[$key]))
-                $object[$key] = base64_decode($object[$key]);
-        }
-
-        // restore serialized objects
-        foreach ((array)$doc['objcols'] as $key) {
-            switch ($object[$key]['_class']) {
-                case 'DateTime':
-                    $val = new DateTime($object[$key]['date'], new DateTimeZone($object[$key]['timezone']));
-                    $object[$key] = $val;
-                    break;
-            }
-        }
-
-        // add meta data
-        $object['_type'] = $doc['type'];
-        $object['_msguid'] = $doc['msguid'];
-        $object['_mailbox'] = $this->folder->name;
-        $object['_formatobj'] = kolab_format::factory($doc['type'], $doc['xml']);
-
-        return $object;
-    }
-
-    /**
-     * Check lock record for this folder and wait if locked or set lock
-     */
-    private function _sync_lock()
-    {
-        if (!$this->ready)
-            return;
-
-        $this->synclock = true;
-        $lock = $this->db->locks->findOne(array('resource' => $this->resource_uri));
-
-        // create lock record if not exists
-        if (!$lock) {
-            $this->db->locks->insert(array('resource' => $this->resource_uri, 'created' => time()));
-        }
-        // wait if locked (expire locks after 10 minutes)
-        else if ((time() - $lock['created']) < 600) {
-            usleep(500000);
-            return $this->_sync_lock();
-        }
-        // set lock
-        else {
-            $lock['created'] = time();
-            $this->db->locks->update(array('_id' => $lock['_id']), $lock, array('safe' => true));
-        }
-    }
-
-    /**
-     * Remove lock for this folder
-     */
-    public function _sync_unlock()
-    {
-        if (!$this->ready || !$this->synclock)
-            return;
-
-        $this->db->locks->remove(array('resource' => $this->resource_uri));
-    }
-
-    /**
-     * Resolve an object UID into an IMAP message UID
-     *
-     * @param string  Kolab object UID
-     * @param boolean Include deleted objects
-     * @return int The resolved IMAP message UID
-     */
-    public function uid2msguid($uid, $deleted = false)
-    {
-        if (!isset($this->uid2msg[$uid])) {
-            // use IMAP SEARCH to get the right message
-            $index = $this->imap->search_once($this->folder->name, ($deleted ? '' : 'UNDELETED ') . 'HEADER SUBJECT ' . $uid);
-            $results = $index->get();
-            $this->uid2msg[$uid] = $results[0];
-        }
-
-        return $this->uid2msg[$uid];
-    }
-
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_note.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_note.php
deleted file mode 100644
index 8546927..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_note.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for note objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage_cache_note extends kolab_storage_cache
-{
-    
-}
\ No newline at end of file
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_task.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_task.php
deleted file mode 100644
index 8b714e6..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_task.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for task objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage_cache_task extends kolab_storage_cache
-{
-    protected $extra_cols = array('dtstart','dtend');
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     *
-     * @override
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = parent::_serialize($object);
-
-        $sql_data['dtstart'] = $this->_convert_datetime($object['start']);
-        $sql_data['dtend']   = $this->_convert_datetime($object['due']);
-
-        return $sql_data;
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_config.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_config.php
deleted file mode 100644
index e843e97..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_config.php
+++ /dev/null
@@ -1,918 +0,0 @@
-<?php
-
-/**
- * Kolab storage class providing access to configuration objects on a Kolab server.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage_config
-{
-    const FOLDER_TYPE = 'configuration';
-
-
-    /**
-     * Singleton instace of kolab_storage_config
-     *
-     * @var kolab_storage_config
-     */
-    static protected $instance;
-
-    private $folders;
-    private $default;
-    private $enabled;
-    private $tags;
-
-
-    /**
-     * This implements the 'singleton' design pattern
-     *
-     * @return kolab_storage_config The one and only instance
-     */
-    static function get_instance()
-    {
-        if (!self::$instance) {
-            self::$instance = new kolab_storage_config();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Private constructor (finds default configuration folder as a config source)
-     */
-    private function __construct()
-    {
-        // get all configuration folders
-        $this->folders = kolab_storage::get_folders(self::FOLDER_TYPE, false);
-
-        foreach ($this->folders as $folder) {
-            if ($folder->default) {
-                $this->default = $folder;
-                break;
-            }
-        }
-
-        // if no folder is set as default, choose the first one
-        if (!$this->default) {
-            $this->default = reset($this->folders);
-        }
-
-        // attempt to create a default folder if it does not exist
-        if (!$this->default) {
-            $folder_name = 'Configuration';
-            $folder_type = self::FOLDER_TYPE . '.default';
-
-            if (kolab_storage::folder_create($folder_name, $folder_type, true)) {
-                $this->default = new kolab_storage_folder($folder_name, $folder_type);
-            }
-        }
-
-        // check if configuration folder exist
-        if ($this->default && $this->default->name) {
-            $this->enabled = true;
-        }
-    }
-
-    /**
-     * Check wether any configuration storage (folder) exists
-     *
-     * @return bool
-     */
-    public function is_enabled()
-    {
-        return $this->enabled;
-    }
-
-    /**
-     * Get configuration objects
-     *
-     * @param array $filter  Search filter
-     * @param bool  $default Enable to get objects only from default folder
-     * @param int   $limit   Max. number of records (per-folder)
-     *
-     * @return array List of objects
-     */
-    public function get_objects($filter = array(), $default = false, $limit = 0)
-    {
-        $list = array();
-
-        foreach ($this->folders as $folder) {
-            // we only want to read from default folder
-            if ($default && !$folder->default) {
-                continue;
-            }
-
-            // for better performance it's good to assume max. number of records
-            if ($limit) {
-                $folder->set_order_and_limit(null, $limit);
-            }
-
-            foreach ($folder->select($filter) as $object) {
-                unset($object['_formatobj']);
-                $list[] = $object;
-            }
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get configuration object
-     *
-     * @param string $uid     Object UID
-     * @param bool   $default Enable to get objects only from default folder
-     *
-     * @return array Object data
-     */
-    public function get_object($uid, $default = false)
-    {
-        foreach ($this->folders as $folder) {
-            // we only want to read from default folder
-            if ($default && !$folder->default) {
-                continue;
-            }
-
-            if ($object = $folder->get_object($uid)) {
-                return $object;
-            }
-        }
-    }
-
-    /**
-     * Create/update configuration object
-     *
-     * @param array  $object Object data
-     * @param string $type   Object type
-     *
-     * @return bool True on success, False on failure
-     */
-    public function save(&$object, $type)
-    {
-        if (!$this->enabled) {
-            return false;
-        }
-
-        $folder = $this->find_folder($object);
-
-        if ($type) {
-            $object['type'] = $type;
-        }
-
-        $status = $folder->save($object, self::FOLDER_TYPE . '.' . $object['type'], $object['uid']);
-
-        // on success, update cached tags list
-        if ($status && is_array($this->tags)) {
-            $found = false;
-            unset($object['_formatobj']); // we don't need it anymore
-
-            foreach ($this->tags as $idx => $tag) {
-                if ($tag['uid'] == $object['uid']) {
-                    $found = true;
-                    $this->tags[$idx] = $object;
-                }
-            }
-
-            if (!$found) {
-                $this->tags[] = $object;
-            }
-        }
-
-        return !empty($status);
-    }
-
-    /**
-     * Remove configuration object
-     *
-     * @param string $uid Object UID
-     *
-     * @return bool True on success, False on failure
-     */
-    public function delete($uid)
-    {
-        if (!$this->enabled) {
-            return false;
-        }
-
-        // fetch the object to find folder
-        $object = $this->get_object($uid);
-
-        if (!$object) {
-            return false;
-        }
-
-        $folder = $this->find_folder($object);
-        $status = $folder->delete($uid);
-
-        // on success, update cached tags list
-        if ($status && is_array($this->tags)) {
-            foreach ($this->tags as $idx => $tag) {
-                if ($tag['uid'] == $uid) {
-                    unset($this->tags[$idx]);
-                    break;
-                }
-            }
-        }
-
-        return $status;
-    }
-
-    /**
-     * Find folder
-     */
-    public function find_folder($object = array())
-    {
-        // find folder object
-        if ($object['_mailbox']) {
-            foreach ($this->folders as $folder) {
-                if ($folder->name == $object['_mailbox']) {
-                    break;
-                }
-            }
-        }
-        else {
-            $folder = $this->default;
-        }
-
-        return $folder;
-    }
-
-    /**
-     * Builds relation member URI
-     *
-     * @param string|array Object UUID or Message folder, UID, Search headers (Message-Id, Date)
-     *
-     * @return string $url Member URI
-     */
-    public static function build_member_url($params)
-    {
-        // param is object UUID
-        if (is_string($params) && !empty($params)) {
-            return 'urn:uuid:' . $params;
-        }
-
-        if (empty($params) || !strlen($params['folder'])) {
-            return null;
-        }
-
-        $rcube   = rcube::get_instance();
-        $storage = $rcube->get_storage();
-        list($username, $domain) = explode('@', $rcube->get_user_name());
-
-        if (strlen($domain)) {
-            $domain = '@' . $domain;
-        }
-
-        // modify folder spec. according to namespace
-        $folder = $params['folder'];
-        $ns     = $storage->folder_namespace($folder);
-
-        if ($ns == 'shared') {
-            // Note: this assumes there's only one shared namespace root
-            if ($ns = $storage->get_namespace('shared')) {
-                if ($prefix = $ns[0][0]) {
-                    $folder = substr($folder, strlen($prefix));
-                }
-            }
-        }
-        else {
-            if ($ns == 'other') {
-                // Note: this assumes there's only one other users namespace root
-                if ($ns = $storage->get_namespace('other')) {
-                    if ($prefix = $ns[0][0]) {
-                        list($otheruser, $path) = explode('/', substr($folder, strlen($prefix)), 2);
-                        $folder = 'user/' . $otheruser . $domain . '/' . $path;
-                    }
-                }
-            }
-            else {
-                $folder = 'user/' . $username . $domain . '/' . $folder;
-            }
-        }
-
-        $folder = implode('/', array_map('rawurlencode', explode('/', $folder)));
-
-        // build URI
-        $url = 'imap:///' . $folder;
-
-        // UID is optional here because sometimes we want
-        // to build just a member uri prefix
-        if ($params['uid']) {
-            $url .= '/' . $params['uid'];
-        }
-
-        unset($params['folder']);
-        unset($params['uid']);
-
-        if (!empty($params)) {
-            $url .= '?' . http_build_query($params, '', '&');
-        }
-
-        return $url;
-    }
-
-    /**
-     * Parses relation member string
-     *
-     * @param string $url Member URI
-     *
-     * @return array Message folder, UID, Search headers (Message-Id, Date)
-     */
-    public static function parse_member_url($url)
-    {
-        // Look for IMAP URI:
-        // imap:///(user/username@domain|shared)/<folder>/<UID>?<search_params>
-        if (strpos($url, 'imap:///') === 0) {
-            $rcube   = rcube::get_instance();
-            $storage = $rcube->get_storage();
-
-            // parse_url does not work with imap:/// prefix
-            $url   = parse_url(substr($url, 8));
-            $path  = explode('/', $url['path']);
-            parse_str($url['query'], $params);
-
-            $uid  = array_pop($path);
-            $ns   = array_shift($path);
-            $path = array_map('rawurldecode', $path);
-
-            // resolve folder name
-            if ($ns == 'user') {
-                $username = array_shift($path);
-                $folder   = implode('/', $path);
-
-                if ($username != $rcube->get_user_name()) {
-                    list($user, $domain) = explode('@', $username);
-
-                    // Note: this assumes there's only one other users namespace root
-                    if ($ns = $storage->get_namespace('other')) {
-                        if ($prefix = $ns[0][0]) {
-                            $folder = $prefix . $user . '/' . $folder;
-                        }
-                    }
-                }
-                else if (!strlen($folder)) {
-                    $folder = 'INBOX';
-                }
-            }
-            else {
-                $folder = $ns . '/' . implode('/', $path);
-                // Note: this assumes there's only one shared namespace root
-                if ($ns = $storage->get_namespace('shared')) {
-                    if ($prefix = $ns[0][0]) {
-                        $folder = $prefix . $folder;
-                    }
-                }
-            }
-
-            return array(
-                'folder' => $folder,
-                'uid'    => $uid,
-                'params' => $params,
-            );
-        }
-
-        return false;
-    }
-
-    /**
-     * Build array of member URIs from set of messages
-     *
-     * @param string $folder   Folder name
-     * @param array  $messages Array of rcube_message objects
-     *
-     * @return array List of members (IMAP URIs)
-     */
-    public static function build_members($folder, $messages)
-    {
-        $members = array();
-
-        foreach ((array) $messages as $msg) {
-            $params = array(
-                'folder' => $folder,
-                'uid'    => $msg->uid,
-            );
-
-            // add search parameters:
-            // we don't want to build "invalid" searches e.g. that
-            // will return false positives (more or wrong messages)
-            if (($messageid = $msg->get('message-id', false)) && ($date = $msg->get('date', false))) {
-                $params['message-id'] = $messageid;
-                $params['date']       = $date;
-
-                if ($subject = $msg->get('subject', false)) {
-                    $params['subject'] = substr($subject, 0, 256);
-                }
-            }
-
-            $members[] = self::build_member_url($params);
-        }
-
-        return $members;
-    }
-
-    /**
-     * Resolve/validate/update members (which are IMAP URIs) of relation object.
-     *
-     * @param array $tag   Tag object
-     * @param bool  $force Force members list update
-     *
-     * @return array Folder/UIDs list
-     */
-    public static function resolve_members(&$tag, $force = true)
-    {
-        $result = array();
-
-        foreach ((array) $tag['members'] as $member) {
-            // IMAP URI members
-            if ($url = self::parse_member_url($member)) {
-                $folder = $url['folder'];
-
-                if (!$force) {
-                    $result[$folder][] = $url['uid'];
-                }
-                else {
-                    $result[$folder]['uid'][]    = $url['uid'];
-                    $result[$folder]['params'][] = $url['params'];
-                    $result[$folder]['member'][] = $member;
-                }
-            }
-        }
-
-        if (empty($result) || !$force) {
-            return $result;
-        }
-
-        $rcube   = rcube::get_instance();
-        $storage = $rcube->get_storage();
-        $search  = array();
-        $missing = array();
-
-        // first we search messages by Folder+UID
-        foreach ($result as $folder => $data) {
-            // @FIXME: maybe better use index() which is cached?
-            // @TODO: consider skip_deleted option
-            $index = $storage->search_once($folder, 'UID ' . rcube_imap_generic::compressMessageSet($data['uid']));
-            $uids  = $index->get();
-
-            // messages that were not found need to be searched by search parameters
-            $not_found = array_diff($data['uid'], $uids);
-            if (!empty($not_found)) {
-                foreach ($not_found as $uid) {
-                    $idx = array_search($uid, $data['uid']);
-
-                    if ($p = $data['params'][$idx]) {
-                        $search[] = $p;
-                    }
-
-                    $missing[] = $result[$folder]['member'][$idx];
-
-                    unset($result[$folder]['uid'][$idx]);
-                    unset($result[$folder]['params'][$idx]);
-                    unset($result[$folder]['member'][$idx]);
-                }
-            }
-
-            $result[$folder] = $uids;
-        }
-
-        // search in all subscribed mail folders using search parameters
-        if (!empty($search)) {
-            // remove not found members from the members list
-            $tag['members'] = array_diff($tag['members'], $missing);
-
-            // get subscribed folders
-            $folders = $storage->list_folders_subscribed('', '*', 'mail', null, true);
-
-            // @TODO: do this search in chunks (for e.g. 10 messages)?
-            $search_str = '';
-
-            foreach ($search as $p) {
-                $search_params = array();
-                foreach ($p as $key => $val) {
-                    $key = strtoupper($key);
-                    // don't search by subject, we don't want false-positives
-                    if ($key != 'SUBJECT') {
-                        $search_params[] = 'HEADER ' . $key . ' ' . rcube_imap_generic::escape($val);
-                    }
-                }
-
-                $search_str .= ' (' . implode(' ', $search_params) . ')';
-            }
-
-            $search_str = trim(str_repeat(' OR', count($search)-1) . $search_str);
-
-            // search
-            $search = $storage->search_once($folders, $search_str);
-
-            // handle search result
-            $folders = (array) $search->get_parameters('MAILBOX');
-
-            foreach ($folders as $folder) {
-                $set  = $search->get_set($folder);
-                $uids = $set->get();
-
-                if (!empty($uids)) {
-                    $msgs    = $storage->fetch_headers($folder, $uids, false);
-                    $members = self::build_members($folder, $msgs);
-
-                    // merge new members into the tag members list
-                    $tag['members'] = array_merge($tag['members'], $members);
-
-                    // add UIDs into the result
-                    $result[$folder] = array_unique(array_merge((array)$result[$folder], $uids));
-                }
-            }
-
-            // update tag object with new members list
-            $tag['members'] = array_unique($tag['members']);
-            kolab_storage_config::get_instance()->save($tag, 'relation', false);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Assign tags to kolab objects
-     *
-     * @param array $records List of kolab objects
-     *
-     * @return array List of tags
-     */
-    public function apply_tags(&$records)
-    {
-        // first convert categories into tags
-        foreach ($records as $i => $rec) {
-            if (!empty($rec['categories'])) {
-                $folder = new kolab_storage_folder($rec['_mailbox']);
-                if ($object = $folder->get_object($rec['uid'])) {
-                    $tags = $rec['categories'];
-
-                    unset($object['categories']);
-                    unset($records[$i]['categories']);
-
-                    $this->save_tags($rec['uid'], $tags);
-                    $folder->save($object, $rec['_type'], $rec['uid']);
-                }
-            }
-        }
-
-        $tags = array();
-
-        // assign tags to objects
-        foreach ($this->get_tags() as $tag) {
-            foreach ($records as $idx => $rec) {
-                $uid = self::build_member_url($rec['uid']);
-                if (in_array($uid, (array) $tag['members'])) {
-                    $records[$idx]['tags'][] = $tag['name'];
-                }
-            }
-
-            $tags[] = $tag['name'];
-        }
-
-        $tags = array_unique($tags);
-
-        return $tags;
-    }
-
-    /**
-     * Update object tags
-     *
-     * @param string $uid  Kolab object UID
-     * @param array  $tags List of tag names
-     */
-    public function save_tags($uid, $tags)
-    {
-        $url       = self::build_member_url($uid);
-        $relations = $this->get_tags();
-
-        foreach ($relations as $idx => $relation) {
-            $selected = !empty($tags) && in_array($relation['name'], $tags);
-            $found    = !empty($relation['members']) && in_array($url, $relation['members']);
-            $update   = false;
-
-            // remove member from the relation
-            if ($found && !$selected) {
-                $relation['members'] = array_diff($relation['members'], (array) $url);
-                $update = true;
-            }
-            // add member to the relation
-            else if (!$found && $selected) {
-                $relation['members'][] = $url;
-                $update = true;
-            }
-
-            if ($update) {
-                if ($this->save($relation, 'relation')) {
-                    $this->tags[$idx] = $relation; // update in-memory cache
-                }
-            }
-
-            if ($selected) {
-                $tags = array_diff($tags, (array)$relation['name']);
-            }
-        }
-
-        // create new relations
-        if (!empty($tags)) {
-            foreach ($tags as $tag) {
-                $relation = array(
-                    'name'     => $tag,
-                    'members'  => (array) $url,
-                    'category' => 'tag',
-                );
-
-                if ($this->save($relation, 'relation')) {
-                    $this->tags[] = $relation; // update in-memory cache
-                }
-            }
-        }
-    }
-
-    /**
-     * Get tags (all or referring to specified object)
-     *
-     * @param string $member Optional object UID or mail message-id
-     * @param int    $limit  Max. number of records (per-folder)
-     *                       Used when searching by member
-     *
-     * @return array List of Relation objects
-     */
-    public function get_tags($member = '*', $limit = 0)
-    {
-        if (!isset($this->tags)) {
-            $default = true;
-            $filter  = array(
-                array('type', '=', 'relation'),
-                array('category', '=', 'tag')
-            );
-
-            // use faster method
-            if ($member && $member != '*') {
-                $filter[] = array('member', '=', $member);
-                $tags = $this->get_objects($filter, $default, $limit);
-            }
-            else {
-                $this->tags = $tags = $this->get_objects($filter, $default);
-            }
-        }
-        else {
-            $tags = $this->tags;
-        }
-
-        if ($member === '*') {
-            return $tags;
-        }
-
-        $result = array();
-
-        if ($member[0] == '<') {
-            $search_msg = urlencode($member);
-        }
-        else {
-            $search_uid = self::build_member_url($member);
-        }
-
-        foreach ($tags as $tag) {
-            if ($search_uid && in_array($search_uid, (array) $tag['members'])) {
-                $result[] = $tag;
-            }
-            else if ($search_msg) {
-                foreach ($tag['members'] as $m) {
-                    if (strpos($m, $search_msg) !== false) {
-                        $result[] = $tag;
-                        break;
-                    }
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Find objects linked with the given groupware object through a relation
-     *
-     * @param string Object UUID
-     * @param array List of related URIs
-     */
-    public function get_object_links($uid)
-    {
-        $links = array();
-        $object_uri = self::build_member_url($uid);
-
-        foreach ($this->get_relations_for_member($uid) as $relation) {
-            if (in_array($object_uri, (array) $relation['members'])) {
-                // make relation members up-to-date
-                kolab_storage_config::resolve_members($relation);
-
-                foreach ($relation['members'] as $member) {
-                    if ($member != $object_uri) {
-                        $links[] = $member;
-                    }
-                }
-            }
-        }
-
-        return array_unique($links);
-    }
-
-    /**
-     *
-     */
-    public function save_object_links($uid, $links, $remove = array())
-    {
-        $object_uri = self::build_member_url($uid);
-        $relations = $this->get_relations_for_member($uid);
-        $done = false;
-
-        foreach ($relations as $relation) {
-            // make relation members up-to-date
-            kolab_storage_config::resolve_members($relation);
-
-            // remove and add links
-            $members = array_diff($relation['members'], (array)$remove);
-            $members = array_unique(array_merge($members, $links));
-
-            // make sure the object_uri is still a member
-            if (!in_array($object_uri, $members)) {
-                $members[$object_uri];
-            }
-
-            // remove relation if no other members remain
-            if (count($members) <= 1) {
-                $done = $this->delete($relation['uid']);
-            }
-            // update relation object if members changed
-            else if (count(array_diff($members, $relation['members'])) || count(array_diff($relation['members'], $members))) {
-                $relation['members'] = $members;
-                $done = $this->save($relation, 'relation');
-                $links = array();
-            }
-            // no changes, we're happy
-            else {
-                $done = true;
-                $links = array();
-            }
-        }
-
-        // create a new relation
-        if (!$done && !empty($links)) {
-            $relation = array(
-                'members'  => array_merge($links, array($object_uri)),
-                'category' => 'generic',
-            );
-
-            $ret = $this->save($relation, 'relation');
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Find relation objects referring to specified note
-     */
-    public function get_relations_for_member($uid, $reltype = 'generic')
-    {
-        $default = true;
-        $filter  = array(
-            array('type', '=', 'relation'),
-            array('category', '=', $reltype),
-            array('member', '=', $uid),
-        );
-
-        return $this->get_objects($filter, $default, 100);
-    }
-
-    /**
-     * Find kolab objects assigned to specified e-mail message
-     *
-     * @param rcube_message $message E-mail message
-     * @param string        $folder  Folder name
-     * @param string        $type    Result objects type
-     *
-     * @return array List of kolab objects
-     */
-    public function get_message_relations($message, $folder, $type)
-    {
-        static $_cache = array();
-
-        $result  = array();
-        $uids    = array();
-        $default = true;
-        $uri     = self::get_message_uri($message, $folder);
-        $filter  = array(
-            array('type', '=', 'relation'),
-            array('category', '=', 'generic'),
-        );
-
-        // query by message-id
-        $member_id = $message->get('message-id', false);
-        if (empty($member_id)) {
-            // derive message identifier from URI
-            $member_id = md5($uri);
-        }
-        $filter[] = array('member', '=', $member_id);
-
-        if (!isset($_cache[$uri])) {
-            // get UIDs of related groupware objects
-            foreach ($this->get_objects($filter, $default) as $relation) {
-                // we don't need to update members if the URI is found
-                if (!in_array($uri, $relation['members'])) {
-                    // update members...
-                    $messages = kolab_storage_config::resolve_members($relation);
-                    // ...and check again
-                    if (empty($messages[$folder]) || !in_array($message->uid, $messages[$folder])) {
-                        continue;
-                    }
-                }
-
-                // find groupware object UID(s)
-                foreach ($relation['members'] as $member) {
-                    if (strpos($member, 'urn:uuid:') === 0) {
-                        $uids[] = substr($member, 9);
-                    }
-                }
-            }
-
-            // remember this lookup
-            $_cache[$uri] = $uids;
-        }
-        else {
-            $uids = $_cache[$uri];
-        }
-
-        // get kolab objects of specified type
-        if (!empty($uids)) {
-            $query  = array(array('uid', '=', array_unique($uids)));
-            $result = kolab_storage::select($query, $type);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Build a URI representing the given message reference
-     */
-    public static function get_message_uri($headers, $folder)
-    {
-        $params = array(
-            'folder' => $headers->folder ?: $folder,
-            'uid'    => $headers->uid,
-        );
-
-        if (($messageid = $headers->get('message-id', false)) && ($date = $headers->get('date', false))) {
-            $params['message-id'] = $messageid;
-            $params['date']       = $date;
-
-            if ($subject = $headers->get('subject')) {
-                $params['subject'] = $subject;
-            }
-        }
-
-        return self::build_member_url($params);
-    }
-
-    /**
-     * Resolve the email message reference from the given URI
-     */
-    public function get_message_reference($uri, $rel = null)
-    {
-        if ($linkref = self::parse_member_url($uri)) {
-            $linkref['subject'] = $linkref['params']['subject'];
-            $linkref['uri']     = $uri;
-
-            $rcmail = rcube::get_instance();
-            if (method_exists($rcmail, 'url')) {
-                $linkref['mailurl'] = $rcmail->url(array(
-                    'task'   => 'mail',
-                    'action' => 'show',
-                    'mbox'   => $linkref['folder'],
-                    'uid'    => $linkref['uid'],
-                    'rel'    => $rel,
-                ));
-            }
-
-            unset($linkref['params']);
-        }
-
-        return $linkref;
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_dataset.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_dataset.php
deleted file mode 100644
index 9ddf3f9..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_dataset.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/**
- * Dataset class providing the results of a select operation on a kolab_storage_folder.
- *
- * Can be used as a normal array as well as an iterator in foreach() loops.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_storage_dataset implements Iterator, ArrayAccess, Countable
-{
-    private $cache;  // kolab_storage_cache instance to use for fetching data
-    private $memlimit = 0;
-    private $buffer = false;
-    private $index = array();
-    private $data = array();
-    private $iteratorkey = 0;
-    private $error = null;
-
-    /**
-     * Default constructor
-     *
-     * @param object kolab_storage_cache instance to be used for fetching objects upon access
-     */
-    public function __construct($cache)
-    {
-        $this->cache = $cache;
-
-        // enable in-memory buffering up until 1/5 of the available memory
-        if (function_exists('memory_get_usage')) {
-            $this->memlimit = parse_bytes(ini_get('memory_limit')) / 5;
-            $this->buffer = true;
-        }
-    }
-
-    /**
-     * Return error state
-     */
-    public function is_error()
-    {
-        return !empty($this->error);
-    }
-
-    /**
-     * Set error state
-     */
-    public function set_error($err)
-    {
-        $this->error = $err;
-    }
-
-
-    /*** Implement PHP Countable interface ***/
-
-    public function count()
-    {
-        return count($this->index);
-    }
-
-
-    /*** Implement PHP ArrayAccess interface ***/
-
-    public function offsetSet($offset, $value)
-    {
-        $uid = $value['_msguid'];
-
-        if (is_null($offset)) {
-            $offset = count($this->index);
-            $this->index[] = $uid;
-        }
-        else {
-            $this->index[$offset] = $uid;
-        }
-
-        // keep full payload data in memory if possible
-        if ($this->memlimit && $this->buffer && isset($value['_mailbox'])) {
-            $this->data[$offset] = $value;
-
-            // check memory usage and stop buffering
-            if ($offset % 10 == 0) {
-                $this->buffer = memory_get_usage() < $this->memlimit;
-            }
-        }
-    }
-
-    public function offsetExists($offset)
-    {
-        return isset($this->index[$offset]);
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->index[$offset]);
-    }
-
-    public function offsetGet($offset)
-    {
-        if (isset($this->data[$offset])) {
-            return $this->data[$offset];
-        }
-        else if ($msguid = $this->index[$offset]) {
-            return $this->cache->get($msguid);
-        }
-
-        return null;
-    }
-
-
-    /*** Implement PHP Iterator interface ***/
-
-    public function current()
-    {
-        return $this->offsetGet($this->iteratorkey);
-    }
-
-    public function key()
-    {
-        return $this->iteratorkey;
-    }
-
-    public function next()
-    {
-        $this->iteratorkey++;
-        return $this->valid();
-    }
-
-    public function rewind()
-    {
-        $this->iteratorkey = 0;
-    }
-
-    public function valid()
-    {
-        return !empty($this->index[$this->iteratorkey]);
-    }
-
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder.php
deleted file mode 100644
index 8d86d70..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder.php
+++ /dev/null
@@ -1,1173 +0,0 @@
-<?php
-
-/**
- * The kolab_storage_folder class represents an IMAP folder on the Kolab server.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2012-2013, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class kolab_storage_folder extends kolab_storage_folder_api
-{
-    /**
-     * The kolab_storage_cache instance for caching operations
-     * @var object
-     */
-    public $cache;
-
-    /**
-     * Indicate validity status
-     * @var boolean
-     */
-    public $valid = false;
-
-    protected $error = 0;
-
-    protected $resource_uri;
-
-
-    /**
-     * Default constructor
-     *
-     * @param string The folder name/path
-     * @param string Expected folder type
-     */
-    function __construct($name, $type = null, $type_annotation = null)
-    {
-        parent::__construct($name);
-        $this->imap->set_options(array('skip_deleted' => true));
-        $this->set_folder($name, $type, $type_annotation);
-    }
-
-
-    /**
-     * Set the IMAP folder this instance connects to
-     *
-     * @param string The folder name/path
-     * @param string Expected folder type
-     * @param string Optional folder type if known
-     */
-    public function set_folder($name, $type = null, $type_annotation = null)
-    {
-        if (empty($type_annotation)) {
-            $type_annotation = kolab_storage::folder_type($name);
-        }
-
-        $oldtype = $this->type;
-        list($this->type, $suffix) = explode('.', $type_annotation);
-        $this->default      = $suffix == 'default';
-        $this->subtype      = $this->default ? '' : $suffix;
-        $this->name         = $name;
-        $this->id           = kolab_storage::folder_id($name);
-        $this->valid        = !empty($this->type) && $this->type != 'mail' && (!$type || $this->type == $type);
-
-        if (!$this->valid) {
-            $this->error = $this->imap->get_error_code() < 0 ? kolab_storage::ERROR_IMAP_CONN : kolab_storage::ERROR_INVALID_FOLDER;
-        }
-
-        // reset cached object properties
-        $this->owner = $this->namespace = $this->resource_uri = $this->info = $this->idata = null;
-
-        // get a new cache instance if folder type changed
-        if (!$this->cache || $this->type != $oldtype)
-            $this->cache = kolab_storage_cache::factory($this);
-        else
-            $this->cache->set_folder($this);
-
-        $this->imap->set_folder($this->name);
-    }
-
-    /**
-     * Returns code of last error
-     *
-     * @return int Error code
-     */
-    public function get_error()
-    {
-        return $this->error ?: $this->cache->get_error();
-    }
-
-    /**
-     * Check IMAP connection error state
-     */
-    public function check_error()
-    {
-        if (($err_code = $this->imap->get_error_code()) < 0) {
-            $this->error = kolab_storage::ERROR_IMAP_CONN;
-            if (($res_code = $this->imap->get_response_code()) !== 0 && in_array($res_code, array(rcube_storage::NOPERM, rcube_storage::READONLY))) {
-                $this->error = kolab_storage::ERROR_NO_PERMISSION;
-            }
-        }
-
-        return $this->error;
-    }
-
-    /**
-     * Compose a unique resource URI for this IMAP folder
-     */
-    public function get_resource_uri()
-    {
-        if (!empty($this->resource_uri)) {
-            return $this->resource_uri;
-        }
-
-        // strip namespace prefix from folder name
-        $ns     = $this->get_namespace();
-        $nsdata = $this->imap->get_namespace($ns);
-
-        if (is_array($nsdata[0]) && strlen($nsdata[0][0]) && strpos($this->name, $nsdata[0][0]) === 0) {
-            $subpath = substr($this->name, strlen($nsdata[0][0]));
-            if ($ns == 'other') {
-                list($user, $suffix) = explode($nsdata[0][1], $subpath, 2);
-                $subpath = $suffix;
-            }
-        }
-        else {
-            $subpath = $this->name;
-        }
-
-        // compose fully qualified ressource uri for this instance
-        $this->resource_uri = 'imap://' . urlencode($this->get_owner(true)) . '@' . $this->imap->options['host'] . '/' . $subpath;
-        return $this->resource_uri;
-    }
-
-    /**
-     * Helper method to extract folder UID metadata
-     *
-     * @return string Folder's UID
-     */
-    public function get_uid()
-    {
-        // UID is defined in folder METADATA
-        $metakeys = array(kolab_storage::UID_KEY_SHARED, kolab_storage::UID_KEY_CYRUS);
-        $metadata = $this->get_metadata($metakeys);
-
-        if ($metadata !== null) {
-            foreach ($metakeys as $key) {
-                if ($uid = $metadata[$key]) {
-                    return $uid;
-                }
-            }
-
-            // generate a folder UID and set it to IMAP
-            $uid = rtrim(chunk_split(md5($this->name . $this->get_owner() . uniqid('-', true)), 12, '-'), '-');
-            if ($this->set_uid($uid)) {
-                return $uid;
-            }
-        }
-
-        $this->check_error();
-
-        // create hash from folder name if we can't write the UID metadata
-        return md5($this->name . $this->get_owner());
-    }
-
-    /**
-     * Helper method to set an UID value to the given IMAP folder instance
-     *
-     * @param string Folder's UID
-     * @return boolean True on succes, False on failure
-     */
-    public function set_uid($uid)
-    {
-        $success = $this->set_metadata(array(kolab_storage::UID_KEY_SHARED => $uid));
-
-        $this->check_error();
-        return $success;
-    }
-
-    /**
-     * Compose a folder Etag identifier
-     */
-    public function get_ctag()
-    {
-        $fdata = $this->get_imap_data();
-        $this->check_error();
-        return sprintf('%d-%d-%d', $fdata['UIDVALIDITY'], $fdata['HIGHESTMODSEQ'], $fdata['UIDNEXT']);
-    }
-
-    /**
-     * Check activation status of this folder
-     *
-     * @return boolean True if enabled, false if not
-     */
-    public function is_active()
-    {
-        return kolab_storage::folder_is_active($this->name);
-    }
-
-    /**
-     * Change activation status of this folder
-     *
-     * @param boolean The desired subscription status: true = active, false = not active
-     *
-     * @return True on success, false on error
-     */
-    public function activate($active)
-    {
-        return $active ? kolab_storage::folder_activate($this->name) : kolab_storage::folder_deactivate($this->name);
-    }
-
-    /**
-     * Check subscription status of this folder
-     *
-     * @return boolean True if subscribed, false if not
-     */
-    public function is_subscribed()
-    {
-        return kolab_storage::folder_is_subscribed($this->name);
-    }
-
-    /**
-     * Change subscription status of this folder
-     *
-     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
-     *
-     * @return True on success, false on error
-     */
-    public function subscribe($subscribed)
-    {
-        return $subscribed ? kolab_storage::folder_subscribe($this->name) : kolab_storage::folder_unsubscribe($this->name);
-    }
-
-    /**
-     * Get number of objects stored in this folder
-     *
-     * @param mixed  Pseudo-SQL query as list of filter parameter triplets
-     *    or string with object type (e.g. contact, event, todo, journal, note, configuration)
-     * @return integer The number of objects of the given type
-     * @see self::select()
-     */
-    public function count($query = null)
-    {
-        if (!$this->valid) {
-            return 0;
-        }
-
-        // synchronize cache first
-        $this->cache->synchronize();
-
-        return $this->cache->count($this->_prepare_query($query));
-    }
-
-
-    /**
-     * List all Kolab objects of the given type
-     *
-     * @param string  $type Object type (e.g. contact, event, todo, journal, note, configuration)
-     * @return array  List of Kolab data objects (each represented as hash array)
-     */
-    public function get_objects($type = null)
-    {
-        if (!$type) $type = $this->type;
-
-        if (!$this->valid) {
-            return array();
-        }
-
-        // synchronize caches
-        $this->cache->synchronize();
-
-        // fetch objects from cache
-        return $this->cache->select($this->_prepare_query($type));
-    }
-
-
-    /**
-     * Select *some* Kolab objects matching the given query
-     *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     *   triplet: array('<colname>', '<comparator>', '<value>')
-     * @return array List of Kolab data objects (each represented as hash array)
-     */
-    public function select($query = array())
-    {
-        if (!$this->valid) {
-            return array();
-        }
-
-        // check query argument
-        if (empty($query)) {
-            return $this->get_objects();
-        }
-
-        // synchronize caches
-        $this->cache->synchronize();
-
-        // fetch objects from cache
-        return $this->cache->select($this->_prepare_query($query));
-    }
-
-
-    /**
-     * Getter for object UIDs only
-     *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     * @return array List of Kolab object UIDs
-     */
-    public function get_uids($query = array())
-    {
-        if (!$this->valid) {
-            return array();
-        }
-
-        // synchronize caches
-        $this->cache->synchronize();
-
-        // fetch UIDs from cache
-        return $this->cache->select($this->_prepare_query($query), true);
-    }
-
-    /**
-     * Setter for ORDER BY and LIMIT parameters for cache queries
-     *
-     * @param array   List of columns to order by
-     * @param integer Limit result set to this length
-     * @param integer Offset row
-     */
-    public function set_order_and_limit($sortcols, $length = null, $offset = 0)
-    {
-        $this->cache->set_order_by($sortcols);
-
-        if ($length !== null) {
-            $this->cache->set_limit($length, $offset);
-        }
-    }
-
-    /**
-     * Helper method to sanitize query arguments
-     */
-    private function _prepare_query($query)
-    {
-        // string equals type query
-        // FIXME: should not be called this way!
-        if (is_string($query)) {
-            return $this->cache->has_type_col() && !empty($query) ? array(array('type','=',$query)) : array();
-        }
-
-        foreach ((array)$query as $i => $param) {
-            if ($param[0] == 'type' && !$this->cache->has_type_col()) {
-                unset($query[$i]);
-            }
-            else if (($param[0] == 'dtstart' || $param[0] == 'dtend' || $param[0] == 'changed')) {
-                if (is_object($param[2]) && is_a($param[2], 'DateTime'))
-                    $param[2] = $param[2]->format('U');
-                if (is_numeric($param[2]))
-                    $query[$i][2] = date('Y-m-d H:i:s', $param[2]);
-            }
-        }
-
-        return $query;
-    }
-
-
-    /**
-     * Getter for a single Kolab object, identified by its UID
-     *
-     * @param string $uid  Object UID
-     * @param string $type Object type (e.g. contact, event, todo, journal, note, configuration)
-     *                     Defaults to folder type
-     *
-     * @return array The Kolab object represented as hash array
-     */
-    public function get_object($uid, $type = null)
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        // synchronize caches
-        $this->cache->synchronize();
-
-        $msguid = $this->cache->uid2msguid($uid);
-
-        if ($msguid && ($object = $this->cache->get($msguid, $type))) {
-            return $object;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Fetch a Kolab object attachment which is stored in a separate part
-     * of the mail MIME message that represents the Kolab record.
-     *
-     * @param string   Object's UID
-     * @param string   The attachment's mime number
-     * @param string   IMAP folder where message is stored;
-     *                 If set, that also implies that the given UID is an IMAP UID
-     * @param bool     True to print the part content
-     * @param resource File pointer to save the message part
-     * @param boolean  Disables charset conversion
-     *
-     * @return mixed  The attachment content as binary string
-     */
-    public function get_attachment($uid, $part, $mailbox = null, $print = false, $fp = null, $skip_charset_conv = false)
-    {
-        if ($this->valid && ($msguid = ($mailbox ? $uid : $this->cache->uid2msguid($uid)))) {
-            $this->imap->set_folder($mailbox ? $mailbox : $this->name);
-
-            if (substr($part, 0, 2) == 'i:') {
-                // attachment data is stored in XML
-                if ($object = $this->cache->get($msguid)) {
-                    // load data from XML (attachment content is not stored in cache)
-                    if ($object['_formatobj'] && isset($object['_size'])) {
-                        $object['_attachments'] = array();
-                        $object['_formatobj']->get_attachments($object);
-                    }
-
-                    foreach ($object['_attachments'] as $attach) {
-                        if ($attach['id'] == $part) {
-                            if ($print)   echo $attach['content'];
-                            else if ($fp) fwrite($fp, $attach['content']);
-                            else          return $attach['content'];
-                            return true;
-                        }
-                    }
-                }
-            }
-            else {
-                // return message part from IMAP directly
-                return $this->imap->get_message_part($msguid, $part, null, $print, $fp, $skip_charset_conv);
-            }
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Fetch the mime message from the storage server and extract
-     * the Kolab groupware object from it
-     *
-     * @param string The IMAP message UID to fetch
-     * @param string The object type expected (use wildcard '*' to accept all types)
-     * @param string The folder name where the message is stored
-     *
-     * @return mixed Hash array representing the Kolab object, a kolab_format instance or false if not found
-     */
-    public function read_object($msguid, $type = null, $folder = null)
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        if (!$type) $type = $this->type;
-        if (!$folder) $folder = $this->name;
-
-        $this->imap->set_folder($folder);
-
-        $this->cache->bypass(true);
-        $message = new rcube_message($msguid);
-        $this->cache->bypass(false);
-
-        // Message doesn't exist?
-        if (empty($message->headers)) {
-            return false;
-        }
-
-        // extract the X-Kolab-Type header from the XML attachment part if missing
-        if (empty($message->headers->others['x-kolab-type'])) {
-            foreach ((array)$message->attachments as $part) {
-                if (strpos($part->mimetype, kolab_format::KTYPE_PREFIX) === 0) {
-                    $message->headers->others['x-kolab-type'] = $part->mimetype;
-                    break;
-                }
-            }
-        }
-        // fix buggy messages stating the X-Kolab-Type header twice
-        else if (is_array($message->headers->others['x-kolab-type'])) {
-            $message->headers->others['x-kolab-type'] = reset($message->headers->others['x-kolab-type']);
-        }
-
-        // no object type header found: abort
-        if (empty($message->headers->others['x-kolab-type'])) {
-            rcube::raise_error(array(
-                'code' => 600,
-                'type' => 'php',
-                'file' => __FILE__,
-                'line' => __LINE__,
-                'message' => "No X-Kolab-Type information found in message $msguid ($this->name).",
-            ), true);
-            return false;
-        }
-
-        $object_type  = kolab_format::mime2object_type($message->headers->others['x-kolab-type']);
-        $content_type = kolab_format::KTYPE_PREFIX . $object_type;
-
-        // check object type header and abort on mismatch
-        if ($type != '*' && $object_type != $type)
-            return false;
-
-        $attachments = array();
-
-        // get XML part
-        foreach ((array)$message->attachments as $part) {
-            if (!$xml && ($part->mimetype == $content_type || preg_match('!application/([a-z.]+\+)?xml!', $part->mimetype))) {
-                $xml = $message->get_part_body($part->mime_id, true);
-            }
-            else if ($part->filename || $part->content_id) {
-                $key  = $part->content_id ? trim($part->content_id, '<>') : $part->filename;
-                $size = null;
-
-                // Use Content-Disposition 'size' as for the Kolab Format spec.
-                if (isset($part->d_parameters['size'])) {
-                    $size = $part->d_parameters['size'];
-                }
-                // we can trust part size only if it's not encoded
-                else if ($part->encoding == 'binary' || $part->encoding == '7bit' || $part->encoding == '8bit') {
-                    $size = $part->size;
-                }
-
-                $attachments[$key] = array(
-                    'id'       => $part->mime_id,
-                    'name'     => $part->filename,
-                    'mimetype' => $part->mimetype,
-                    'size'     => $size,
-                );
-            }
-        }
-
-        if (!$xml) {
-            rcube::raise_error(array(
-                'code' => 600,
-                'type' => 'php',
-                'file' => __FILE__,
-                'line' => __LINE__,
-                'message' => "Could not find Kolab data part in message $msguid ($this->name).",
-            ), true);
-            return false;
-        }
-
-        // check kolab format version
-        $format_version = $message->headers->others['x-kolab-mime-version'];
-        if (empty($format_version)) {
-            list($xmltype, $subtype) = explode('.', $object_type);
-            $xmlhead = substr($xml, 0, 512);
-
-            // detect old Kolab 2.0 format
-            if (strpos($xmlhead, '<' . $xmltype) !== false && strpos($xmlhead, 'xmlns=') === false)
-                $format_version = '2.0';
-            else
-                $format_version = '3.0'; // assume 3.0
-        }
-
-        // get Kolab format handler for the given type
-        $format = kolab_format::factory($object_type, $format_version);
-
-        if (is_a($format, 'PEAR_Error'))
-            return false;
-
-        // load Kolab object from XML part
-        $format->load($xml);
-
-        if ($format->is_valid()) {
-            $object = $format->to_array(array('_attachments' => $attachments));
-            $object['_type']      = $object_type;
-            $object['_msguid']    = $msguid;
-            $object['_mailbox']   = $this->name;
-            $object['_formatobj'] = $format;
-
-            return $object;
-        }
-        else {
-            // try to extract object UID from XML block
-            if (preg_match('!<uid>(.+)</uid>!Uims', $xml, $m))
-                $msgadd = " UID = " . trim(strip_tags($m[1]));
-
-            rcube::raise_error(array(
-                'code' => 600,
-                'type' => 'php',
-                'file' => __FILE__,
-                'line' => __LINE__,
-                'message' => "Could not parse Kolab object data in message $msguid ($this->name)." . $msgadd,
-            ), true);
-        }
-
-        return false;
-    }
-
-    /**
-     * Save an object in this folder.
-     *
-     * @param array  $object The array that holds the data of the object.
-     * @param string $type   The type of the kolab object.
-     * @param string $uid    The UID of the old object if it existed before
-     *
-     * @return mixed False on error or IMAP message UID on success
-     */
-    public function save(&$object, $type = null, $uid = null)
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        if (!$type)
-            $type = $this->type;
-
-        // copy attachments from old message
-        $copyfrom = $object['_copyfrom'] ?: $object['_msguid'];
-        if (!empty($copyfrom) && ($old = $this->cache->get($copyfrom, $type, $object['_mailbox']))) {
-            foreach ((array)$old['_attachments'] as $key => $att) {
-                if (!isset($object['_attachments'][$key])) {
-                    $object['_attachments'][$key] = $old['_attachments'][$key];
-                }
-                // unset deleted attachment entries
-                if ($object['_attachments'][$key] == false) {
-                    unset($object['_attachments'][$key]);
-                }
-                // load photo.attachment from old Kolab2 format to be directly embedded in xcard block
-                else if ($type == 'contact' && ($key == 'photo.attachment' || $key == 'kolab-picture.png') && $att['id']) {
-                    if (!isset($object['photo']))
-                        $object['photo'] = $this->get_attachment($copyfrom, $att['id'], $object['_mailbox']);
-                    unset($object['_attachments'][$key]);
-                }
-            }
-        }
-
-        // save contact photo to attachment for Kolab2 format
-        if (kolab_storage::$version == '2.0' && $object['photo']) {
-            $attkey = 'kolab-picture.png';  // this file name is hard-coded in libkolab/kolabformatV2/contact.cpp
-            $object['_attachments'][$attkey] = array(
-                'mimetype'=> rcube_mime::image_content_type($object['photo']),
-                'content' => preg_match('![^a-z0-9/=+-]!i', $object['photo']) ? $object['photo'] : base64_decode($object['photo']),
-            );
-        }
-
-        // process attachments
-        if (is_array($object['_attachments'])) {
-            $numatt = count($object['_attachments']);
-            foreach ($object['_attachments'] as $key => $attachment) {
-                // FIXME: kolab_storage and Roundcube attachment hooks use different fields!
-                if (empty($attachment['content']) && !empty($attachment['data'])) {
-                    $attachment['content'] = $attachment['data'];
-                    unset($attachment['data'], $object['_attachments'][$key]['data']);
-                }
-
-                // make sure size is set, so object saved in cache contains this info
-                if (!isset($attachment['size'])) {
-                    if (!empty($attachment['content'])) {
-                        if (is_resource($attachment['content'])) {
-                            // this need to be a seekable resource, otherwise
-                            // fstat() failes and we're unable to determine size
-                            // here nor in rcube_imap_generic before IMAP APPEND
-                            $stat = fstat($attachment['content']);
-                            $attachment['size'] = $stat ? $stat['size'] : 0;
-                        }
-                        else {
-                            $attachment['size'] = strlen($attachment['content']);
-                        }
-                    }
-                    else if (!empty($attachment['path'])) {
-                        $attachment['size'] = filesize($attachment['path']);
-                    }
-                    $object['_attachments'][$key] = $attachment;
-                }
-
-                // generate unique keys (used as content-id) for attachments
-                if (is_numeric($key) && $key < $numatt) {
-                    // derrive content-id from attachment file name
-                    $ext = preg_match('/(\.[a-z0-9]{1,6})$/i', $attachment['name'], $m) ? $m[1] : null;
-                    $basename = preg_replace('/[^a-z0-9_.-]/i', '', basename($attachment['name'], $ext));  // to 7bit ascii
-                    if (!$basename) $basename = 'noname';
-                    $cid = $basename . '.' . microtime(true) . $key . $ext;
-
-                    $object['_attachments'][$cid] = $attachment;
-                    unset($object['_attachments'][$key]);
-                }
-            }
-        }
-
-        // save recurrence exceptions as individual objects due to lack of support in Kolab v2 format
-        if (kolab_storage::$version == '2.0' && $object['recurrence']['EXCEPTIONS']) {
-            $this->save_recurrence_exceptions($object, $type);
-        }
-
-        // check IMAP BINARY extension support for 'file' objects
-        // allow configuration to workaround bug in Cyrus < 2.4.17
-        $rcmail = rcube::get_instance();
-        $binary = $type == 'file' && !$rcmail->config->get('kolab_binary_disable') && $this->imap->get_capability('BINARY');
-
-        // generate and save object message
-        if ($raw_msg = $this->build_message($object, $type, $binary, $body_file)) {
-            // resolve old msguid before saving
-            if ($uid && empty($object['_msguid']) && ($msguid = $this->cache->uid2msguid($uid))) {
-                $object['_msguid'] = $msguid;
-                $object['_mailbox'] = $this->name;
-            }
-
-            $result = $this->imap->save_message($this->name, $raw_msg, null, false, null, null, $binary);
-
-            // update cache with new UID
-            if ($result) {
-                $old_uid = $object['_msguid'];
-
-                $object['_msguid'] = $result;
-                $object['_mailbox'] = $this->name;
-
-                if ($old_uid) {
-                    // delete old message
-                    $this->cache->bypass(true);
-                    $this->imap->delete_message($old_uid, $object['_mailbox']);
-                    $this->cache->bypass(false);
-                }
-
-                // insert/update message in cache
-                $this->cache->save($result, $object, $old_uid);
-            }
-
-            // remove temp file
-            if ($body_file) {
-                @unlink($body_file);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Save recurrence exceptions as individual objects.
-     * The Kolab v2 format doesn't allow us to save fully embedded exception objects.
-     *
-     * @param array Hash array with event properties
-     * @param string Object type
-     */
-    private function save_recurrence_exceptions(&$object, $type = null)
-    {
-        if ($object['recurrence']['EXCEPTIONS']) {
-            $exdates = array();
-            foreach ((array)$object['recurrence']['EXDATE'] as $exdate) {
-                $key = is_a($exdate, 'DateTime') ? $exdate->format('Y-m-d') : strval($exdate);
-                $exdates[$key] = 1;
-            }
-
-            // save every exception as individual object
-            foreach((array)$object['recurrence']['EXCEPTIONS'] as $exception) {
-                $exception['uid'] = self::recurrence_exception_uid($object['uid'], $exception['start']->format('Ymd'));
-                $exception['sequence'] = $object['sequence'] + 1;
-
-                if ($exception['thisandfuture']) {
-                    $exception['recurrence'] = $object['recurrence'];
-
-                    // adjust the recurrence duration of the exception
-                    if ($object['recurrence']['COUNT']) {
-                        $recurrence = new kolab_date_recurrence($object['_formatobj']);
-                        if ($end = $recurrence->end()) {
-                            unset($exception['recurrence']['COUNT']);
-                            $exception['recurrence']['UNTIL'] = $end;
-                        }
-                    }
-
-                    // set UNTIL date if we have a thisandfuture exception
-                    $untildate = clone $exception['start'];
-                    $untildate->sub(new DateInterval('P1D'));
-                    $object['recurrence']['UNTIL'] = $untildate;
-                    unset($object['recurrence']['COUNT']);
-                }
-                else {
-                    if (!$exdates[$exception['start']->format('Y-m-d')])
-                        $object['recurrence']['EXDATE'][] = clone $exception['start'];
-                    unset($exception['recurrence']);
-                }
-
-                unset($exception['recurrence']['EXCEPTIONS'], $exception['_formatobj'], $exception['_msguid']);
-                $this->save($exception, $type, $exception['uid']);
-            }
-
-            unset($object['recurrence']['EXCEPTIONS']);
-        }
-    }
-
-    /**
-     * Generate an object UID with the given recurrence-ID in a way that it is
-     * unique (the original UID is not a substring) but still recoverable.
-     */
-    private static function recurrence_exception_uid($uid, $recurrence_id)
-    {
-        $offset = -2;
-        return substr($uid, 0, $offset) . '-' . $recurrence_id . '-' . substr($uid, $offset);
-    }
-
-    /**
-     * Delete the specified object from this folder.
-     *
-     * @param  mixed   $object  The Kolab object to delete or object UID
-     * @param  boolean $expunge Should the folder be expunged?
-     *
-     * @return boolean True if successful, false on error
-     */
-    public function delete($object, $expunge = true)
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        $msguid = is_array($object) ? $object['_msguid'] : $this->cache->uid2msguid($object);
-        $success = false;
-
-        $this->cache->bypass(true);
-
-        if ($msguid && $expunge) {
-            $success = $this->imap->delete_message($msguid, $this->name);
-        }
-        else if ($msguid) {
-            $success = $this->imap->set_flag($msguid, 'DELETED', $this->name);
-        }
-
-        $this->cache->bypass(false);
-
-        if ($success) {
-            $this->cache->set($msguid, false);
-        }
-
-        return $success;
-    }
-
-
-    /**
-     *
-     */
-    public function delete_all()
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        $this->cache->purge();
-        $this->cache->bypass(true);
-        $result = $this->imap->clear_folder($this->name);
-        $this->cache->bypass(false);
-
-        return $result;
-    }
-
-
-    /**
-     * Restore a previously deleted object
-     *
-     * @param string Object UID
-     * @return mixed Message UID on success, false on error
-     */
-    public function undelete($uid)
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        if ($msguid = $this->cache->uid2msguid($uid, true)) {
-            $this->cache->bypass(true);
-            $result = $this->imap->set_flag($msguid, 'UNDELETED', $this->name);
-            $this->cache->bypass(false);
-
-            if ($result) {
-                return $msguid;
-            }
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Move a Kolab object message to another IMAP folder
-     *
-     * @param string Object UID
-     * @param string IMAP folder to move object to
-     * @return boolean True on success, false on failure
-     */
-    public function move($uid, $target_folder)
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        if (is_string($target_folder))
-            $target_folder = kolab_storage::get_folder($target_folder);
-
-        if ($msguid = $this->cache->uid2msguid($uid)) {
-            $this->cache->bypass(true);
-            $result = $this->imap->move_message($msguid, $target_folder->name, $this->name);
-            $this->cache->bypass(false);
-
-            if ($result) {
-                $this->cache->move($msguid, $uid, $target_folder);
-                return true;
-            }
-            else {
-                rcube::raise_error(array(
-                    'code' => 600, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Failed to move message $msguid to $target_folder: " . $this->imap->get_error_str(),
-                ), true);
-            }
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Creates source of the configuration object message
-     *
-     * @param array  $object    The array that holds the data of the object.
-     * @param string $type      The type of the kolab object.
-     * @param bool   $binary    Enables use of binary encoding of attachment(s)
-     * @param string $body_file Reference to filename of message body
-     *
-     * @return mixed Message as string or array with two elements
-     *               (one for message file path, second for message headers)
-     */
-    private function build_message(&$object, $type, $binary, &$body_file)
-    {
-        // load old object to preserve data we don't understand/process
-        if (is_object($object['_formatobj']))
-            $format = $object['_formatobj'];
-        else if ($object['_msguid'] && ($old = $this->cache->get($object['_msguid'], $type, $object['_mailbox'])))
-            $format = $old['_formatobj'];
-
-        // create new kolab_format instance
-        if (!$format)
-            $format = kolab_format::factory($type, kolab_storage::$version);
-
-        if (PEAR::isError($format))
-            return false;
-
-        $format->set($object);
-        $xml = $format->write(kolab_storage::$version);
-        $object['uid'] = $format->uid;  // read UID from format
-        $object['_formatobj'] = $format;
-
-        if (empty($xml) || !$format->is_valid() || empty($object['uid'])) {
-            return false;
-        }
-
-        $mime     = new Mail_mime("\r\n");
-        $rcmail   = rcube::get_instance();
-        $headers  = array();
-        $files    = array();
-        $part_id  = 1;
-        $encoding = $binary ? 'binary' : 'base64';
-
-        if ($user_email = $rcmail->get_user_email()) {
-            $headers['From'] = $user_email;
-            $headers['To'] = $user_email;
-        }
-        $headers['Date'] = date('r');
-        $headers['X-Kolab-Type'] = kolab_format::KTYPE_PREFIX . $type;
-        $headers['X-Kolab-Mime-Version'] = kolab_storage::$version;
-        $headers['Subject'] = $object['uid'];
-//        $headers['Message-ID'] = $rcmail->gen_message_id();
-        $headers['User-Agent'] = $rcmail->config->get('useragent');
-
-        // Check if we have enough memory to handle the message in it
-        // It's faster than using files, so we'll do this if we only can
-        if (!empty($object['_attachments']) && ($mem_limit = parse_bytes(ini_get('memory_limit'))) > 0) {
-            $memory = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB
-
-            foreach ($object['_attachments'] as $attachment) {
-                $memory += $attachment['size'];
-            }
-
-            // 1.33 is for base64, we need at least 4x more memory than the message size
-            if ($memory * ($binary ? 1 : 1.33) * 4 > $mem_limit) {
-                $marker   = '%%%~~~' . md5(microtime(true) . $memory) . '~~~%%%';
-                $is_file  = true;
-                $temp_dir = unslashify($rcmail->config->get('temp_dir'));
-                $mime->setParam('delay_file_io', true);
-            }
-        }
-
-        $mime->headers($headers);
-        $mime->setTXTBody("This is a Kolab Groupware object. "
-            . "To view this object you will need an email client that understands the Kolab Groupware format. "
-            . "For a list of such email clients please visit http://www.kolab.org/\n\n");
-
-        $ctype = kolab_storage::$version == '2.0' ? $format->CTYPEv2 : $format->CTYPE;
-        // Convert new lines to \r\n, to wrokaround "NO Message contains bare newlines"
-        // when APPENDing from temp file
-        $xml = preg_replace('/\r?\n/', "\r\n", $xml);
-
-        $mime->addAttachment($xml,  // file
-            $ctype,                 // content-type
-            'kolab.xml',            // filename
-            false,                  // is_file
-            '8bit',                 // encoding
-            'attachment',           // disposition
-            RCUBE_CHARSET           // charset
-        );
-        $part_id++;
-
-        // save object attachments as separate parts
-        foreach ((array)$object['_attachments'] as $key => $att) {
-            if (empty($att['content']) && !empty($att['id'])) {
-                // @TODO: use IMAP CATENATE to skip attachment fetch+push operation
-                $msguid = $object['_copyfrom'] ?: ($object['_msguid'] ?: $object['uid']);
-                if ($is_file) {
-                    $att['path'] = tempnam($temp_dir, 'rcmAttmnt');
-                    if (($fp = fopen($att['path'], 'w')) && $this->get_attachment($msguid, $att['id'], $object['_mailbox'], false, $fp, true)) {
-                        fclose($fp);
-                    }
-                    else {
-                        return false;
-                    }
-                }
-                else {
-                    $att['content'] = $this->get_attachment($msguid, $att['id'], $object['_mailbox'], false, null, true);
-                }
-            }
-
-            $headers = array('Content-ID' => Mail_mimePart::encodeHeader('Content-ID', '<' . $key . '>', RCUBE_CHARSET, 'quoted-printable'));
-            $name = !empty($att['name']) ? $att['name'] : $key;
-
-            // To store binary files we can use faster method
-            // without writting full message content to a temporary file but
-            // directly to IMAP, see rcube_imap_generic::append().
-            // I.e. use file handles where possible
-            if (!empty($att['path'])) {
-                if ($is_file && $binary) {
-                    $files[] = fopen($att['path'], 'r');
-                    $mime->addAttachment($marker, $att['mimetype'], $name, false, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
-                }
-                else {
-                    $mime->addAttachment($att['path'], $att['mimetype'], $name, true, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
-                }
-            }
-            else {
-                if (is_resource($att['content']) && $is_file && $binary) {
-                    $files[] = $att['content'];
-                    $mime->addAttachment($marker, $att['mimetype'], $name, false, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
-                }
-                else {
-                    if (is_resource($att['content'])) {
-                        @rewind($att['content']);
-                        $att['content'] = stream_get_contents($att['content']);
-                    }
-                    $mime->addAttachment($att['content'], $att['mimetype'], $name, false, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
-                }
-            }
-
-            $object['_attachments'][$key]['id'] = ++$part_id;
-        }
-
-        if (!$is_file || !empty($files)) {
-            $message = $mime->getMessage();
-        }
-
-        // parse message and build message array with
-        // attachment file pointers in place of file markers
-        if (!empty($files)) {
-            $message = explode($marker, $message);
-            $tmp     = array();
-
-            foreach ($message as $msg_part) {
-                $tmp[] = $msg_part;
-                if ($file = array_shift($files)) {
-                    $tmp[] = $file;
-                }
-            }
-            $message = $tmp;
-        }
-        // write complete message body into temp file
-        else if ($is_file) {
-            // use common temp dir
-            $body_file = tempnam($temp_dir, 'rcmMsg');
-
-            if (PEAR::isError($mime_result = $mime->saveMessageBody($body_file))) {
-                rcube::raise_error(array('code' => 650, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Could not create message: ".$mime_result->getMessage()),
-                    true, false);
-                return false;
-            }
-
-            $message = array(trim($mime->txtHeaders()) . "\r\n\r\n", fopen($body_file, 'r'));
-        }
-
-        return $message;
-    }
-
-
-    /**
-     * Triggers any required updates after changes within the
-     * folder. This is currently only required for handling free/busy
-     * information with Kolab.
-     *
-     * @return boolean|PEAR_Error True if successfull.
-     */
-    public function trigger()
-    {
-        $owner = $this->get_owner();
-        $result = false;
-
-        switch($this->type) {
-        case 'event':
-            if ($this->get_namespace() == 'personal') {
-                $result = $this->trigger_url(
-                    sprintf('%s/trigger/%s/%s.pfb',
-                        kolab_storage::get_freebusy_server(),
-                        urlencode($owner),
-                        urlencode($this->imap->mod_folder($this->name))
-                    ),
-                    $this->imap->options['user'],
-                    $this->imap->options['password']
-                );
-            }
-            break;
-
-        default:
-            return true;
-        }
-
-        if ($result && is_object($result) && is_a($result, 'PEAR_Error')) {
-            return PEAR::raiseError(sprintf("Failed triggering folder %s. Error was: %s",
-                                            $this->name, $result->getMessage()));
-        }
-
-        return $result;
-    }
-
-    /**
-     * Triggers a URL.
-     *
-     * @param string $url          The URL to be triggered.
-     * @param string $auth_user    Username to authenticate with
-     * @param string $auth_passwd  Password for basic auth
-     * @return boolean|PEAR_Error  True if successfull.
-     */
-    private function trigger_url($url, $auth_user = null, $auth_passwd = null)
-    {
-        try {
-            $request = libkolab::http_request($url);
-
-            // set authentication credentials
-            if ($auth_user && $auth_passwd)
-                $request->setAuth($auth_user, $auth_passwd);
-
-            $result = $request->send();
-            // rcube::write_log('trigger', $result->getBody());
-        }
-        catch (Exception $e) {
-            return PEAR::raiseError($e->getMessage());
-        }
-
-        return true;
-    }
-
-}
-
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_api.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_api.php
deleted file mode 100644
index 0b9091f..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_api.php
+++ /dev/null
@@ -1,361 +0,0 @@
-<?php
-
-/**
- * Abstract interface class for Kolab storage IMAP folder objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-abstract class kolab_storage_folder_api
-{
-    /**
-     * Folder identifier
-     * @var string
-     */
-    public $id;
-
-    /**
-     * The folder name.
-     * @var string
-     */
-    public $name;
-
-    /**
-     * The type of this folder.
-     * @var string
-     */
-    public $type;
-
-    /**
-     * The subtype of this folder.
-     * @var string
-     */
-    public $subtype;
-
-    /**
-     * Is this folder set to be the default for its type
-     * @var boolean
-     */
-    public $default = false;
-
-    /**
-     * List of direct child folders
-     * @var array
-     */
-    public $children = array();
-    
-    /**
-     * Name of the parent folder
-     * @var string
-     */
-    public $parent = '';
-
-    protected $imap;
-    protected $owner;
-    protected $info;
-    protected $idata;
-    protected $namespace;
-
-
-    /**
-     * Private constructor
-     */
-    protected function __construct($name)
-    {
-      $this->name = $name;
-      $this->id   = kolab_storage::folder_id($name);
-      $this->imap = rcube::get_instance()->get_storage();
-    }
-
-
-    /**
-     * Returns the owner of the folder.
-     *
-     * @param boolean  Return a fully qualified owner name (i.e. including domain for shared folders)
-     * @return string  The owner of this folder.
-     */
-    public function get_owner($fully_qualified = false)
-    {
-        // return cached value
-        if (isset($this->owner))
-            return $this->owner;
-
-        $info = $this->get_folder_info();
-        $rcmail = rcube::get_instance();
-
-        switch ($info['namespace']) {
-        case 'personal':
-            $this->owner = $rcmail->get_user_name();
-            break;
-
-        case 'shared':
-            $this->owner = 'anonymous';
-            break;
-
-        default:
-            list($prefix, $this->owner) = explode($this->imap->get_hierarchy_delimiter(), $info['name']);
-            $fully_qualified = true;  // enforce email addresses (backwards compatibility)
-            break;
-        }
-
-        if ($fully_qualified && strpos($this->owner, '@') === false) {
-            // extract domain from current user name
-            $domain = strstr($rcmail->get_user_name(), '@');
-            // fall back to mail_domain config option
-            if (empty($domain) && ($mdomain = $rcmail->config->mail_domain($this->imap->options['host']))) {
-                $domain = '@' . $mdomain;
-            }
-            $this->owner .= $domain;
-        }
-
-        return $this->owner;
-    }
-
-
-    /**
-     * Getter for the name of the namespace to which the IMAP folder belongs
-     *
-     * @return string Name of the namespace (personal, other, shared)
-     */
-    public function get_namespace()
-    {
-        if (!isset($this->namespace))
-            $this->namespace = $this->imap->folder_namespace($this->name);
-        return $this->namespace;
-    }
-
-
-    /**
-     * Get the display name value of this folder
-     *
-     * @return string Folder name
-     */
-    public function get_name()
-    {
-        return kolab_storage::object_name($this->name, $this->get_namespace());
-    }
-
-
-    /**
-     * Getter for the top-end folder name (not the entire path)
-     *
-     * @return string Name of this folder
-     */
-    public function get_foldername()
-    {
-        $parts = explode('/', $this->name);
-        return rcube_charset::convert(end($parts), 'UTF7-IMAP');
-    }
-
-    /**
-     * Getter for parent folder path
-     *
-     * @return string Full path to parent folder
-     */
-    public function get_parent()
-    {
-        $path = explode('/', $this->name);
-        array_pop($path);
-
-        // don't list top-level namespace folder
-        if (count($path) == 1 && in_array($this->get_namespace(), array('other', 'shared'))) {
-            $path = array();
-        }
-
-        return join('/', $path);
-    }
-
-    /**
-     * Getter for the Cyrus mailbox identifier corresponding to this folder
-     * (e.g. user/john.doe/Calendar/Personal@example.org)
-     *
-     * @return string Mailbox ID
-     */
-    public function get_mailbox_id()
-    {
-        $info = $this->get_folder_info();
-        $owner = $this->get_owner();
-        list($user, $domain) = explode('@', $owner);
-
-        switch ($info['namespace']) {
-        case 'personal':
-            return sprintf('user/%s/%s@%s', $user, $this->name, $domain);
-
-        case 'shared':
-            $ns = $this->imap->get_namespace('shared');
-            $prefix = is_array($ns) ? $ns[0][0] : '';
-            list(, $domain) = explode('@', rcube::get_instance()->get_user_name());
-            return substr($this->name, strlen($prefix)) . '@' . $domain;
-
-        default:
-            $ns = $this->imap->get_namespace('other');
-            $prefix = is_array($ns) ? $ns[0][0] : '';
-            list($user, $folder) = explode($this->imap->get_hierarchy_delimiter(), substr($info['name'], strlen($prefix)), 2);
-            if (strpos($user, '@')) {
-                list($user, $domain) = explode('@', $user);
-            }
-            return sprintf('user/%s/%s@%s', $user, $folder, $domain);
-        }
-    }
-
-    /**
-     * Get the color value stored in metadata
-     *
-     * @param string Default color value to return if not set
-     * @return mixed Color value from IMAP metadata or $default is not set
-     */
-    public function get_color($default = null)
-    {
-        // color is defined in folder METADATA
-        $metadata = $this->get_metadata(array(kolab_storage::COLOR_KEY_PRIVATE, kolab_storage::COLOR_KEY_SHARED));
-        if (($color = $metadata[kolab_storage::COLOR_KEY_PRIVATE]) || ($color = $metadata[kolab_storage::COLOR_KEY_SHARED])) {
-            return $color;
-        }
-
-        return $default;
-    }
-
-
-    /**
-     * Returns IMAP metadata/annotations (GETMETADATA/GETANNOTATION)
-     *
-     * @param array List of metadata keys to read
-     * @return array Metadata entry-value hash array on success, NULL on error
-     */
-    public function get_metadata($keys)
-    {
-        $metadata = rcube::get_instance()->get_storage()->get_metadata($this->name, (array)$keys);
-        return $metadata[$this->name];
-    }
-
-
-    /**
-     * Sets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
-     *
-     * @param array  $entries Entry-value array (use NULL value as NIL)
-     * @return boolean True on success, False on failure
-     */
-    public function set_metadata($entries)
-    {
-        return $this->imap->set_metadata($this->name, $entries);
-    }
-
-
-    /**
-     *
-     */
-    public function get_folder_info()
-    {
-        if (!isset($this->info))
-            $this->info = $this->imap->folder_info($this->name);
-
-        return $this->info;
-    }
-
-    /**
-     * Make IMAP folder data available for this folder
-     */
-    public function get_imap_data()
-    {
-        if (!isset($this->idata))
-            $this->idata = $this->imap->folder_data($this->name);
-
-        return $this->idata;
-    }
-
-
-    /**
-     * Get IMAP ACL information for this folder
-     *
-     * @return string  Permissions as string
-     */
-    public function get_myrights()
-    {
-        $rights = $this->info['rights'];
-
-        if (!is_array($rights))
-            $rights = $this->imap->my_rights($this->name);
-
-        return join('', (array)$rights);
-    }
-
-    /**
-     * Helper method to extract folder UID metadata
-     *
-     * @return string Folder's UID
-     */
-    public function get_uid()
-    {
-        // To be implemented by extending classes
-        return false;
-    }
-
-    /**
-     * Check activation status of this folder
-     *
-     * @return boolean True if enabled, false if not
-     */
-    public function is_active()
-    {
-        return kolab_storage::folder_is_active($this->name);
-    }
-
-    /**
-     * Change activation status of this folder
-     *
-     * @param boolean The desired subscription status: true = active, false = not active
-     *
-     * @return True on success, false on error
-     */
-    public function activate($active)
-    {
-        return $active ? kolab_storage::folder_activate($this->name) : kolab_storage::folder_deactivate($this->name);
-    }
-
-    /**
-     * Check subscription status of this folder
-     *
-     * @return boolean True if subscribed, false if not
-     */
-    public function is_subscribed()
-    {
-        return kolab_storage::folder_is_subscribed($this->name);
-    }
-
-    /**
-     * Change subscription status of this folder
-     *
-     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
-     *
-     * @return True on success, false on error
-     */
-    public function subscribe($subscribed)
-    {
-        return $subscribed ? kolab_storage::folder_subscribe($this->name) : kolab_storage::folder_unsubscribe($this->name);
-    }
-
-    /**
-     * Return folder name as string representation of this object
-     *
-     * @return string Full IMAP folder name
-     */
-    public function __toString()
-    {
-        return $this->name;
-    }
-}
-
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_user.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_user.php
deleted file mode 100644
index 7c141c5..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_user.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/**
- * Class that represents a (virtual) folder in the 'other' namespace
- * implementing a subset of the kolab_storage_folder API.
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class kolab_storage_folder_user extends kolab_storage_folder_virtual
-{
-    protected static $ldapcache = array();
-
-    public $ldaprec;
-    public $type;
-
-    /**
-     * Default constructor
-     */
-    public function __construct($name, $parent = '', $ldaprec = null)
-    {
-        parent::__construct($name, $name, 'other', $parent);
-
-        if (!empty($ldaprec)) {
-            self::$ldapcache[$name] = $this->ldaprec = $ldaprec;
-        }
-        // use value cached in memory for repeated lookups
-        else if (array_key_exists($name, self::$ldapcache)) {
-            $this->ldaprec = self::$ldapcache[$name];
-        }
-        // lookup user in LDAP and set $this->ldaprec
-        else if ($ldap = kolab_storage::ldap()) {
-            // get domain from current user
-            list(,$domain) = explode('@', rcube::get_instance()->get_user_name());
-            $this->ldaprec = $ldap->get_user_record(parent::get_foldername($this->name) . '@' . $domain, $_SESSION['imap_host']);
-            if (!empty($this->ldaprec)) {
-                $this->ldaprec['kolabtargetfolder'] = $name;
-            }
-            self::$ldapcache[$name] = $this->ldaprec;
-        }
-    }
-
-    /**
-     * Getter for the top-end folder name to be displayed
-     *
-     * @return string Name of this folder
-     */
-    public function get_foldername()
-    {
-        return $this->ldaprec ? ($this->ldaprec['displayname'] ?: $this->ldaprec['name']) :
-            parent::get_foldername();
-    }
-
-    /**
-     * Getter for a more informative title of this user folder
-     *
-     * @return string Title for the given user record
-     */
-    public function get_title()
-    {
-      return trim($this->ldaprec['displayname'] . '; ' . $this->ldaprec['mail'], '; ');
-    }
-
-    /**
-     * Returns the owner of the folder.
-     *
-     * @return string  The owner of this folder.
-     */
-    public function get_owner()
-    {
-        return $this->ldaprec['mail'];
-    }
-
-    /**
-     * Check subscription status of this folder.
-     * Subscription of a virtual user folder depends on the subscriptions of subfolders.
-     *
-     * @return boolean True if subscribed, false if not
-     */
-    public function is_subscribed()
-    {
-        if (!empty($this->type)) {
-            $children = $subscribed = 0;
-            $delimiter = $this->imap->get_hierarchy_delimiter();
-            foreach ((array)kolab_storage::list_folders($this->name . $delimiter, '*', $this->type, false) as $subfolder) {
-                if (kolab_storage::folder_is_subscribed($subfolder)) {
-                    $subscribed++;
-                }
-                $children++;
-            }
-            if ($subscribed > 0) {
-                return $subscribed == $children ? true : 2;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Change subscription status of this folder
-     *
-     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
-     *
-     * @return True on success, false on error
-     */
-    public function subscribe($subscribed)
-    {
-        $success = false;
-
-        // (un)subscribe all subfolders of a given type
-        if (!empty($this->type)) {
-            $delimiter = $this->imap->get_hierarchy_delimiter();
-            foreach ((array)kolab_storage::list_folders($this->name . $delimiter, '*', $this->type, false) as $subfolder) {
-                $success |= ($subscribed ? kolab_storage::folder_subscribe($subfolder) : kolab_storage::folder_unsubscribe($subfolder));
-            }
-        }
-
-        return $success;
-    }
-
-}
\ No newline at end of file
diff --git a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_virtual.php b/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_virtual.php
deleted file mode 100644
index e419ced..0000000
--- a/lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_virtual.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * Helper class that represents a virtual IMAP folder
- * with a subset of the kolab_storage_folder API.
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class kolab_storage_folder_virtual extends kolab_storage_folder_api
-{
-    public $virtual = true;
-
-    protected $displayname;
-
-    public function __construct($name, $dispname, $ns, $parent = '')
-    {
-        parent::__construct($name);
-
-        $this->namespace = $ns;
-        $this->parent    = $parent;
-        $this->displayname = $dispname;
-    }
-
-    /**
-     * Get the display name value of this folder
-     *
-     * @return string Folder name
-     */
-    public function get_name()
-    {
-        return $this->displayname ?: parent::get_name();
-    }
-
-    /**
-     * Get the color value stored in metadata
-     *
-     * @param string Default color value to return if not set
-     * @return mixed Color value from IMAP metadata or $default is not set
-     */
-    public function get_color($default = null)
-    {
-        return $default;
-    }
-}
\ No newline at end of file
diff --git a/lib/drivers/kolab/plugins/libkolab/libkolab.php b/lib/drivers/kolab/plugins/libkolab/libkolab.php
deleted file mode 100644
index 0e4c8af..0000000
--- a/lib/drivers/kolab/plugins/libkolab/libkolab.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-
-/**
- * Kolab core library
- *
- * Plugin to setup a basic environment for the interaction with a Kolab server.
- * Other Kolab-related plugins will depend on it and can use the library classes
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012-2015, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class libkolab extends rcube_plugin
-{
-    static $http_requests = array();
-    static $bonnie_api = false;
-
-    /**
-     * Required startup method of a Roundcube plugin
-     */
-    public function init()
-    {
-        // load local config
-        $this->load_config();
-
-        // extend include path to load bundled lib classes
-        $include_path = $this->home . '/lib' . PATH_SEPARATOR . ini_get('include_path');
-        set_include_path($include_path);
-
-        $this->add_hook('storage_init', array($this, 'storage_init'));
-        $this->add_hook('user_delete', array('kolab_storage', 'delete_user_folders'));
-
-        $rcmail = rcube::get_instance();
-        try {
-            kolab_format::$timezone = new DateTimeZone($rcmail->config->get('timezone', 'GMT'));
-        }
-        catch (Exception $e) {
-            rcube::raise_error($e, true);
-            kolab_format::$timezone = new DateTimeZone('GMT');
-        }
-
-        $this->add_texts('localization/', false);
-
-        // embed scripts and templates for email message audit trail
-        if ($rcmail->task == 'mail' && self::get_bonnie_api()) {
-            if ($rcmail->output->type == 'html') {
-                $this->add_hook('render_page', array($this, 'bonnie_render_page'));
-
-                $this->include_script('js/audittrail.js');
-                $this->include_stylesheet($this->local_skin_path() . '/libkolab.css');
-
-                // add 'Show history' item to message menu
-                $this->api->add_content(html::tag('li', null,
-                    $this->api->output->button(array(
-                        'command'  => 'kolab-mail-history',
-                        'label'    => 'libkolab.showhistory',
-                        'type'     => 'link',
-                        'classact' => 'icon history active',
-                        'class'    => 'icon history',
-                        'innerclass' => 'icon history',
-                    ))),
-                    'messagemenu');
-            }
-
-            $this->register_action('plugin.message-changelog', array($this, 'message_changelog'));
-        }
-    }
-
-    /**
-     * Hook into IMAP FETCH HEADER.FIELDS command and request Kolab-specific headers
-     */
-    function storage_init($p)
-    {
-        $p['fetch_headers'] = trim($p['fetch_headers'] .' X-KOLAB-TYPE X-KOLAB-MIME-VERSION');
-        return $p;
-    }
-
-    /**
-     * Getter for a singleton instance of the Bonnie API
-     *
-     * @return mixed kolab_bonnie_api instance if configured, false otherwise
-     */
-    public static function get_bonnie_api()
-    {
-        // get configuration for the Bonnie API
-        if (!self::$bonnie_api && ($bonnie_config = rcube::get_instance()->config->get('kolab_bonnie_api', false))) {
-            self::$bonnie_api = new kolab_bonnie_api($bonnie_config);
-        }
-
-        return self::$bonnie_api;
-    }
-
-    /**
-     * Hook to append the message history dialog template to the mail view
-     */
-    function bonnie_render_page($p)
-    {
-        if (($p['template'] === 'mail' || $p['template'] === 'message') && !$p['kolab-audittrail']) {
-            // append a template for the audit trail dialog
-            $this->api->output->add_footer(
-                html::div(array('id' => 'mailmessagehistory',  'class' => 'uidialog', 'aria-hidden' => 'true', 'style' => 'display:none'),
-                    self::object_changelog_table(array('class' => 'records-table changelog-table'))
-                )
-            );
-            $this->api->output->set_env('kolab_audit_trail', true);
-            $p['kolab-audittrail'] = true;
-        }
-
-        return $p;
-    }
-
-    /**
-     * Handler for message audit trail changelog requests
-     */
-    public function message_changelog()
-    {
-        if (!self::$bonnie_api) {
-            return false;
-        }
-
-        $rcmail = rcube::get_instance();
-        $msguid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST, true);
-        $mailbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
-
-        $result = $msguid && $mailbox ? self::$bonnie_api->changelog('mail', null, $mailbox, $msguid) : null;
-        if (is_array($result)) {
-            if (is_array($result['changes'])) {
-                $dtformat = $rcmail->config->get('date_format') . ' ' . $rcmail->config->get('time_format');
-                array_walk($result['changes'], function(&$change) use ($dtformat, $rcmail) {
-                  if ($change['date']) {
-                      $dt = rcube_utils::anytodatetime($change['date']);
-                      if ($dt instanceof DateTime) {
-                          $change['date'] = $rcmail->format_date($dt, $dtformat);
-                      }
-                  }
-                });
-            }
-            $this->api->output->command('plugin.message_render_changelog', $result['changes']);
-        }
-        else {
-            $this->api->output->command('plugin.message_render_changelog', false);
-        }
-
-        $this->api->output->send();
-    }
-
-    /**
-     * Wrapper function to load and initalize the HTTP_Request2 Object
-     *
-     * @param string|Net_Url2 Request URL
-     * @param string          Request method ('OPTIONS','GET','HEAD','POST','PUT','DELETE','TRACE','CONNECT')
-     * @param array           Configuration for this Request instance, that will be merged
-     *                        with default configuration
-     *
-     * @return HTTP_Request2 Request object
-     */
-    public static function http_request($url = '', $method = 'GET', $config = array())
-    {
-        $rcube       = rcube::get_instance();
-        $http_config = (array) $rcube->config->get('kolab_http_request');
-
-        // deprecated configuration options
-        if (empty($http_config)) {
-            foreach (array('ssl_verify_peer', 'ssl_verify_host') as $option) {
-                $value = $rcube->config->get('kolab_' . $option, true);
-                if (is_bool($value)) {
-                    $http_config[$option] = $value;
-                }
-            }
-        }
-
-        if (!empty($config)) {
-            $http_config = array_merge($http_config, $config);
-        }
-
-        // force CURL adapter, this allows to handle correctly
-        // compressed responses with SplObserver registered (kolab_files) (#4507)
-        $http_config['adapter'] = 'HTTP_Request2_Adapter_Curl';
-
-        $key = md5(serialize($http_config));
-
-        if (!($request = self::$http_requests[$key])) {
-            // load HTTP_Request2
-            require_once 'HTTP/Request2.php';
-
-            try {
-                $request = new HTTP_Request2();
-                $request->setConfig($http_config);
-            }
-            catch (Exception $e) {
-                rcube::raise_error($e, true, true);
-            }
-
-            // proxy User-Agent string
-            $request->setHeader('user-agent', $_SERVER['HTTP_USER_AGENT']);
-
-            self::$http_requests[$key] = $request;
-        }
-
-        // cleanup
-        try {
-            $request->setBody('');
-            $request->setUrl($url);
-            $request->setMethod($method);
-        }
-        catch (Exception $e) {
-            rcube::raise_error($e, true, true);
-        }
-
-        return $request;
-    }
-
-    /**
-     * Table oultine for object changelog display
-     */
-    public static function object_changelog_table($attrib = array())
-    {
-        $rcube = rcube::get_instance();
-        $attrib += array('domain' => 'libkolab');
-
-        $table = new html_table(array('cols' => 5, 'border' => 0, 'cellspacing' => 0));
-        $table->add_header('diff',      '');
-        $table->add_header('revision',  $rcube->gettext('revision', $attrib['domain']));
-        $table->add_header('date',      $rcube->gettext('date', $attrib['domain']));
-        $table->add_header('user',      $rcube->gettext('user', $attrib['domain']));
-        $table->add_header('operation', $rcube->gettext('operation', $attrib['domain']));
-        $table->add_header('actions',   '&nbsp;');
-
-        $rcube->output->add_label(
-            'libkolab.showrevision',
-            'libkolab.actionreceive',
-            'libkolab.actionappend',
-            'libkolab.actionmove',
-            'libkolab.actiondelete',
-            'libkolab.actionread',
-            'libkolab.actionflagset',
-            'libkolab.actionflagclear',
-            'libkolab.objectchangelog',
-            'close'
-        );
-
-        return $table->show($attrib);
-    }
-
-    /**
-     * Wrapper function for generating a html diff using the FineDiff class by Raymond Hill
-     */
-    public static function html_diff($from, $to, $is_html = null)
-    {
-        // auto-detect text/html format
-        if ($is_html === null) {
-            $from_html = (preg_match('/<(html|body)(\s+[a-z]|>)/', $from, $m) && strpos($from, '</'.$m[1].'>') > 0);
-            $to_html   = (preg_match('/<(html|body)(\s+[a-z]|>)/', $to, $m) && strpos($to, '</'.$m[1].'>') > 0);
-            $is_html   = $from_html || $to_html;
-
-            // ensure both parts are of the same format
-            if ($is_html && !$from_html) {
-                $converter = new rcube_text2html($from, false, array('wrap' => true));
-                $from = $converter->get_html();
-            }
-            if ($is_html && !$to_html) {
-                $converter = new rcube_text2html($to, false, array('wrap' => true));
-                $to = $converter->get_html();
-            }
-        }
-
-        // compute diff from HTML
-        if ($is_html) {
-            include_once __dir__ . '/vendor/Caxy/HtmlDiff/Match.php';
-            include_once __dir__ . '/vendor/Caxy/HtmlDiff/Operation.php';
-            include_once __dir__ . '/vendor/Caxy/HtmlDiff/HtmlDiff.php';
-
-            // replace data: urls with a transparent image to avoid memory problems
-            $from = preg_replace('/src="data:image[^"]+/', 'src="data:image/gif;base64,R0lGODlhAQABAPAAAOjq6gAAACH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAAAsAAAAAAEAAQAAAgJEAQA7', $from);
-            $to   = preg_replace('/src="data:image[^"]+/', 'src="data:image/gif;base64,R0lGODlhAQABAPAAAOjq6gAAACH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAAAsAAAAAAEAAQAAAgJEAQA7', $to);
-
-            $diff = new Caxy\HtmlDiff\HtmlDiff($from, $to);
-            $diffhtml = $diff->build();
-
-            // remove empty inserts (from tables)
-            return preg_replace('!<ins class="diff\w+">\s*</ins>!Uims', '', $diffhtml);
-        }
-        else {
-            include_once __dir__ . '/vendor/finediff.php';
-
-            $diff = new FineDiff($from, $to, FineDiff::$wordGranularity);
-            return $diff->renderDiffToHTML();
-        }
-    }
-
-    /**
-     * Return a date() format string to render identifiers for recurrence instances
-     *
-     * @param array Hash array with event properties
-     * @return string Format string
-     */
-    public static function recurrence_id_format($event)
-    {
-        return $event['allday'] ? 'Ymd' : 'Ymd\THis';
-    }
-}
diff --git a/lib/drivers/kolab/plugins/libkolab/vendor/finediff.php b/lib/drivers/kolab/plugins/libkolab/vendor/finediff.php
deleted file mode 100644
index b3c416c..0000000
--- a/lib/drivers/kolab/plugins/libkolab/vendor/finediff.php
+++ /dev/null
@@ -1,688 +0,0 @@
-<?php
-/**
-* FINE granularity DIFF
-*
-* Computes a set of instructions to convert the content of
-* one string into another.
-*
-* Copyright (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
-*
-* Licensed under The MIT License
-* 
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*
-* @copyright Copyright 2011 (c) Raymond Hill (http://raymondhill.net/blog/?p=441)
-* @link http://www.raymondhill.net/finediff/
-* @version 0.6
-* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
-*/
-
-/**
-* Usage (simplest):
-*
-*   include 'finediff.php';
-*
-*   // for the stock stack, granularity values are:
-*   // FineDiff::$paragraphGranularity = paragraph/line level
-*   // FineDiff::$sentenceGranularity = sentence level
-*   // FineDiff::$wordGranularity = word level
-*   // FineDiff::$characterGranularity = character level [default]
-*
-*   $opcodes = FineDiff::getDiffOpcodes($from_text, $to_text [, $granularityStack = null] );
-*   // store opcodes for later use...
-*
-*   ...
-*
-*   // restore $to_text from $from_text + $opcodes
-*   include 'finediff.php';
-*   $to_text = FineDiff::renderToTextFromOpcodes($from_text, $opcodes);
-*
-*   ...
-*/
-
-/**
-* Persisted opcodes (string) are a sequence of atomic opcode.
-* A single opcode can be one of the following:
-*   c | c{n} | d | d{n} | i:{c} | i{length}:{s}
-*   'c'        = copy one character from source
-*   'c{n}'     = copy n characters from source
-*   'd'        = skip one character from source
-*   'd{n}'     = skip n characters from source
-*   'i:{c}     = insert character 'c'
-*   'i{n}:{s}' = insert string s, which is of length n
-*
-* Do not exist as of now, under consideration:
-*   'm{n}:{o}  = move n characters from source o characters ahead.
-*   It would be essentially a shortcut for a delete->copy->insert
-*   command (swap) for when the inserted segment is exactly the same
-*   as the deleted one, and with only a copy operation in between.
-*   TODO: How often this case occurs? Is it worth it? Can only
-*   be done as a postprocessing method (->optimize()?)
-*/
-abstract class FineDiffOp {
-	abstract public function getFromLen();
-	abstract public function getToLen();
-	abstract public function getOpcode();
-	}
-
-class FineDiffDeleteOp extends FineDiffOp {
-	public function __construct($len) {
-		$this->fromLen = $len;
-		}
-	public function getFromLen() {
-		return $this->fromLen;
-		}
-	public function getToLen() {
-		return 0;
-		}
-	public function getOpcode() {
-		if ( $this->fromLen === 1 ) {
-			return 'd';
-			}
-		return "d{$this->fromLen}";
-		}
-	}
-
-class FineDiffInsertOp extends FineDiffOp {
-	public function __construct($text) {
-		$this->text = $text;
-		}
-	public function getFromLen() {
-		return 0;
-		}
-	public function getToLen() {
-		return strlen($this->text);
-		}
-	public function getText() {
-		return $this->text;
-		}
-	public function getOpcode() {
-		$to_len = strlen($this->text);
-		if ( $to_len === 1 ) {
-			return "i:{$this->text}";
-			}
-		return "i{$to_len}:{$this->text}";
-		}
-	}
-
-class FineDiffReplaceOp extends FineDiffOp {
-	public function __construct($fromLen, $text) {
-		$this->fromLen = $fromLen;
-		$this->text = $text;
-		}
-	public function getFromLen() {
-		return $this->fromLen;
-		}
-	public function getToLen() {
-		return strlen($this->text);
-		}
-	public function getText() {
-		return $this->text;
-		}
-	public function getOpcode() {
-		if ( $this->fromLen === 1 ) {
-			$del_opcode = 'd';
-			}
-		else {
-			$del_opcode = "d{$this->fromLen}";
-			}
-		$to_len = strlen($this->text);
-		if ( $to_len === 1 ) {
-			return "{$del_opcode}i:{$this->text}";
-			}
-		return "{$del_opcode}i{$to_len}:{$this->text}";
-		}
-	}
-
-class FineDiffCopyOp extends FineDiffOp {
-	public function __construct($len) {
-		$this->len = $len;
-		}
-	public function getFromLen() {
-		return $this->len;
-		}
-	public function getToLen() {
-		return $this->len;
-		}
-	public function getOpcode() {
-		if ( $this->len === 1 ) {
-			return 'c';
-			}
-		return "c{$this->len}";
-		}
-	public function increase($size) {
-		return $this->len += $size;
-		}
-	}
-
-/**
-* FineDiff ops
-*
-* Collection of ops
-*/
-class FineDiffOps {
-	public function appendOpcode($opcode, $from, $from_offset, $from_len) {
-		if ( $opcode === 'c' ) {
-			$edits[] = new FineDiffCopyOp($from_len);
-			}
-		else if ( $opcode === 'd' ) {
-			$edits[] = new FineDiffDeleteOp($from_len);
-			}
-		else /* if ( $opcode === 'i' ) */ {
-			$edits[] = new FineDiffInsertOp(substr($from, $from_offset, $from_len));
-			}
-		}
-	public $edits = array();
-	}
-
-/**
-* FineDiff class
-*
-* TODO: Document
-*
-*/
-class FineDiff {
-
-	/**------------------------------------------------------------------------
-	*
-	* Public section
-	*
-	*/
-
-	/**
-	* Constructor
-	* ...
-	* The $granularityStack allows FineDiff to be configurable so that
-	* a particular stack tailored to the specific content of a document can
-	* be passed.
-	*/
-	public function __construct($from_text = '', $to_text = '', $granularityStack = null) {
-		// setup stack for generic text documents by default
-		$this->granularityStack = $granularityStack ? $granularityStack : FineDiff::$characterGranularity;
-		$this->edits = array();
-		$this->from_text = $from_text;
-		$this->doDiff($from_text, $to_text);
-		}
-
-	public function getOps() {
-		return $this->edits;
-		}
-
-	public function getOpcodes() {
-		$opcodes = array();
-		foreach ( $this->edits as $edit ) {
-			$opcodes[] = $edit->getOpcode();
-			}
-		return implode('', $opcodes);
-		}
-
-	public function renderDiffToHTML() {
-		$in_offset = 0;
-		$html = '';
-		foreach ( $this->edits as $edit ) {
-			$n = $edit->getFromLen();
-			if ( $edit instanceof FineDiffCopyOp ) {
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
-				}
-			else if ( $edit instanceof FineDiffDeleteOp ) {
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
-				}
-			else if ( $edit instanceof FineDiffInsertOp ) {
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
-				}
-			else /* if ( $edit instanceof FineDiffReplaceOp ) */ {
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
-				}
-			$in_offset += $n;
-			}
-		return $html;
-		}
-
-	/**------------------------------------------------------------------------
-	* Return an opcodes string describing the diff between a "From" and a
-	* "To" string
-	*/
-	public static function getDiffOpcodes($from, $to, $granularities = null) {
-		$diff = new FineDiff($from, $to, $granularities);
-		return $diff->getOpcodes();
-		}
-
-	/**------------------------------------------------------------------------
-	* Return an iterable collection of diff ops from an opcodes string
-	*/
-	public static function getDiffOpsFromOpcodes($opcodes) {
-		$diffops = new FineDiffOps();
-		FineDiff::renderFromOpcodes(null, $opcodes, array($diffops,'appendOpcode'));
-		return $diffops->edits;
-		}
-
-	/**------------------------------------------------------------------------
-	* Re-create the "To" string from the "From" string and an "Opcodes" string
-	*/
-	public static function renderToTextFromOpcodes($from, $opcodes) {
-		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
-		}
-
-	/**------------------------------------------------------------------------
-	* Render the diff to an HTML string
-	*/
-	public static function renderDiffToHTMLFromOpcodes($from, $opcodes) {
-		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
-		}
-
-	/**------------------------------------------------------------------------
-	* Generic opcodes parser, user must supply callback for handling
-	* single opcode
-	*/
-	public static function renderFromOpcodes($from, $opcodes, $callback) {
-		if ( !is_callable($callback) ) {
-			return '';
-			}
-		$out = '';
-		$opcodes_len = strlen($opcodes);
-		$from_offset = $opcodes_offset = 0;
-		while ( $opcodes_offset <  $opcodes_len ) {
-			$opcode = substr($opcodes, $opcodes_offset, 1);
-			$opcodes_offset++;
-			$n = intval(substr($opcodes, $opcodes_offset));
-			if ( $n ) {
-				$opcodes_offset += strlen(strval($n));
-				}
-			else {
-				$n = 1;
-				}
-			if ( $opcode === 'c' ) { // copy n characters from source
-				$out .= call_user_func($callback, 'c', $from, $from_offset, $n, '');
-				$from_offset += $n;
-				}
-			else if ( $opcode === 'd' ) { // delete n characters from source
-				$out .= call_user_func($callback, 'd', $from, $from_offset, $n, '');
-				$from_offset += $n;
-				}
-			else /* if ( $opcode === 'i' ) */ { // insert n characters from opcodes
-				$out .= call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
-				$opcodes_offset += 1 + $n;
-				}
-			}
-		return $out;
-		}
-
-	/**
-	* Stock granularity stacks and delimiters
-	*/
-
-	const paragraphDelimiters = "\n\r";
-	public static $paragraphGranularity = array(
-		FineDiff::paragraphDelimiters
-		);
-	const sentenceDelimiters = ".\n\r";
-	public static $sentenceGranularity = array(
-		FineDiff::paragraphDelimiters,
-		FineDiff::sentenceDelimiters
-		);
-	const wordDelimiters = " \t.\n\r";
-	public static $wordGranularity = array(
-		FineDiff::paragraphDelimiters,
-		FineDiff::sentenceDelimiters,
-		FineDiff::wordDelimiters
-		);
-	const characterDelimiters = "";
-	public static $characterGranularity = array(
-		FineDiff::paragraphDelimiters,
-		FineDiff::sentenceDelimiters,
-		FineDiff::wordDelimiters,
-		FineDiff::characterDelimiters
-		);
-
-	public static $textStack = array(
-		".",
-		" \t.\n\r",
-		""
-		);
-
-	/**------------------------------------------------------------------------
-	*
-	* Private section
-	*
-	*/
-
-	/**
-	* Entry point to compute the diff.
-	*/
-	private function doDiff($from_text, $to_text) {
-		$this->last_edit = false;
-		$this->stackpointer = 0;
-		$this->from_text = $from_text;
-		$this->from_offset = 0;
-		// can't diff without at least one granularity specifier
-		if ( empty($this->granularityStack) ) {
-			return;
-			}
-		$this->_processGranularity($from_text, $to_text);
-		}
-
-	/**
-	* This is the recursive function which is responsible for
-	* handling/increasing granularity.
-	*
-	* Incrementally increasing the granularity is key to compute the
-	* overall diff in a very efficient way.
-	*/
-	private function _processGranularity($from_segment, $to_segment) {
-		$delimiters = $this->granularityStack[$this->stackpointer++];
-		$has_next_stage = $this->stackpointer < count($this->granularityStack);
-		foreach ( FineDiff::doFragmentDiff($from_segment, $to_segment, $delimiters) as $fragment_edit ) {
-			// increase granularity
-			if ( $fragment_edit instanceof FineDiffReplaceOp && $has_next_stage ) {
-				$this->_processGranularity(
-					substr($this->from_text, $this->from_offset, $fragment_edit->getFromLen()),
-					$fragment_edit->getText()
-					);
-				}
-			// fuse copy ops whenever possible
-			else if ( $fragment_edit instanceof FineDiffCopyOp && $this->last_edit instanceof FineDiffCopyOp ) {
-				$this->edits[count($this->edits)-1]->increase($fragment_edit->getFromLen());
-				$this->from_offset += $fragment_edit->getFromLen();
-				}
-			else {
-				/* $fragment_edit instanceof FineDiffCopyOp */
-				/* $fragment_edit instanceof FineDiffDeleteOp */
-				/* $fragment_edit instanceof FineDiffInsertOp */
-				$this->edits[] = $this->last_edit = $fragment_edit;
-				$this->from_offset += $fragment_edit->getFromLen();
-				}
-			}
-		$this->stackpointer--;
-		}
-
-	/**
-	* This is the core algorithm which actually perform the diff itself,
-	* fragmenting the strings as per specified delimiters.
-	*
-	* This function is naturally recursive, however for performance purpose
-	* a local job queue is used instead of outright recursivity.
-	*/
-	private static function doFragmentDiff($from_text, $to_text, $delimiters) {
-		// Empty delimiter means character-level diffing.
-		// In such case, use code path optimized for character-level
-		// diffing.
-		if ( empty($delimiters) ) {
-			return FineDiff::doCharDiff($from_text, $to_text);
-			}
-
-		$result = array();
-
-		// fragment-level diffing
-		$from_text_len = strlen($from_text);
-		$to_text_len = strlen($to_text);
-		$from_fragments = FineDiff::extractFragments($from_text, $delimiters);
-		$to_fragments = FineDiff::extractFragments($to_text, $delimiters);
-
-		$jobs = array(array(0, $from_text_len, 0, $to_text_len));
-
-		$cached_array_keys = array();
-
-		while ( $job = array_pop($jobs) ) {
-
-			// get the segments which must be diff'ed
-			list($from_segment_start, $from_segment_end, $to_segment_start, $to_segment_end) = $job;
-
-			// catch easy cases first
-			$from_segment_length = $from_segment_end - $from_segment_start;
-			$to_segment_length = $to_segment_end - $to_segment_start;
-			if ( !$from_segment_length || !$to_segment_length ) {
-				if ( $from_segment_length ) {
-					$result[$from_segment_start * 4] = new FineDiffDeleteOp($from_segment_length);
-					}
-				else if ( $to_segment_length ) {
-					$result[$from_segment_start * 4 + 1] = new FineDiffInsertOp(substr($to_text, $to_segment_start, $to_segment_length));
-					}
-				continue;
-				}
-
-			// find longest copy operation for the current segments
-			$best_copy_length = 0;
-
-			$from_base_fragment_index = $from_segment_start;
-
-			$cached_array_keys_for_current_segment = array();
-
-			while ( $from_base_fragment_index < $from_segment_end ) {
-				$from_base_fragment = $from_fragments[$from_base_fragment_index];
-				$from_base_fragment_length = strlen($from_base_fragment);
-				// performance boost: cache array keys
-				if ( !isset($cached_array_keys_for_current_segment[$from_base_fragment]) ) {
-					if ( !isset($cached_array_keys[$from_base_fragment]) ) {
-						$to_all_fragment_indices = $cached_array_keys[$from_base_fragment] = array_keys($to_fragments, $from_base_fragment, true);
-						}
-					else {
-						$to_all_fragment_indices = $cached_array_keys[$from_base_fragment];
-						}
-					// get only indices which falls within current segment
-					if ( $to_segment_start > 0 || $to_segment_end < $to_text_len ) {
-						$to_fragment_indices = array();
-						foreach ( $to_all_fragment_indices as $to_fragment_index ) {
-							if ( $to_fragment_index < $to_segment_start ) { continue; }
-							if ( $to_fragment_index >= $to_segment_end ) { break; }
-							$to_fragment_indices[] = $to_fragment_index;
-							}
-						$cached_array_keys_for_current_segment[$from_base_fragment] = $to_fragment_indices;
-						}
-					else {
-						$to_fragment_indices = $to_all_fragment_indices;
-						}
-					}
-				else {
-					$to_fragment_indices = $cached_array_keys_for_current_segment[$from_base_fragment];
-					}
-				// iterate through collected indices
-				foreach ( $to_fragment_indices as $to_base_fragment_index ) {
-					$fragment_index_offset = $from_base_fragment_length;
-					// iterate until no more match
-					for (;;) {
-						$fragment_from_index = $from_base_fragment_index + $fragment_index_offset;
-						if ( $fragment_from_index >= $from_segment_end ) {
-							break;
-							}
-						$fragment_to_index = $to_base_fragment_index + $fragment_index_offset;
-						if ( $fragment_to_index >= $to_segment_end ) {
-							break;
-							}
-						if ( $from_fragments[$fragment_from_index] !== $to_fragments[$fragment_to_index] ) {
-							break;
-							}
-						$fragment_length = strlen($from_fragments[$fragment_from_index]);
-						$fragment_index_offset += $fragment_length;
-						}
-					if ( $fragment_index_offset > $best_copy_length ) {
-						$best_copy_length = $fragment_index_offset;
-						$best_from_start = $from_base_fragment_index;
-						$best_to_start = $to_base_fragment_index;
-						}
-					}
-				$from_base_fragment_index += strlen($from_base_fragment);
-				// If match is larger than half segment size, no point trying to find better
-				// TODO: Really?
-				if ( $best_copy_length >= $from_segment_length / 2) {
-					break;
-					}
-				// no point to keep looking if what is left is less than
-				// current best match
-				if ( $from_base_fragment_index + $best_copy_length >= $from_segment_end ) {
-					break;
-					}
-				}
-
-			if ( $best_copy_length ) {
-				$jobs[] = array($from_segment_start, $best_from_start, $to_segment_start, $best_to_start);
-				$result[$best_from_start * 4 + 2] = new FineDiffCopyOp($best_copy_length);
-				$jobs[] = array($best_from_start + $best_copy_length, $from_segment_end, $best_to_start + $best_copy_length, $to_segment_end);
-				}
-			else {
-				$result[$from_segment_start * 4 ] = new FineDiffReplaceOp($from_segment_length, substr($to_text, $to_segment_start, $to_segment_length));
-				}
-			}
-
-		ksort($result, SORT_NUMERIC);
-		return array_values($result);
-		}
-
-	/**
-	* Perform a character-level diff.
-	*
-	* The algorithm is quite similar to doFragmentDiff(), except that
-	* the code path is optimized for character-level diff -- strpos() is
-	* used to find out the longest common subequence of characters.
-	*
-	* We try to find a match using the longest possible subsequence, which
-	* is at most the length of the shortest of the two strings, then incrementally
-	* reduce the size until a match is found.
-	*
-	* I still need to study more the performance of this function. It
-	* appears that for long strings, the generic doFragmentDiff() is more
-	* performant. For word-sized strings, doCharDiff() is somewhat more
-	* performant.
-	*/
-	private static function doCharDiff($from_text, $to_text) {
-		$result = array();
-		$jobs = array(array(0, strlen($from_text), 0, strlen($to_text)));
-		while ( $job = array_pop($jobs) ) {
-			// get the segments which must be diff'ed
-			list($from_segment_start, $from_segment_end, $to_segment_start, $to_segment_end) = $job;
-			$from_segment_len = $from_segment_end - $from_segment_start;
-			$to_segment_len = $to_segment_end - $to_segment_start;
-
-			// catch easy cases first
-			if ( !$from_segment_len || !$to_segment_len ) {
-				if ( $from_segment_len ) {
-					$result[$from_segment_start * 4 + 0] = new FineDiffDeleteOp($from_segment_len);
-					}
-				else if ( $to_segment_len ) {
-					$result[$from_segment_start * 4 + 1] = new FineDiffInsertOp(substr($to_text, $to_segment_start, $to_segment_len));
-					}
-				continue;
-				}
-			if ( $from_segment_len >= $to_segment_len ) {
-				$copy_len = $to_segment_len;
-				while ( $copy_len ) {
-					$to_copy_start = $to_segment_start;
-					$to_copy_start_max = $to_segment_end - $copy_len;
-					while ( $to_copy_start <= $to_copy_start_max ) {
-						$from_copy_start = strpos(substr($from_text, $from_segment_start, $from_segment_len), substr($to_text, $to_copy_start, $copy_len));
-						if ( $from_copy_start !== false ) {
-							$from_copy_start += $from_segment_start;
-							break 2;
-							}
-						$to_copy_start++;
-						}
-					$copy_len--;
-					}
-				}
-			else {
-				$copy_len = $from_segment_len;
-				while ( $copy_len ) {
-					$from_copy_start = $from_segment_start;
-					$from_copy_start_max = $from_segment_end - $copy_len;
-					while ( $from_copy_start <= $from_copy_start_max ) {
-						$to_copy_start = strpos(substr($to_text, $to_segment_start, $to_segment_len), substr($from_text, $from_copy_start, $copy_len));
-						if ( $to_copy_start !== false ) {
-							$to_copy_start += $to_segment_start;
-							break 2;
-							}
-						$from_copy_start++;
-						}
-					$copy_len--;
-					}
-				}
-			// match found
-			if ( $copy_len ) {
-				$jobs[] = array($from_segment_start, $from_copy_start, $to_segment_start, $to_copy_start);
-				$result[$from_copy_start * 4 + 2] = new FineDiffCopyOp($copy_len);
-				$jobs[] = array($from_copy_start + $copy_len, $from_segment_end, $to_copy_start + $copy_len, $to_segment_end);
-				}
-			// no match,  so delete all, insert all
-			else {
-				$result[$from_segment_start * 4] = new FineDiffReplaceOp($from_segment_len, substr($to_text, $to_segment_start, $to_segment_len));
-				}
-			}
-		ksort($result, SORT_NUMERIC);
-		return array_values($result);
-		}
-
-	/**
-	* Efficiently fragment the text into an array according to
-	* specified delimiters.
-	* No delimiters means fragment into single character.
-	* The array indices are the offset of the fragments into
-	* the input string.
-	* A sentinel empty fragment is always added at the end.
-	* Careful: No check is performed as to the validity of the
-	* delimiters.
-	*/
-	private static function extractFragments($text, $delimiters) {
-		// special case: split into characters
-		if ( empty($delimiters) ) {
-			$chars = str_split($text, 1);
-			$chars[strlen($text)] = '';
-			return $chars;
-			}
-		$fragments = array();
-		$start = $end = 0;
-		for (;;) {
-			$end += strcspn($text, $delimiters, $end);
-			$end += strspn($text, $delimiters, $end);
-			if ( $end === $start ) {
-				break;
-				}
-			$fragments[$start] = substr($text, $start, $end - $start);
-			$start = $end;
-			}
-		$fragments[$start] = '';
-		return $fragments;
-		}
-
-	/**
-	* Stock opcode renderers
-	*/
-	private static function renderToTextFromOpcode($opcode, $from, $from_offset, $from_len) {
-		if ( $opcode === 'c' || $opcode === 'i' ) {
-			return substr($from, $from_offset, $from_len);
-			}
-		return '';
-		}
-
-	private static function renderDiffToHTMLFromOpcode($opcode, $from, $from_offset, $from_len) {
-		if ( $opcode === 'c' ) {
-			return htmlentities(substr($from, $from_offset, $from_len));
-			}
-		else if ( $opcode === 'd' ) {
-			$deletion = substr($from, $from_offset, $from_len);
-			if ( strcspn($deletion, " \n\r") === 0 ) {
-				$deletion = str_replace(array("\n","\r"), array('\n','\r'), $deletion);
-				}
-			return '<del>' . htmlentities($deletion) . '</del>';
-			}
-		else /* if ( $opcode === 'i' ) */ {
- 			return '<ins>' . htmlentities(substr($from, $from_offset, $from_len)) . '</ins>';
-			}
-		return '';
-		}
-	}
-
diff --git a/lib/drivers/kolab/plugins/libkolab/vendor/finediff_modifications.diff b/lib/drivers/kolab/plugins/libkolab/vendor/finediff_modifications.diff
deleted file mode 100644
index 3a9ad5c..0000000
--- a/lib/drivers/kolab/plugins/libkolab/vendor/finediff_modifications.diff
+++ /dev/null
@@ -1,121 +0,0 @@
---- finediff.php.orig	2014-07-29 14:24:10.000000000 +0200
-+++ finediff.php	2014-07-29 14:30:38.000000000 +0200
-@@ -234,25 +234,25 @@
- 
- 	public function renderDiffToHTML() {
- 		$in_offset = 0;
--		ob_start();
-+		$html = '';
- 		foreach ( $this->edits as $edit ) {
- 			$n = $edit->getFromLen();
- 			if ( $edit instanceof FineDiffCopyOp ) {
--				FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
- 				}
- 			else if ( $edit instanceof FineDiffDeleteOp ) {
--				FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
- 				}
- 			else if ( $edit instanceof FineDiffInsertOp ) {
--				FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
- 				}
- 			else /* if ( $edit instanceof FineDiffReplaceOp ) */ {
--				FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
--				FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
- 				}
- 			$in_offset += $n;
- 			}
--		return ob_get_clean();
-+		return $html;
- 		}
- 
- 	/**------------------------------------------------------------------------
-@@ -277,18 +277,14 @@
- 	* Re-create the "To" string from the "From" string and an "Opcodes" string
- 	*/
- 	public static function renderToTextFromOpcodes($from, $opcodes) {
--		ob_start();
--		FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
--		return ob_get_clean();
-+		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
- 		}
- 
- 	/**------------------------------------------------------------------------
- 	* Render the diff to an HTML string
- 	*/
- 	public static function renderDiffToHTMLFromOpcodes($from, $opcodes) {
--		ob_start();
--		FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
--		return ob_get_clean();
-+		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
- 		}
- 
- 	/**------------------------------------------------------------------------
-@@ -297,8 +293,9 @@
- 	*/
- 	public static function renderFromOpcodes($from, $opcodes, $callback) {
- 		if ( !is_callable($callback) ) {
--			return;
-+			return '';
- 			}
-+		$out = '';
- 		$opcodes_len = strlen($opcodes);
- 		$from_offset = $opcodes_offset = 0;
- 		while ( $opcodes_offset <  $opcodes_len ) {
-@@ -312,18 +309,19 @@
- 				$n = 1;
- 				}
- 			if ( $opcode === 'c' ) { // copy n characters from source
--				call_user_func($callback, 'c', $from, $from_offset, $n, '');
-+				$out .= call_user_func($callback, 'c', $from, $from_offset, $n, '');
- 				$from_offset += $n;
- 				}
- 			else if ( $opcode === 'd' ) { // delete n characters from source
--				call_user_func($callback, 'd', $from, $from_offset, $n, '');
-+				$out .= call_user_func($callback, 'd', $from, $from_offset, $n, '');
- 				$from_offset += $n;
- 				}
- 			else /* if ( $opcode === 'i' ) */ { // insert n characters from opcodes
--				call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
-+				$out .= call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
- 				$opcodes_offset += 1 + $n;
- 				}
- 			}
-+		return $out;
- 		}
- 
- 	/**
-@@ -665,24 +663,26 @@
- 	*/
- 	private static function renderToTextFromOpcode($opcode, $from, $from_offset, $from_len) {
- 		if ( $opcode === 'c' || $opcode === 'i' ) {
--			echo substr($from, $from_offset, $from_len);
-+			return substr($from, $from_offset, $from_len);
- 			}
-+		return '';
- 		}
- 
- 	private static function renderDiffToHTMLFromOpcode($opcode, $from, $from_offset, $from_len) {
- 		if ( $opcode === 'c' ) {
--			echo htmlentities(substr($from, $from_offset, $from_len));
-+			return htmlentities(substr($from, $from_offset, $from_len));
- 			}
- 		else if ( $opcode === 'd' ) {
- 			$deletion = substr($from, $from_offset, $from_len);
- 			if ( strcspn($deletion, " \n\r") === 0 ) {
- 				$deletion = str_replace(array("\n","\r"), array('\n','\r'), $deletion);
- 				}
--			echo '<del>', htmlentities($deletion), '</del>';
-+			return '<del>' . htmlentities($deletion) . '</del>';
- 			}
- 		else /* if ( $opcode === 'i' ) */ {
-- 			echo '<ins>', htmlentities(substr($from, $from_offset, $from_len)), '</ins>';
-+ 			return '<ins>' . htmlentities(substr($from, $from_offset, $from_len)) . '</ins>';
- 			}
-+		return '';
- 		}
- 	}
- 
diff --git a/lib/ext/Auth/SASL.php b/lib/ext/Auth/SASL.php
deleted file mode 100644
index b2be93c..0000000
--- a/lib/ext/Auth/SASL.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* Client implementation of various SASL mechanisms 
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-require_once('PEAR.php');
-
-class Auth_SASL
-{
-    /**
-    * Factory class. Returns an object of the request
-    * type.
-    *
-    * @param string $type One of: Anonymous
-    *                             Plain
-    *                             CramMD5
-    *                             DigestMD5
-    *                     Types are not case sensitive
-    */
-    function &factory($type)
-    {
-        switch (strtolower($type)) {
-            case 'anonymous':
-                $filename  = 'Auth/SASL/Anonymous.php';
-                $classname = 'Auth_SASL_Anonymous';
-                break;
-
-            case 'login':
-                $filename  = 'Auth/SASL/Login.php';
-                $classname = 'Auth_SASL_Login';
-                break;
-
-            case 'plain':
-                $filename  = 'Auth/SASL/Plain.php';
-                $classname = 'Auth_SASL_Plain';
-                break;
-
-            case 'external':
-                $filename  = 'Auth/SASL/External.php';
-                $classname = 'Auth_SASL_External';
-                break;
-
-            case 'crammd5':
-                $filename  = 'Auth/SASL/CramMD5.php';
-                $classname = 'Auth_SASL_CramMD5';
-                break;
-
-            case 'digestmd5':
-                $filename  = 'Auth/SASL/DigestMD5.php';
-                $classname = 'Auth_SASL_DigestMD5';
-                break;
-
-            default:
-                return PEAR::raiseError('Invalid SASL mechanism type');
-                break;
-        }
-
-        require_once($filename);
-        $obj = new $classname();
-        return $obj;
-    }
-}
-
-?>
diff --git a/lib/ext/Auth/SASL/Anonymous.php b/lib/ext/Auth/SASL/Anonymous.php
deleted file mode 100644
index 0811909..0000000
--- a/lib/ext/Auth/SASL/Anonymous.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* Implmentation of ANONYMOUS SASL mechanism
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-require_once('Auth/SASL/Common.php');
-
-class Auth_SASL_Anonymous extends Auth_SASL_Common
-{
-    /**
-    * Not much to do here except return the token supplied.
-    * No encoding, hashing or encryption takes place for this
-    * mechanism, simply one of:
-    *  o An email address
-    *  o An opaque string not containing "@" that can be interpreted
-    *    by the sysadmin
-    *  o Nothing
-    *
-    * We could have some logic here for the second option, but this
-    * would by no means create something interpretable.
-    *
-    * @param  string $token Optional email address or string to provide
-    *                       as trace information.
-    * @return string        The unaltered input token
-    */
-    function getResponse($token = '')
-    {
-        return $token;
-    }
-}
-?>
\ No newline at end of file
diff --git a/lib/ext/Auth/SASL/Common.php b/lib/ext/Auth/SASL/Common.php
deleted file mode 100644
index e7a18e2..0000000
--- a/lib/ext/Auth/SASL/Common.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* Common functionality to SASL mechanisms
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-class Auth_SASL_Common
-{
-    /**
-    * Function which implements HMAC MD5 digest
-    *
-    * @param  string $key  The secret key
-    * @param  string $data The data to protect
-    * @return string       The HMAC MD5 digest
-    */
-    function _HMAC_MD5($key, $data)
-    {
-        if (strlen($key) > 64) {
-            $key = pack('H32', md5($key));
-        }
-
-        if (strlen($key) < 64) {
-            $key = str_pad($key, 64, chr(0));
-        }
-
-        $k_ipad = substr($key, 0, 64) ^ str_repeat(chr(0x36), 64);
-        $k_opad = substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64);
-
-        $inner  = pack('H32', md5($k_ipad . $data));
-        $digest = md5($k_opad . $inner);
-
-        return $digest;
-    }
-}
-?>
diff --git a/lib/ext/Auth/SASL/CramMD5.php b/lib/ext/Auth/SASL/CramMD5.php
deleted file mode 100644
index d3fbf17..0000000
--- a/lib/ext/Auth/SASL/CramMD5.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* Implmentation of CRAM-MD5 SASL mechanism
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-require_once('Auth/SASL/Common.php');
-
-class Auth_SASL_CramMD5 extends Auth_SASL_Common
-{
-    /**
-    * Implements the CRAM-MD5 SASL mechanism
-    * This DOES NOT base64 encode the return value,
-    * you will need to do that yourself.
-    *
-    * @param string $user      Username
-    * @param string $pass      Password
-    * @param string $challenge The challenge supplied by the server.
-    *                          this should be already base64_decoded.
-    *
-    * @return string The string to pass back to the server, of the form
-    *                "<user> <digest>". This is NOT base64_encoded.
-    */
-    function getResponse($user, $pass, $challenge)
-    {
-        return $user . ' ' . $this->_HMAC_MD5($pass, $challenge);
-    }
-}
-?>
\ No newline at end of file
diff --git a/lib/ext/Auth/SASL/DigestMD5.php b/lib/ext/Auth/SASL/DigestMD5.php
deleted file mode 100644
index 07007b7..0000000
--- a/lib/ext/Auth/SASL/DigestMD5.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* Implmentation of DIGEST-MD5 SASL mechanism
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-require_once('Auth/SASL/Common.php');
-
-class Auth_SASL_DigestMD5 extends Auth_SASL_Common
-{
-    /**
-    * Provides the (main) client response for DIGEST-MD5
-    * requires a few extra parameters than the other
-    * mechanisms, which are unavoidable.
-    * 
-    * @param  string $authcid   Authentication id (username)
-    * @param  string $pass      Password
-    * @param  string $challenge The digest challenge sent by the server
-    * @param  string $hostname  The hostname of the machine you're connecting to
-    * @param  string $service   The servicename (eg. imap, pop, acap etc)
-    * @param  string $authzid   Authorization id (username to proxy as)
-    * @return string            The digest response (NOT base64 encoded)
-    * @access public
-    */
-    function getResponse($authcid, $pass, $challenge, $hostname, $service, $authzid = '')
-    {
-        $challenge = $this->_parseChallenge($challenge);
-        $authzid_string = '';
-        if ($authzid != '') {
-            $authzid_string = ',authzid="' . $authzid . '"'; 
-        }
-
-        if (!empty($challenge)) {
-            $cnonce         = $this->_getCnonce();
-            $digest_uri     = sprintf('%s/%s', $service, $hostname);
-            $response_value = $this->_getResponseValue($authcid, $pass, $challenge['realm'], $challenge['nonce'], $cnonce, $digest_uri, $authzid);
-
-            if ($challenge['realm']) {
-                return sprintf('username="%s",realm="%s"' . $authzid_string  .
-',nonce="%s",cnonce="%s",nc=00000001,qop=auth,digest-uri="%s",response=%s,maxbuf=%d', $authcid, $challenge['realm'], $challenge['nonce'], $cnonce, $digest_uri, $response_value, $challenge['maxbuf']);
-            } else {
-                return sprintf('username="%s"' . $authzid_string  . ',nonce="%s",cnonce="%s",nc=00000001,qop=auth,digest-uri="%s",response=%s,maxbuf=%d', $authcid, $challenge['nonce'], $cnonce, $digest_uri, $response_value, $challenge['maxbuf']);
-            }
-        } else {
-            return PEAR::raiseError('Invalid digest challenge');
-        }
-    }
-    
-    /**
-    * Parses and verifies the digest challenge*
-    *
-    * @param  string $challenge The digest challenge
-    * @return array             The parsed challenge as an assoc
-    *                           array in the form "directive => value".
-    * @access private
-    */
-    function _parseChallenge($challenge)
-    {
-        $tokens = array();
-        while (preg_match('/^([a-z-]+)=("[^"]+(?<!\\\)"|[^,]+)/i', $challenge, $matches)) {
-
-            // Ignore these as per rfc2831
-            if ($matches[1] == 'opaque' OR $matches[1] == 'domain') {
-                $challenge = substr($challenge, strlen($matches[0]) + 1);
-                continue;
-            }
-
-            // Allowed multiple "realm" and "auth-param"
-            if (!empty($tokens[$matches[1]]) AND ($matches[1] == 'realm' OR $matches[1] == 'auth-param')) {
-                if (is_array($tokens[$matches[1]])) {
-                    $tokens[$matches[1]][] = preg_replace('/^"(.*)"$/', '\\1', $matches[2]);
-                } else {
-                    $tokens[$matches[1]] = array($tokens[$matches[1]], preg_replace('/^"(.*)"$/', '\\1', $matches[2]));
-                }
-
-            // Any other multiple instance = failure
-            } elseif (!empty($tokens[$matches[1]])) {
-                $tokens = array();
-                break;
-
-            } else {
-                $tokens[$matches[1]] = preg_replace('/^"(.*)"$/', '\\1', $matches[2]);
-            }
-
-            // Remove the just parsed directive from the challenge
-            $challenge = substr($challenge, strlen($matches[0]) + 1);
-        }
-
-        /**
-        * Defaults and required directives
-        */
-        // Realm
-        if (empty($tokens['realm'])) {
-            $tokens['realm'] = "";
-        }
-
-        // Maxbuf
-        if (empty($tokens['maxbuf'])) {
-            $tokens['maxbuf'] = 65536;
-        }
-
-        // Required: nonce, algorithm
-        if (empty($tokens['nonce']) OR empty($tokens['algorithm'])) {
-            return array();
-        }
-
-        return $tokens;
-    }
-
-    /**
-    * Creates the response= part of the digest response
-    *
-    * @param  string $authcid    Authentication id (username)
-    * @param  string $pass       Password
-    * @param  string $realm      Realm as provided by the server
-    * @param  string $nonce      Nonce as provided by the server
-    * @param  string $cnonce     Client nonce
-    * @param  string $digest_uri The digest-uri= value part of the response
-    * @param  string $authzid    Authorization id
-    * @return string             The response= part of the digest response
-    * @access private
-    */    
-    function _getResponseValue($authcid, $pass, $realm, $nonce, $cnonce, $digest_uri, $authzid = '')
-    {
-        if ($authzid == '') {
-            $A1 = sprintf('%s:%s:%s', pack('H32', md5(sprintf('%s:%s:%s', $authcid, $realm, $pass))), $nonce, $cnonce);
-        } else {
-            $A1 = sprintf('%s:%s:%s:%s', pack('H32', md5(sprintf('%s:%s:%s', $authcid, $realm, $pass))), $nonce, $cnonce, $authzid);
-        }
-        $A2 = 'AUTHENTICATE:' . $digest_uri;
-        return md5(sprintf('%s:%s:00000001:%s:auth:%s', md5($A1), $nonce, $cnonce, md5($A2)));
-    }
-
-    /**
-    * Creates the client nonce for the response
-    *
-    * @return string  The cnonce value
-    * @access private
-    */
-    function _getCnonce()
-    {
-        if (@file_exists('/dev/urandom') && $fd = @fopen('/dev/urandom', 'r')) {
-            return base64_encode(fread($fd, 32));
-
-        } elseif (@file_exists('/dev/random') && $fd = @fopen('/dev/random', 'r')) {
-            return base64_encode(fread($fd, 32));
-
-        } else {
-            $str = '';
-            for ($i=0; $i<32; $i++) {
-                $str .= chr(mt_rand(0, 255));
-            }
-            
-            return base64_encode($str);
-        }
-    }
-}
-?>
diff --git a/lib/ext/Auth/SASL/External.php b/lib/ext/Auth/SASL/External.php
deleted file mode 100644
index 86a17cb..0000000
--- a/lib/ext/Auth/SASL/External.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2008 Christoph Schulz                                   | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Christoph Schulz <develop@kristov.de>                         | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id: External.php 286825 2009-08-05 06:23:42Z cweiske $
-
-/**
-* Implmentation of EXTERNAL SASL mechanism
-*
-* @author  Christoph Schulz <develop@kristov.de>
-* @access  public
-* @version 1.0.3
-* @package Auth_SASL
-*/
-
-require_once('Auth/SASL/Common.php');
-
-class Auth_SASL_External extends Auth_SASL_Common
-{
-    /**
-    * Returns EXTERNAL response
-    *
-    * @param  string $authcid   Authentication id (username)
-    * @param  string $pass      Password
-    * @param  string $authzid   Autorization id
-    * @return string            EXTERNAL Response
-    */
-    function getResponse($authcid, $pass, $authzid = '')
-    {
-        return $authzid;
-    }
-}
-?>
diff --git a/lib/ext/Auth/SASL/Login.php b/lib/ext/Auth/SASL/Login.php
deleted file mode 100644
index 918daee..0000000
--- a/lib/ext/Auth/SASL/Login.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* This is technically not a SASL mechanism, however
-* it's used by Net_Sieve, Net_Cyrus and potentially
-* other protocols , so here is a good place to abstract
-* it.
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-require_once('Auth/SASL/Common.php');
-
-class Auth_SASL_Login extends Auth_SASL_Common
-{
-    /**
-    * Pseudo SASL LOGIN mechanism
-    *
-    * @param  string $user Username
-    * @param  string $pass Password
-    * @return string       LOGIN string
-    */
-    function getResponse($user, $pass)
-    {
-        return sprintf('LOGIN %s %s', $user, $pass);
-    }
-}
-?>
\ No newline at end of file
diff --git a/lib/ext/Auth/SASL/Plain.php b/lib/ext/Auth/SASL/Plain.php
deleted file mode 100644
index 57894d0..0000000
--- a/lib/ext/Auth/SASL/Plain.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* Implmentation of PLAIN SASL mechanism
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-require_once('Auth/SASL/Common.php');
-
-class Auth_SASL_Plain extends Auth_SASL_Common
-{
-    /**
-    * Returns PLAIN response
-    *
-    * @param  string $authcid   Authentication id (username)
-    * @param  string $pass      Password
-    * @param  string $authzid   Autorization id
-    * @return string            PLAIN Response
-    */
-    function getResponse($authcid, $pass, $authzid = '')
-    {
-        return $authzid . chr(0) . $authcid . chr(0) . $pass;
-    }
-}
-?>
diff --git a/lib/ext/HTTP/Request2.php b/lib/ext/HTTP/Request2.php
deleted file mode 100644
index 6d8d953..0000000
--- a/lib/ext/HTTP/Request2.php
+++ /dev/null
@@ -1,1015 +0,0 @@
-<?php
-/**
- * Class representing a HTTP request message
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Request2.php 315409 2011-08-24 07:29:23Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * A class representing an URL as per RFC 3986.
- */
-require_once 'Net/URL2.php';
-
-/**
- * Exception class for HTTP_Request2 package
- */
-require_once 'HTTP/Request2/Exception.php';
-
-/**
- * Class representing a HTTP request message
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 2.0.0
- * @link       http://tools.ietf.org/html/rfc2616#section-5
- */
-class HTTP_Request2 implements SplSubject
-{
-   /**#@+
-    * Constants for HTTP request methods
-    *
-    * @link http://tools.ietf.org/html/rfc2616#section-5.1.1
-    */
-    const METHOD_OPTIONS = 'OPTIONS';
-    const METHOD_GET     = 'GET';
-    const METHOD_HEAD    = 'HEAD';
-    const METHOD_POST    = 'POST';
-    const METHOD_PUT     = 'PUT';
-    const METHOD_DELETE  = 'DELETE';
-    const METHOD_TRACE   = 'TRACE';
-    const METHOD_CONNECT = 'CONNECT';
-   /**#@-*/
-
-   /**#@+
-    * Constants for HTTP authentication schemes
-    *
-    * @link http://tools.ietf.org/html/rfc2617
-    */
-    const AUTH_BASIC  = 'basic';
-    const AUTH_DIGEST = 'digest';
-   /**#@-*/
-
-   /**
-    * Regular expression used to check for invalid symbols in RFC 2616 tokens
-    * @link http://pear.php.net/bugs/bug.php?id=15630
-    */
-    const REGEXP_INVALID_TOKEN = '![\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]!';
-
-   /**
-    * Regular expression used to check for invalid symbols in cookie strings
-    * @link http://pear.php.net/bugs/bug.php?id=15630
-    * @link http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
-    */
-    const REGEXP_INVALID_COOKIE = '/[\s,;]/';
-
-   /**
-    * Fileinfo magic database resource
-    * @var  resource
-    * @see  detectMimeType()
-    */
-    private static $_fileinfoDb;
-
-   /**
-    * Observers attached to the request (instances of SplObserver)
-    * @var  array
-    */
-    protected $observers = array();
-
-   /**
-    * Request URL
-    * @var  Net_URL2
-    */
-    protected $url;
-
-   /**
-    * Request method
-    * @var  string
-    */
-    protected $method = self::METHOD_GET;
-
-   /**
-    * Authentication data
-    * @var  array
-    * @see  getAuth()
-    */
-    protected $auth;
-
-   /**
-    * Request headers
-    * @var  array
-    */
-    protected $headers = array();
-
-   /**
-    * Configuration parameters
-    * @var  array
-    * @see  setConfig()
-    */
-    protected $config = array(
-        'adapter'           => 'HTTP_Request2_Adapter_Socket',
-        'connect_timeout'   => 10,
-        'timeout'           => 0,
-        'use_brackets'      => true,
-        'protocol_version'  => '1.1',
-        'buffer_size'       => 16384,
-        'store_body'        => true,
-
-        'proxy_host'        => '',
-        'proxy_port'        => '',
-        'proxy_user'        => '',
-        'proxy_password'    => '',
-        'proxy_auth_scheme' => self::AUTH_BASIC,
-
-        'ssl_verify_peer'   => true,
-        'ssl_verify_host'   => true,
-        'ssl_cafile'        => null,
-        'ssl_capath'        => null,
-        'ssl_local_cert'    => null,
-        'ssl_passphrase'    => null,
-
-        'digest_compat_ie'  => false,
-
-        'follow_redirects'  => false,
-        'max_redirects'     => 5,
-        'strict_redirects'  => false
-    );
-
-   /**
-    * Last event in request / response handling, intended for observers
-    * @var  array
-    * @see  getLastEvent()
-    */
-    protected $lastEvent = array(
-        'name' => 'start',
-        'data' => null
-    );
-
-   /**
-    * Request body
-    * @var  string|resource
-    * @see  setBody()
-    */
-    protected $body = '';
-
-   /**
-    * Array of POST parameters
-    * @var  array
-    */
-    protected $postParams = array();
-
-   /**
-    * Array of file uploads (for multipart/form-data POST requests)
-    * @var  array
-    */
-    protected $uploads = array();
-
-   /**
-    * Adapter used to perform actual HTTP request
-    * @var  HTTP_Request2_Adapter
-    */
-    protected $adapter;
-
-   /**
-    * Cookie jar to persist cookies between requests
-    * @var HTTP_Request2_CookieJar
-    */
-    protected $cookieJar = null;
-
-   /**
-    * Constructor. Can set request URL, method and configuration array.
-    *
-    * Also sets a default value for User-Agent header.
-    *
-    * @param    string|Net_Url2     Request URL
-    * @param    string              Request method
-    * @param    array               Configuration for this Request instance
-    */
-    public function __construct($url = null, $method = self::METHOD_GET, array $config = array())
-    {
-        $this->setConfig($config);
-        if (!empty($url)) {
-            $this->setUrl($url);
-        }
-        if (!empty($method)) {
-            $this->setMethod($method);
-        }
-        $this->setHeader('user-agent', 'HTTP_Request2/2.0.0 ' .
-                         '(http://pear.php.net/package/http_request2) ' .
-                         'PHP/' . phpversion());
-    }
-
-   /**
-    * Sets the URL for this request
-    *
-    * If the URL has userinfo part (username & password) these will be removed
-    * and converted to auth data. If the URL does not have a path component,
-    * that will be set to '/'.
-    *
-    * @param    string|Net_URL2 Request URL
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException
-    */
-    public function setUrl($url)
-    {
-        if (is_string($url)) {
-            $url = new Net_URL2(
-                $url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config['use_brackets'])
-            );
-        }
-        if (!$url instanceof Net_URL2) {
-            throw new HTTP_Request2_LogicException(
-                'Parameter is not a valid HTTP URL',
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        // URL contains username / password?
-        if ($url->getUserinfo()) {
-            $username = $url->getUser();
-            $password = $url->getPassword();
-            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');
-            $url->setUserinfo('');
-        }
-        if ('' == $url->getPath()) {
-            $url->setPath('/');
-        }
-        $this->url = $url;
-
-        return $this;
-    }
-
-   /**
-    * Returns the request URL
-    *
-    * @return   Net_URL2
-    */
-    public function getUrl()
-    {
-        return $this->url;
-    }
-
-   /**
-    * Sets the request method
-    *
-    * @param    string
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException if the method name is invalid
-    */
-    public function setMethod($method)
-    {
-        // Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1
-        if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {
-            throw new HTTP_Request2_LogicException(
-                "Invalid request method '{$method}'",
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        $this->method = $method;
-
-        return $this;
-    }
-
-   /**
-    * Returns the request method
-    *
-    * @return   string
-    */
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-   /**
-    * Sets the configuration parameter(s)
-    *
-    * The following parameters are available:
-    * <ul>
-    *   <li> 'adapter'           - adapter to use (string)</li>
-    *   <li> 'connect_timeout'   - Connection timeout in seconds (integer)</li>
-    *   <li> 'timeout'           - Total number of seconds a request can take.
-    *                              Use 0 for no limit, should be greater than
-    *                              'connect_timeout' if set (integer)</li>
-    *   <li> 'use_brackets'      - Whether to append [] to array variable names (bool)</li>
-    *   <li> 'protocol_version'  - HTTP Version to use, '1.0' or '1.1' (string)</li>
-    *   <li> 'buffer_size'       - Buffer size to use for reading and writing (int)</li>
-    *   <li> 'store_body'        - Whether to store response body in response object.
-    *                              Set to false if receiving a huge response and
-    *                              using an Observer to save it (boolean)</li>
-    *   <li> 'proxy_host'        - Proxy server host (string)</li>
-    *   <li> 'proxy_port'        - Proxy server port (integer)</li>
-    *   <li> 'proxy_user'        - Proxy auth username (string)</li>
-    *   <li> 'proxy_password'    - Proxy auth password (string)</li>
-    *   <li> 'proxy_auth_scheme' - Proxy auth scheme, one of HTTP_Request2::AUTH_* constants (string)</li>
-    *   <li> 'ssl_verify_peer'   - Whether to verify peer's SSL certificate (bool)</li>
-    *   <li> 'ssl_verify_host'   - Whether to check that Common Name in SSL
-    *                              certificate matches host name (bool)</li>
-    *   <li> 'ssl_cafile'        - Cerificate Authority file to verify the peer
-    *                              with (use with 'ssl_verify_peer') (string)</li>
-    *   <li> 'ssl_capath'        - Directory holding multiple Certificate
-    *                              Authority files (string)</li>
-    *   <li> 'ssl_local_cert'    - Name of a file containing local cerificate (string)</li>
-    *   <li> 'ssl_passphrase'    - Passphrase with which local certificate
-    *                              was encoded (string)</li>
-    *   <li> 'digest_compat_ie'  - Whether to imitate behaviour of MSIE 5 and 6
-    *                              in using URL without query string in digest
-    *                              authentication (boolean)</li>
-    *   <li> 'follow_redirects'  - Whether to automatically follow HTTP Redirects (boolean)</li>
-    *   <li> 'max_redirects'     - Maximum number of redirects to follow (integer)</li>
-    *   <li> 'strict_redirects'  - Whether to keep request method on redirects via status 301 and
-    *                              302 (true, needed for compatibility with RFC 2616)
-    *                              or switch to GET (false, needed for compatibility with most
-    *                              browsers) (boolean)</li>
-    * </ul>
-    *
-    * @param    string|array    configuration parameter name or array
-    *                           ('parameter name' => 'parameter value')
-    * @param    mixed           parameter value if $nameOrConfig is not an array
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException If the parameter is unknown
-    */
-    public function setConfig($nameOrConfig, $value = null)
-    {
-        if (is_array($nameOrConfig)) {
-            foreach ($nameOrConfig as $name => $value) {
-                $this->setConfig($name, $value);
-            }
-
-        } else {
-            if (!array_key_exists($nameOrConfig, $this->config)) {
-                throw new HTTP_Request2_LogicException(
-                    "Unknown configuration parameter '{$nameOrConfig}'",
-                    HTTP_Request2_Exception::INVALID_ARGUMENT
-                );
-            }
-            $this->config[$nameOrConfig] = $value;
-        }
-
-        return $this;
-    }
-
-   /**
-    * Returns the value(s) of the configuration parameter(s)
-    *
-    * @param    string  parameter name
-    * @return   mixed   value of $name parameter, array of all configuration
-    *                   parameters if $name is not given
-    * @throws   HTTP_Request2_LogicException If the parameter is unknown
-    */
-    public function getConfig($name = null)
-    {
-        if (null === $name) {
-            return $this->config;
-        } elseif (!array_key_exists($name, $this->config)) {
-            throw new HTTP_Request2_LogicException(
-                "Unknown configuration parameter '{$name}'",
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        return $this->config[$name];
-    }
-
-   /**
-    * Sets the autentification data
-    *
-    * @param    string  user name
-    * @param    string  password
-    * @param    string  authentication scheme
-    * @return   HTTP_Request2
-    */
-    public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)
-    {
-        if (empty($user)) {
-            $this->auth = null;
-        } else {
-            $this->auth = array(
-                'user'     => (string)$user,
-                'password' => (string)$password,
-                'scheme'   => $scheme
-            );
-        }
-
-        return $this;
-    }
-
-   /**
-    * Returns the authentication data
-    *
-    * The array has the keys 'user', 'password' and 'scheme', where 'scheme'
-    * is one of the HTTP_Request2::AUTH_* constants.
-    *
-    * @return   array
-    */
-    public function getAuth()
-    {
-        return $this->auth;
-    }
-
-   /**
-    * Sets request header(s)
-    *
-    * The first parameter may be either a full header string 'header: value' or
-    * header name. In the former case $value parameter is ignored, in the latter
-    * the header's value will either be set to $value or the header will be
-    * removed if $value is null. The first parameter can also be an array of
-    * headers, in that case method will be called recursively.
-    *
-    * Note that headers are treated case insensitively as per RFC 2616.
-    *
-    * <code>
-    * $req->setHeader('Foo: Bar'); // sets the value of 'Foo' header to 'Bar'
-    * $req->setHeader('FoO', 'Baz'); // sets the value of 'Foo' header to 'Baz'
-    * $req->setHeader(array('foo' => 'Quux')); // sets the value of 'Foo' header to 'Quux'
-    * $req->setHeader('FOO'); // removes 'Foo' header from request
-    * </code>
-    *
-    * @param    string|array    header name, header string ('Header: value')
-    *                           or an array of headers
-    * @param    string|array|null header value if $name is not an array,
-    *                           header will be removed if value is null
-    * @param    bool            whether to replace previous header with the
-    *                           same name or append to its value
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException
-    */
-    public function setHeader($name, $value = null, $replace = true)
-    {
-        if (is_array($name)) {
-            foreach ($name as $k => $v) {
-                if (is_string($k)) {
-                    $this->setHeader($k, $v, $replace);
-                } else {
-                    $this->setHeader($v, null, $replace);
-                }
-            }
-        } else {
-            if (null === $value && strpos($name, ':')) {
-                list($name, $value) = array_map('trim', explode(':', $name, 2));
-            }
-            // Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2
-            if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {
-                throw new HTTP_Request2_LogicException(
-                    "Invalid header name '{$name}'",
-                    HTTP_Request2_Exception::INVALID_ARGUMENT
-                );
-            }
-            // Header names are case insensitive anyway
-            $name = strtolower($name);
-            if (null === $value) {
-                unset($this->headers[$name]);
-
-            } else {
-                if (is_array($value)) {
-                    $value = implode(', ', array_map('trim', $value));
-                } elseif (is_string($value)) {
-                    $value = trim($value);
-                }
-                if (!isset($this->headers[$name]) || $replace) {
-                    $this->headers[$name] = $value;
-                } else {
-                    $this->headers[$name] .= ', ' . $value;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-   /**
-    * Returns the request headers
-    *
-    * The array is of the form ('header name' => 'header value'), header names
-    * are lowercased
-    *
-    * @return   array
-    */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-   /**
-    * Adds a cookie to the request
-    *
-    * If the request does not have a CookieJar object set, this method simply
-    * appends a cookie to "Cookie:" header.
-    *
-    * If a CookieJar object is available, the cookie is stored in that object.
-    * Data from request URL will be used for setting its 'domain' and 'path'
-    * parameters, 'expires' and 'secure' will be set to null and false,
-    * respectively. If you need further control, use CookieJar's methods.
-    *
-    * @param    string  cookie name
-    * @param    string  cookie value
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException
-    * @see      setCookieJar()
-    */
-    public function addCookie($name, $value)
-    {
-        if (!empty($this->cookieJar)) {
-            $this->cookieJar->store(array('name' => $name, 'value' => $value),
-                                    $this->url);
-
-        } else {
-            $cookie = $name . '=' . $value;
-            if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {
-                throw new HTTP_Request2_LogicException(
-                    "Invalid cookie: '{$cookie}'",
-                    HTTP_Request2_Exception::INVALID_ARGUMENT
-                );
-            }
-            $cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';
-            $this->setHeader('cookie', $cookies . $cookie);
-        }
-
-        return $this;
-    }
-
-   /**
-    * Sets the request body
-    *
-    * If you provide file pointer rather than file name, it should support
-    * fstat() and rewind() operations.
-    *
-    * @param    string|resource|HTTP_Request2_MultipartBody  Either a string
-    *               with the body or filename containing body or pointer to
-    *               an open file or object with multipart body data
-    * @param    bool    Whether first parameter is a filename
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException
-    */
-    public function setBody($body, $isFilename = false)
-    {
-        if (!$isFilename && !is_resource($body)) {
-            if (!$body instanceof HTTP_Request2_MultipartBody) {
-                $this->body = (string)$body;
-            } else {
-                $this->body = $body;
-            }
-        } else {
-            $fileData = $this->fopenWrapper($body, empty($this->headers['content-type']));
-            $this->body = $fileData['fp'];
-            if (empty($this->headers['content-type'])) {
-                $this->setHeader('content-type', $fileData['type']);
-            }
-        }
-        $this->postParams = $this->uploads = array();
-
-        return $this;
-    }
-
-   /**
-    * Returns the request body
-    *
-    * @return   string|resource|HTTP_Request2_MultipartBody
-    */
-    public function getBody()
-    {
-        if (self::METHOD_POST == $this->method &&
-            (!empty($this->postParams) || !empty($this->uploads))
-        ) {
-            if (0 === strpos($this->headers['content-type'], 'application/x-www-form-urlencoded')) {
-                $body = http_build_query($this->postParams, '', '&');
-                if (!$this->getConfig('use_brackets')) {
-                    $body = preg_replace('/%5B\d+%5D=/', '=', $body);
-                }
-                // support RFC 3986 by not encoding '~' symbol (request #15368)
-                return str_replace('%7E', '~', $body);
-
-            } elseif (0 === strpos($this->headers['content-type'], 'multipart/form-data')) {
-                require_once 'HTTP/Request2/MultipartBody.php';
-                return new HTTP_Request2_MultipartBody(
-                    $this->postParams, $this->uploads, $this->getConfig('use_brackets')
-                );
-            }
-        }
-        return $this->body;
-    }
-
-   /**
-    * Adds a file to form-based file upload
-    *
-    * Used to emulate file upload via a HTML form. The method also sets
-    * Content-Type of HTTP request to 'multipart/form-data'.
-    *
-    * If you just want to send the contents of a file as the body of HTTP
-    * request you should use setBody() method.
-    *
-    * If you provide file pointers rather than file names, they should support
-    * fstat() and rewind() operations.
-    *
-    * @param    string  name of file-upload field
-    * @param    string|resource|array   full name of local file, pointer to
-    *               open file or an array of files
-    * @param    string  filename to send in the request
-    * @param    string  content-type of file being uploaded
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException
-    */
-    public function addUpload($fieldName, $filename, $sendFilename = null,
-                              $contentType = null)
-    {
-        if (!is_array($filename)) {
-            $fileData = $this->fopenWrapper($filename, empty($contentType));
-            $this->uploads[$fieldName] = array(
-                'fp'        => $fileData['fp'],
-                'filename'  => !empty($sendFilename)? $sendFilename
-                                :(is_string($filename)? basename($filename): 'anonymous.blob') ,
-                'size'      => $fileData['size'],
-                'type'      => empty($contentType)? $fileData['type']: $contentType
-            );
-        } else {
-            $fps = $names = $sizes = $types = array();
-            foreach ($filename as $f) {
-                if (!is_array($f)) {
-                    $f = array($f);
-                }
-                $fileData = $this->fopenWrapper($f[0], empty($f[2]));
-                $fps[]   = $fileData['fp'];
-                $names[] = !empty($f[1])? $f[1]
-                            :(is_string($f[0])? basename($f[0]): 'anonymous.blob');
-                $sizes[] = $fileData['size'];
-                $types[] = empty($f[2])? $fileData['type']: $f[2];
-            }
-            $this->uploads[$fieldName] = array(
-                'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types
-            );
-        }
-        if (empty($this->headers['content-type']) ||
-            'application/x-www-form-urlencoded' == $this->headers['content-type']
-        ) {
-            $this->setHeader('content-type', 'multipart/form-data');
-        }
-
-        return $this;
-    }
-
-   /**
-    * Adds POST parameter(s) to the request.
-    *
-    * @param    string|array    parameter name or array ('name' => 'value')
-    * @param    mixed           parameter value (can be an array)
-    * @return   HTTP_Request2
-    */
-    public function addPostParameter($name, $value = null)
-    {
-        if (!is_array($name)) {
-            $this->postParams[$name] = $value;
-        } else {
-            foreach ($name as $k => $v) {
-                $this->addPostParameter($k, $v);
-            }
-        }
-        if (empty($this->headers['content-type'])) {
-            $this->setHeader('content-type', 'application/x-www-form-urlencoded');
-        }
-
-        return $this;
-    }
-
-   /**
-    * Attaches a new observer
-    *
-    * @param    SplObserver
-    */
-    public function attach(SplObserver $observer)
-    {
-        foreach ($this->observers as $attached) {
-            if ($attached === $observer) {
-                return;
-            }
-        }
-        $this->observers[] = $observer;
-    }
-
-   /**
-    * Detaches an existing observer
-    *
-    * @param    SplObserver
-    */
-    public function detach(SplObserver $observer)
-    {
-        foreach ($this->observers as $key => $attached) {
-            if ($attached === $observer) {
-                unset($this->observers[$key]);
-                return;
-            }
-        }
-    }
-
-   /**
-    * Notifies all observers
-    */
-    public function notify()
-    {
-        foreach ($this->observers as $observer) {
-            $observer->update($this);
-        }
-    }
-
-   /**
-    * Sets the last event
-    *
-    * Adapters should use this method to set the current state of the request
-    * and notify the observers.
-    *
-    * @param    string  event name
-    * @param    mixed   event data
-    */
-    public function setLastEvent($name, $data = null)
-    {
-        $this->lastEvent = array(
-            'name' => $name,
-            'data' => $data
-        );
-        $this->notify();
-    }
-
-   /**
-    * Returns the last event
-    *
-    * Observers should use this method to access the last change in request.
-    * The following event names are possible:
-    * <ul>
-    *   <li>'connect'                 - after connection to remote server,
-    *                                   data is the destination (string)</li>
-    *   <li>'disconnect'              - after disconnection from server</li>
-    *   <li>'sentHeaders'             - after sending the request headers,
-    *                                   data is the headers sent (string)</li>
-    *   <li>'sentBodyPart'            - after sending a part of the request body,
-    *                                   data is the length of that part (int)</li>
-    *   <li>'sentBody'                - after sending the whole request body,
-    *                                   data is request body length (int)</li>
-    *   <li>'receivedHeaders'         - after receiving the response headers,
-    *                                   data is HTTP_Request2_Response object</li>
-    *   <li>'receivedBodyPart'        - after receiving a part of the response
-    *                                   body, data is that part (string)</li>
-    *   <li>'receivedEncodedBodyPart' - as 'receivedBodyPart', but data is still
-    *                                   encoded by Content-Encoding</li>
-    *   <li>'receivedBody'            - after receiving the complete response
-    *                                   body, data is HTTP_Request2_Response object</li>
-    * </ul>
-    * Different adapters may not send all the event types. Mock adapter does
-    * not send any events to the observers.
-    *
-    * @return   array   The array has two keys: 'name' and 'data'
-    */
-    public function getLastEvent()
-    {
-        return $this->lastEvent;
-    }
-
-   /**
-    * Sets the adapter used to actually perform the request
-    *
-    * You can pass either an instance of a class implementing HTTP_Request2_Adapter
-    * or a class name. The method will only try to include a file if the class
-    * name starts with HTTP_Request2_Adapter_, it will also try to prepend this
-    * prefix to the class name if it doesn't contain any underscores, so that
-    * <code>
-    * $request->setAdapter('curl');
-    * </code>
-    * will work.
-    *
-    * @param    string|HTTP_Request2_Adapter
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException
-    */
-    public function setAdapter($adapter)
-    {
-        if (is_string($adapter)) {
-            if (!class_exists($adapter, false)) {
-                if (false === strpos($adapter, '_')) {
-                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);
-                }
-                if (preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)) {
-                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';
-                }
-                if (!class_exists($adapter, false)) {
-                    throw new HTTP_Request2_LogicException(
-                        "Class {$adapter} not found",
-                        HTTP_Request2_Exception::MISSING_VALUE
-                    );
-                }
-            }
-            $adapter = new $adapter;
-        }
-        if (!$adapter instanceof HTTP_Request2_Adapter) {
-            throw new HTTP_Request2_LogicException(
-                'Parameter is not a HTTP request adapter',
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        $this->adapter = $adapter;
-
-        return $this;
-    }
-
-   /**
-    * Sets the cookie jar
-    *
-    * A cookie jar is used to maintain cookies across HTTP requests and
-    * responses. Cookies from jar will be automatically added to the request
-    * headers based on request URL.
-    *
-    * @param HTTP_Request2_CookieJar|bool   Existing CookieJar object, true to
-    *                                       create a new one, false to remove
-    */
-    public function setCookieJar($jar = true)
-    {
-        if (!class_exists('HTTP_Request2_CookieJar', false)) {
-            require_once 'HTTP/Request2/CookieJar.php';
-        }
-
-        if ($jar instanceof HTTP_Request2_CookieJar) {
-            $this->cookieJar = $jar;
-        } elseif (true === $jar) {
-            $this->cookieJar = new HTTP_Request2_CookieJar();
-        } elseif (!$jar) {
-            $this->cookieJar = null;
-        } else {
-            throw new HTTP_Request2_LogicException(
-                'Invalid parameter passed to setCookieJar()',
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-
-        return $this;
-    }
-
-   /**
-    * Returns current CookieJar object or null if none
-    *
-    * @return HTTP_Request2_CookieJar|null
-    */
-    public function getCookieJar()
-    {
-        return $this->cookieJar;
-    }
-
-   /**
-    * Sends the request and returns the response
-    *
-    * @throws   HTTP_Request2_Exception
-    * @return   HTTP_Request2_Response
-    */
-    public function send()
-    {
-        // Sanity check for URL
-        if (!$this->url instanceof Net_URL2
-            || !$this->url->isAbsolute()
-            || !in_array(strtolower($this->url->getScheme()), array('https', 'http'))
-        ) {
-            throw new HTTP_Request2_LogicException(
-                'HTTP_Request2 needs an absolute HTTP(S) request URL, '
-                . ($this->url instanceof Net_URL2
-                   ? "'" . $this->url->__toString() . "'" : 'none')
-                . ' given',
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        if (empty($this->adapter)) {
-            $this->setAdapter($this->getConfig('adapter'));
-        }
-        // magic_quotes_runtime may break file uploads and chunked response
-        // processing; see bug #4543. Don't use ini_get() here; see bug #16440.
-        if ($magicQuotes = get_magic_quotes_runtime()) {
-            set_magic_quotes_runtime(false);
-        }
-        // force using single byte encoding if mbstring extension overloads
-        // strlen() and substr(); see bug #1781, bug #10605
-        if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
-            $oldEncoding = mb_internal_encoding();
-            mb_internal_encoding('iso-8859-1');
-        }
-
-        try {
-            $response = $this->adapter->sendRequest($this);
-        } catch (Exception $e) {
-        }
-        // cleanup in either case (poor man's "finally" clause)
-        if ($magicQuotes) {
-            set_magic_quotes_runtime(true);
-        }
-        if (!empty($oldEncoding)) {
-            mb_internal_encoding($oldEncoding);
-        }
-        // rethrow the exception
-        if (!empty($e)) {
-            throw $e;
-        }
-        return $response;
-    }
-
-   /**
-    * Wrapper around fopen()/fstat() used by setBody() and addUpload()
-    *
-    * @param  string|resource file name or pointer to open file
-    * @param  bool            whether to try autodetecting MIME type of file,
-    *                         will only work if $file is a filename, not pointer
-    * @return array array('fp' => file pointer, 'size' => file size, 'type' => MIME type)
-    * @throws HTTP_Request2_LogicException
-    */
-    protected function fopenWrapper($file, $detectType = false)
-    {
-        if (!is_string($file) && !is_resource($file)) {
-            throw new HTTP_Request2_LogicException(
-                "Filename or file pointer resource expected",
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        $fileData = array(
-            'fp'   => is_string($file)? null: $file,
-            'type' => 'application/octet-stream',
-            'size' => 0
-        );
-        if (is_string($file)) {
-            $track = @ini_set('track_errors', 1);
-            if (!($fileData['fp'] = @fopen($file, 'rb'))) {
-                $e = new HTTP_Request2_LogicException(
-                    $php_errormsg, HTTP_Request2_Exception::READ_ERROR
-                );
-            }
-            @ini_set('track_errors', $track);
-            if (isset($e)) {
-                throw $e;
-            }
-            if ($detectType) {
-                $fileData['type'] = self::detectMimeType($file);
-            }
-        }
-        if (!($stat = fstat($fileData['fp']))) {
-            throw new HTTP_Request2_LogicException(
-                "fstat() call failed", HTTP_Request2_Exception::READ_ERROR
-            );
-        }
-        $fileData['size'] = $stat['size'];
-
-        return $fileData;
-    }
-
-   /**
-    * Tries to detect MIME type of a file
-    *
-    * The method will try to use fileinfo extension if it is available,
-    * deprecated mime_content_type() function in the other case. If neither
-    * works, default 'application/octet-stream' MIME type is returned
-    *
-    * @param    string  filename
-    * @return   string  file MIME type
-    */
-    protected static function detectMimeType($filename)
-    {
-        // finfo extension from PECL available
-        if (function_exists('finfo_open')) {
-            if (!isset(self::$_fileinfoDb)) {
-                self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);
-            }
-            if (self::$_fileinfoDb) {
-                $info = finfo_file(self::$_fileinfoDb, $filename);
-            }
-        }
-        // (deprecated) mime_content_type function available
-        if (empty($info) && function_exists('mime_content_type')) {
-            return mime_content_type($filename);
-        }
-        return empty($info)? 'application/octet-stream': $info;
-    }
-}
-?>
diff --git a/lib/ext/HTTP/Request2/Adapter.php b/lib/ext/HTTP/Request2/Adapter.php
deleted file mode 100644
index 56d81a9..0000000
--- a/lib/ext/HTTP/Request2/Adapter.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Base class for HTTP_Request2 adapters
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Adapter.php 308322 2011-02-14 13:58:03Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Class representing a HTTP response
- */
-require_once 'HTTP/Request2/Response.php';
-
-/**
- * Base class for HTTP_Request2 adapters
- *
- * HTTP_Request2 class itself only defines methods for aggregating the request
- * data, all actual work of sending the request to the remote server and
- * receiving its response is performed by adapters.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 2.0.0
- */
-abstract class HTTP_Request2_Adapter
-{
-   /**
-    * A list of methods that MUST NOT have a request body, per RFC 2616
-    * @var  array
-    */
-    protected static $bodyDisallowed = array('TRACE');
-
-   /**
-    * Methods having defined semantics for request body
-    *
-    * Content-Length header (indicating that the body follows, section 4.3 of
-    * RFC 2616) will be sent for these methods even if no body was added
-    *
-    * @var  array
-    * @link http://pear.php.net/bugs/bug.php?id=12900
-    * @link http://pear.php.net/bugs/bug.php?id=14740
-    */
-    protected static $bodyRequired = array('POST', 'PUT');
-
-   /**
-    * Request being sent
-    * @var  HTTP_Request2
-    */
-    protected $request;
-
-   /**
-    * Request body
-    * @var  string|resource|HTTP_Request2_MultipartBody
-    * @see  HTTP_Request2::getBody()
-    */
-    protected $requestBody;
-
-   /**
-    * Length of the request body
-    * @var  integer
-    */
-    protected $contentLength;
-
-   /**
-    * Sends request to the remote server and returns its response
-    *
-    * @param    HTTP_Request2
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    abstract public function sendRequest(HTTP_Request2 $request);
-
-   /**
-    * Calculates length of the request body, adds proper headers
-    *
-    * @param    array   associative array of request headers, this method will
-    *                   add proper 'Content-Length' and 'Content-Type' headers
-    *                   to this array (or remove them if not needed)
-    */
-    protected function calculateRequestLength(&$headers)
-    {
-        $this->requestBody = $this->request->getBody();
-
-        if (is_string($this->requestBody)) {
-            $this->contentLength = strlen($this->requestBody);
-        } elseif (is_resource($this->requestBody)) {
-            $stat = fstat($this->requestBody);
-            $this->contentLength = $stat['size'];
-            rewind($this->requestBody);
-        } else {
-            $this->contentLength = $this->requestBody->getLength();
-            $headers['content-type'] = 'multipart/form-data; boundary=' .
-                                       $this->requestBody->getBoundary();
-            $this->requestBody->rewind();
-        }
-
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength
-        ) {
-            // No body: send a Content-Length header nonetheless (request #12900),
-            // but do that only for methods that require a body (bug #14740)
-            if (in_array($this->request->getMethod(), self::$bodyRequired)) {
-                $headers['content-length'] = 0;
-            } else {
-                unset($headers['content-length']);
-                // if the method doesn't require a body and doesn't have a
-                // body, don't send a Content-Type header. (request #16799)
-                unset($headers['content-type']);
-            }
-        } else {
-            if (empty($headers['content-type'])) {
-                $headers['content-type'] = 'application/x-www-form-urlencoded';
-            }
-            $headers['content-length'] = $this->contentLength;
-        }
-    }
-}
-?>
diff --git a/lib/ext/HTTP/Request2/Adapter/Curl.php b/lib/ext/HTTP/Request2/Adapter/Curl.php
deleted file mode 100644
index 82d227f..0000000
--- a/lib/ext/HTTP/Request2/Adapter/Curl.php
+++ /dev/null
@@ -1,560 +0,0 @@
-<?php
-/**
- * Adapter for HTTP_Request2 wrapping around cURL extension
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Curl.php 310800 2011-05-06 07:29:56Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for HTTP_Request2 adapters
- */
-require_once 'HTTP/Request2/Adapter.php';
-
-/**
- * Adapter for HTTP_Request2 wrapping around cURL extension
- *
- * @category    HTTP
- * @package     HTTP_Request2
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 2.0.0
- */
-class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
-{
-   /**
-    * Mapping of header names to cURL options
-    * @var  array
-    */
-    protected static $headerMap = array(
-        'accept-encoding' => CURLOPT_ENCODING,
-        'cookie'          => CURLOPT_COOKIE,
-        'referer'         => CURLOPT_REFERER,
-        'user-agent'      => CURLOPT_USERAGENT
-    );
-
-   /**
-    * Mapping of SSL context options to cURL options
-    * @var  array
-    */
-    protected static $sslContextMap = array(
-        'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,
-        'ssl_cafile'      => CURLOPT_CAINFO,
-        'ssl_capath'      => CURLOPT_CAPATH,
-        'ssl_local_cert'  => CURLOPT_SSLCERT,
-        'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD
-   );
-
-   /**
-    * Mapping of CURLE_* constants to Exception subclasses and error codes
-    * @var  array
-    */
-    protected static $errorMap = array(
-        CURLE_UNSUPPORTED_PROTOCOL  => array('HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),
-        CURLE_COULDNT_RESOLVE_PROXY => array('HTTP_Request2_ConnectionException'),
-        CURLE_COULDNT_RESOLVE_HOST  => array('HTTP_Request2_ConnectionException'),
-        CURLE_COULDNT_CONNECT       => array('HTTP_Request2_ConnectionException'),
-        // error returned from write callback
-        CURLE_WRITE_ERROR           => array('HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),
-        CURLE_OPERATION_TIMEOUTED   => array('HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::TIMEOUT),
-        CURLE_HTTP_RANGE_ERROR      => array('HTTP_Request2_MessageException'),
-        CURLE_SSL_CONNECT_ERROR     => array('HTTP_Request2_ConnectionException'),
-        CURLE_LIBRARY_NOT_FOUND     => array('HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::MISCONFIGURATION),
-        CURLE_FUNCTION_NOT_FOUND    => array('HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::MISCONFIGURATION),
-        CURLE_ABORTED_BY_CALLBACK   => array('HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),
-        CURLE_TOO_MANY_REDIRECTS    => array('HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::TOO_MANY_REDIRECTS),
-        CURLE_SSL_PEER_CERTIFICATE  => array('HTTP_Request2_ConnectionException'),
-        CURLE_GOT_NOTHING           => array('HTTP_Request2_MessageException'),
-        CURLE_SSL_ENGINE_NOTFOUND   => array('HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::MISCONFIGURATION),
-        CURLE_SSL_ENGINE_SETFAILED  => array('HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::MISCONFIGURATION),
-        CURLE_SEND_ERROR            => array('HTTP_Request2_MessageException'),
-        CURLE_RECV_ERROR            => array('HTTP_Request2_MessageException'),
-        CURLE_SSL_CERTPROBLEM       => array('HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::INVALID_ARGUMENT),
-        CURLE_SSL_CIPHER            => array('HTTP_Request2_ConnectionException'),
-        CURLE_SSL_CACERT            => array('HTTP_Request2_ConnectionException'),
-        CURLE_BAD_CONTENT_ENCODING  => array('HTTP_Request2_MessageException'),
-    );
-
-   /**
-    * Response being received
-    * @var  HTTP_Request2_Response
-    */
-    protected $response;
-
-   /**
-    * Whether 'sentHeaders' event was sent to observers
-    * @var  boolean
-    */
-    protected $eventSentHeaders = false;
-
-   /**
-    * Whether 'receivedHeaders' event was sent to observers
-    * @var boolean
-    */
-    protected $eventReceivedHeaders = false;
-
-   /**
-    * Position within request body
-    * @var  integer
-    * @see  callbackReadBody()
-    */
-    protected $position = 0;
-
-   /**
-    * Information about last transfer, as returned by curl_getinfo()
-    * @var  array
-    */
-    protected $lastInfo;
-
-   /**
-    * Creates a subclass of HTTP_Request2_Exception from curl error data
-    *
-    * @param resource curl handle
-    * @return HTTP_Request2_Exception
-    */
-    protected static function wrapCurlError($ch)
-    {
-        $nativeCode = curl_errno($ch);
-        $message    = 'Curl error: ' . curl_error($ch);
-        if (!isset(self::$errorMap[$nativeCode])) {
-            return new HTTP_Request2_Exception($message, 0, $nativeCode);
-        } else {
-            $class = self::$errorMap[$nativeCode][0];
-            $code  = empty(self::$errorMap[$nativeCode][1])
-                     ? 0 : self::$errorMap[$nativeCode][1];
-            return new $class($message, $code, $nativeCode);
-        }
-    }
-
-   /**
-    * Sends request to the remote server and returns its response
-    *
-    * @param    HTTP_Request2
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        if (!extension_loaded('curl')) {
-            throw new HTTP_Request2_LogicException(
-                'cURL extension not available', HTTP_Request2_Exception::MISCONFIGURATION
-            );
-        }
-
-        $this->request              = $request;
-        $this->response             = null;
-        $this->position             = 0;
-        $this->eventSentHeaders     = false;
-        $this->eventReceivedHeaders = false;
-
-        try {
-            if (false === curl_exec($ch = $this->createCurlHandle())) {
-                $e = self::wrapCurlError($ch);
-            }
-        } catch (Exception $e) {
-        }
-        if (isset($ch)) {
-            $this->lastInfo = curl_getinfo($ch);
-            curl_close($ch);
-        }
-
-        $response = $this->response;
-        unset($this->request, $this->requestBody, $this->response);
-
-        if (!empty($e)) {
-            throw $e;
-        }
-
-        if ($jar = $request->getCookieJar()) {
-            $jar->addCookiesFromResponse($response, $request->getUrl());
-        }
-
-        if (0 < $this->lastInfo['size_download']) {
-            $request->setLastEvent('receivedBody', $response);
-        }
-        return $response;
-    }
-
-   /**
-    * Returns information about last transfer
-    *
-    * @return   array   associative array as returned by curl_getinfo()
-    */
-    public function getInfo()
-    {
-        return $this->lastInfo;
-    }
-
-   /**
-    * Creates a new cURL handle and populates it with data from the request
-    *
-    * @return   resource    a cURL handle, as created by curl_init()
-    * @throws   HTTP_Request2_LogicException
-    */
-    protected function createCurlHandle()
-    {
-        $ch = curl_init();
-
-        curl_setopt_array($ch, array(
-            // setup write callbacks
-            CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),
-            CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),
-            // buffer size
-            CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),
-            // connection timeout
-            CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),
-            // save full outgoing headers, in case someone is interested
-            CURLINFO_HEADER_OUT    => true,
-            // request url
-            CURLOPT_URL            => $this->request->getUrl()->getUrl()
-        ));
-
-        // set up redirects
-        if (!$this->request->getConfig('follow_redirects')) {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
-        } else {
-            if (!@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true)) {
-                throw new HTTP_Request2_LogicException(
-                    'Redirect support in curl is unavailable due to open_basedir or safe_mode setting',
-                    HTTP_Request2_Exception::MISCONFIGURATION
-                );
-            }
-            curl_setopt($ch, CURLOPT_MAXREDIRS, $this->request->getConfig('max_redirects'));
-            // limit redirects to http(s), works in 5.2.10+
-            if (defined('CURLOPT_REDIR_PROTOCOLS')) {
-                curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-            }
-            // works in 5.3.2+, http://bugs.php.net/bug.php?id=49571
-            if ($this->request->getConfig('strict_redirects') && defined('CURLOPT_POSTREDIR')) {
-                curl_setopt($ch, CURLOPT_POSTREDIR, 3);
-            }
-        }
-
-        // request timeout
-        if ($timeout = $this->request->getConfig('timeout')) {
-            curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-        }
-
-        // set HTTP version
-        switch ($this->request->getConfig('protocol_version')) {
-            case '1.0':
-                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
-                break;
-            case '1.1':
-                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-        }
-
-        // set request method
-        switch ($this->request->getMethod()) {
-            case HTTP_Request2::METHOD_GET:
-                curl_setopt($ch, CURLOPT_HTTPGET, true);
-                break;
-            case HTTP_Request2::METHOD_POST:
-                curl_setopt($ch, CURLOPT_POST, true);
-                break;
-            case HTTP_Request2::METHOD_HEAD:
-                curl_setopt($ch, CURLOPT_NOBODY, true);
-                break;
-            case HTTP_Request2::METHOD_PUT:
-                curl_setopt($ch, CURLOPT_UPLOAD, true);
-                break;
-            default:
-                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());
-        }
-
-        // set proxy, if needed
-        if ($host = $this->request->getConfig('proxy_host')) {
-            if (!($port = $this->request->getConfig('proxy_port'))) {
-                throw new HTTP_Request2_LogicException(
-                    'Proxy port not provided', HTTP_Request2_Exception::MISSING_VALUE
-                );
-            }
-            curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);
-            if ($user = $this->request->getConfig('proxy_user')) {
-                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user . ':' .
-                            $this->request->getConfig('proxy_password'));
-                switch ($this->request->getConfig('proxy_auth_scheme')) {
-                    case HTTP_Request2::AUTH_BASIC:
-                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);
-                        break;
-                    case HTTP_Request2::AUTH_DIGEST:
-                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);
-                }
-            }
-        }
-
-        // set authentication data
-        if ($auth = $this->request->getAuth()) {
-            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);
-            switch ($auth['scheme']) {
-                case HTTP_Request2::AUTH_BASIC:
-                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-                    break;
-                case HTTP_Request2::AUTH_DIGEST:
-                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-            }
-        }
-
-        // set SSL options
-        foreach ($this->request->getConfig() as $name => $value) {
-            if ('ssl_verify_host' == $name && null !== $value) {
-                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);
-            } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {
-                curl_setopt($ch, self::$sslContextMap[$name], $value);
-            }
-        }
-
-        $headers = $this->request->getHeaders();
-        // make cURL automagically send proper header
-        if (!isset($headers['accept-encoding'])) {
-            $headers['accept-encoding'] = '';
-        }
-
-        if (($jar = $this->request->getCookieJar())
-            && ($cookies = $jar->getMatching($this->request->getUrl(), true))
-        ) {
-            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;
-        }
-
-        // set headers having special cURL keys
-        foreach (self::$headerMap as $name => $option) {
-            if (isset($headers[$name])) {
-                curl_setopt($ch, $option, $headers[$name]);
-                unset($headers[$name]);
-            }
-        }
-
-        $this->calculateRequestLength($headers);
-        if (isset($headers['content-length'])) {
-            $this->workaroundPhpBug47204($ch, $headers);
-        }
-
-        // set headers not having special keys
-        $headersFmt = array();
-        foreach ($headers as $name => $value) {
-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-            $headersFmt[]  = $canonicalName . ': ' . $value;
-        }
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);
-
-        return $ch;
-    }
-
-   /**
-    * Workaround for PHP bug #47204 that prevents rewinding request body
-    *
-    * The workaround consists of reading the entire request body into memory
-    * and setting it as CURLOPT_POSTFIELDS, so it isn't recommended for large
-    * file uploads, use Socket adapter instead.
-    *
-    * @param    resource    cURL handle
-    * @param    array       Request headers
-    */
-    protected function workaroundPhpBug47204($ch, &$headers)
-    {
-        // no redirects, no digest auth -> probably no rewind needed
-        if (!$this->request->getConfig('follow_redirects')
-            && (!($auth = $this->request->getAuth())
-                || HTTP_Request2::AUTH_DIGEST != $auth['scheme'])
-        ) {
-            curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));
-
-        // rewind may be needed, read the whole body into memory
-        } else {
-            if ($this->requestBody instanceof HTTP_Request2_MultipartBody) {
-                $this->requestBody = $this->requestBody->__toString();
-
-            } elseif (is_resource($this->requestBody)) {
-                $fp = $this->requestBody;
-                $this->requestBody = '';
-                while (!feof($fp)) {
-                    $this->requestBody .= fread($fp, 16384);
-                }
-            }
-            // curl hangs up if content-length is present
-            unset($headers['content-length']);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->requestBody);
-        }
-    }
-
-   /**
-    * Callback function called by cURL for reading the request body
-    *
-    * @param    resource    cURL handle
-    * @param    resource    file descriptor (not used)
-    * @param    integer     maximum length of data to return
-    * @return   string      part of the request body, up to $length bytes
-    */
-    protected function callbackReadBody($ch, $fd, $length)
-    {
-        if (!$this->eventSentHeaders) {
-            $this->request->setLastEvent(
-                'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
-            );
-            $this->eventSentHeaders = true;
-        }
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength || $this->position >= $this->contentLength
-        ) {
-            return '';
-        }
-        if (is_string($this->requestBody)) {
-            $string = substr($this->requestBody, $this->position, $length);
-        } elseif (is_resource($this->requestBody)) {
-            $string = fread($this->requestBody, $length);
-        } else {
-            $string = $this->requestBody->read($length);
-        }
-        $this->request->setLastEvent('sentBodyPart', strlen($string));
-        $this->position += strlen($string);
-        return $string;
-    }
-
-   /**
-    * Callback function called by cURL for saving the response headers
-    *
-    * @param    resource    cURL handle
-    * @param    string      response header (with trailing CRLF)
-    * @return   integer     number of bytes saved
-    * @see      HTTP_Request2_Response::parseHeaderLine()
-    */
-    protected function callbackWriteHeader($ch, $string)
-    {
-        // we may receive a second set of headers if doing e.g. digest auth
-        if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {
-            // don't bother with 100-Continue responses (bug #15785)
-            if (!$this->eventSentHeaders ||
-                $this->response->getStatus() >= 200
-            ) {
-                $this->request->setLastEvent(
-                    'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
-                );
-            }
-            $upload = curl_getinfo($ch, CURLINFO_SIZE_UPLOAD);
-            // if body wasn't read by a callback, send event with total body size
-            if ($upload > $this->position) {
-                $this->request->setLastEvent(
-                    'sentBodyPart', $upload - $this->position
-                );
-                $this->position = $upload;
-            }
-            if ($upload && (!$this->eventSentHeaders
-                            || $this->response->getStatus() >= 200)
-            ) {
-                $this->request->setLastEvent('sentBody', $upload);
-            }
-            $this->eventSentHeaders = true;
-            // we'll need a new response object
-            if ($this->eventReceivedHeaders) {
-                $this->eventReceivedHeaders = false;
-                $this->response             = null;
-            }
-        }
-        if (empty($this->response)) {
-            $this->response = new HTTP_Request2_Response(
-                $string, false, curl_getinfo($ch, CURLINFO_EFFECTIVE_URL)
-            );
-        } else {
-            $this->response->parseHeaderLine($string);
-            if ('' == trim($string)) {
-                // don't bother with 100-Continue responses (bug #15785)
-                if (200 <= $this->response->getStatus()) {
-                    $this->request->setLastEvent('receivedHeaders', $this->response);
-                }
-
-                if ($this->request->getConfig('follow_redirects') && $this->response->isRedirect()) {
-                    $redirectUrl = new Net_URL2($this->response->getHeader('location'));
-
-                    // for versions lower than 5.2.10, check the redirection URL protocol
-                    if (!defined('CURLOPT_REDIR_PROTOCOLS') && $redirectUrl->isAbsolute()
-                        && !in_array($redirectUrl->getScheme(), array('http', 'https'))
-                    ) {
-                        return -1;
-                    }
-
-                    if ($jar = $this->request->getCookieJar()) {
-                        $jar->addCookiesFromResponse($this->response, $this->request->getUrl());
-                        if (!$redirectUrl->isAbsolute()) {
-                            $redirectUrl = $this->request->getUrl()->resolve($redirectUrl);
-                        }
-                        if ($cookies = $jar->getMatching($redirectUrl, true)) {
-                            curl_setopt($ch, CURLOPT_COOKIE, $cookies);
-                        }
-                    }
-                }
-                $this->eventReceivedHeaders = true;
-            }
-        }
-        return strlen($string);
-    }
-
-   /**
-    * Callback function called by cURL for saving the response body
-    *
-    * @param    resource    cURL handle (not used)
-    * @param    string      part of the response body
-    * @return   integer     number of bytes saved
-    * @see      HTTP_Request2_Response::appendBody()
-    */
-    protected function callbackWriteBody($ch, $string)
-    {
-        // cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if
-        // response doesn't start with proper HTTP status line (see bug #15716)
-        if (empty($this->response)) {
-            throw new HTTP_Request2_MessageException(
-                "Malformed response: {$string}",
-                HTTP_Request2_Exception::MALFORMED_RESPONSE
-            );
-        }
-        if ($this->request->getConfig('store_body')) {
-            $this->response->appendBody($string);
-        }
-        $this->request->setLastEvent('receivedBodyPart', $string);
-        return strlen($string);
-    }
-}
-?>
diff --git a/lib/ext/HTTP/Request2/Adapter/Mock.php b/lib/ext/HTTP/Request2/Adapter/Mock.php
deleted file mode 100644
index 6e9f827..0000000
--- a/lib/ext/HTTP/Request2/Adapter/Mock.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * Mock adapter intended for testing
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Mock.php 308322 2011-02-14 13:58:03Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for HTTP_Request2 adapters
- */
-require_once 'HTTP/Request2/Adapter.php';
-
-/**
- * Mock adapter intended for testing
- *
- * Can be used to test applications depending on HTTP_Request2 package without
- * actually performing any HTTP requests. This adapter will return responses
- * previously added via addResponse()
- * <code>
- * $mock = new HTTP_Request2_Adapter_Mock();
- * $mock->addResponse("HTTP/1.1 ... ");
- *
- * $request = new HTTP_Request2();
- * $request->setAdapter($mock);
- *
- * // This will return the response set above
- * $response = $req->send();
- * </code>
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 2.0.0
- */
-class HTTP_Request2_Adapter_Mock extends HTTP_Request2_Adapter
-{
-   /**
-    * A queue of responses to be returned by sendRequest()
-    * @var  array
-    */
-    protected $responses = array();
-
-   /**
-    * Returns the next response from the queue built by addResponse()
-    *
-    * If the queue is empty it will return default empty response with status 400,
-    * if an Exception object was added to the queue it will be thrown.
-    *
-    * @param    HTTP_Request2
-    * @return   HTTP_Request2_Response
-    * @throws   Exception
-    */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        if (count($this->responses) > 0) {
-            $response = array_shift($this->responses);
-            if ($response instanceof HTTP_Request2_Response) {
-                return $response;
-            } else {
-                // rethrow the exception
-                $class   = get_class($response);
-                $message = $response->getMessage();
-                $code    = $response->getCode();
-                throw new $class($message, $code);
-            }
-        } else {
-            return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");
-        }
-    }
-
-   /**
-    * Adds response to the queue
-    *
-    * @param    mixed   either a string, a pointer to an open file,
-    *                   an instance of HTTP_Request2_Response or Exception
-    * @throws   HTTP_Request2_Exception
-    */
-    public function addResponse($response)
-    {
-        if (is_string($response)) {
-            $response = self::createResponseFromString($response);
-        } elseif (is_resource($response)) {
-            $response = self::createResponseFromFile($response);
-        } elseif (!$response instanceof HTTP_Request2_Response &&
-                  !$response instanceof Exception
-        ) {
-            throw new HTTP_Request2_Exception('Parameter is not a valid response');
-        }
-        $this->responses[] = $response;
-    }
-
-   /**
-    * Creates a new HTTP_Request2_Response object from a string
-    *
-    * @param    string
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    public static function createResponseFromString($str)
-    {
-        $parts       = preg_split('!(\r?\n){2}!m', $str, 2);
-        $headerLines = explode("\n", $parts[0]);
-        $response    = new HTTP_Request2_Response(array_shift($headerLines));
-        foreach ($headerLines as $headerLine) {
-            $response->parseHeaderLine($headerLine);
-        }
-        $response->parseHeaderLine('');
-        if (isset($parts[1])) {
-            $response->appendBody($parts[1]);
-        }
-        return $response;
-    }
-
-   /**
-    * Creates a new HTTP_Request2_Response object from a file
-    *
-    * @param    resource    file pointer returned by fopen()
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    public static function createResponseFromFile($fp)
-    {
-        $response = new HTTP_Request2_Response(fgets($fp));
-        do {
-            $headerLine = fgets($fp);
-            $response->parseHeaderLine($headerLine);
-        } while ('' != trim($headerLine));
-
-        while (!feof($fp)) {
-            $response->appendBody(fread($fp, 8192));
-        }
-        return $response;
-    }
-}
-?>
\ No newline at end of file
diff --git a/lib/ext/HTTP/Request2/Adapter/Socket.php b/lib/ext/HTTP/Request2/Adapter/Socket.php
deleted file mode 100644
index 05cac6e..0000000
--- a/lib/ext/HTTP/Request2/Adapter/Socket.php
+++ /dev/null
@@ -1,1084 +0,0 @@
-<?php
-/**
- * Socket-based adapter for HTTP_Request2
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Socket.php 309921 2011-04-03 16:43:02Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for HTTP_Request2 adapters
- */
-require_once 'HTTP/Request2/Adapter.php';
-
-/**
- * Socket-based adapter for HTTP_Request2
- *
- * This adapter uses only PHP sockets and will work on almost any PHP
- * environment. Code is based on original HTTP_Request PEAR package.
- *
- * @category    HTTP
- * @package     HTTP_Request2
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 2.0.0
- */
-class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
-{
-   /**
-    * Regular expression for 'token' rule from RFC 2616
-    */
-    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
-
-   /**
-    * Regular expression for 'quoted-string' rule from RFC 2616
-    */
-    const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
-
-   /**
-    * Connected sockets, needed for Keep-Alive support
-    * @var  array
-    * @see  connect()
-    */
-    protected static $sockets = array();
-
-   /**
-    * Data for digest authentication scheme
-    *
-    * The keys for the array are URL prefixes.
-    *
-    * The values are associative arrays with data (realm, nonce, nonce-count,
-    * opaque...) needed for digest authentication. Stored here to prevent making
-    * duplicate requests to digest-protected resources after we have already
-    * received the challenge.
-    *
-    * @var  array
-    */
-    protected static $challenges = array();
-
-   /**
-    * Connected socket
-    * @var  resource
-    * @see  connect()
-    */
-    protected $socket;
-
-   /**
-    * Challenge used for server digest authentication
-    * @var  array
-    */
-    protected $serverChallenge;
-
-   /**
-    * Challenge used for proxy digest authentication
-    * @var  array
-    */
-    protected $proxyChallenge;
-
-   /**
-    * Sum of start time and global timeout, exception will be thrown if request continues past this time
-    * @var  integer
-    */
-    protected $deadline = null;
-
-   /**
-    * Remaining length of the current chunk, when reading chunked response
-    * @var  integer
-    * @see  readChunked()
-    */
-    protected $chunkLength = 0;
-
-   /**
-    * Remaining amount of redirections to follow
-    *
-    * Starts at 'max_redirects' configuration parameter and is reduced on each
-    * subsequent redirect. An Exception will be thrown once it reaches zero.
-    *
-    * @var  integer
-    */
-    protected $redirectCountdown = null;
-
-   /**
-    * Sends request to the remote server and returns its response
-    *
-    * @param    HTTP_Request2
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        $this->request = $request;
-
-        // Use global request timeout if given, see feature requests #5735, #8964
-        if ($timeout = $request->getConfig('timeout')) {
-            $this->deadline = time() + $timeout;
-        } else {
-            $this->deadline = null;
-        }
-
-        try {
-            $keepAlive = $this->connect();
-            $headers   = $this->prepareHeaders();
-            if (false === @fwrite($this->socket, $headers, strlen($headers))) {
-                throw new HTTP_Request2_MessageException('Error writing request');
-            }
-            // provide request headers to the observer, see request #7633
-            $this->request->setLastEvent('sentHeaders', $headers);
-            $this->writeBody();
-
-            if ($this->deadline && time() > $this->deadline) {
-                throw new HTTP_Request2_MessageException(
-                    'Request timed out after ' .
-                    $request->getConfig('timeout') . ' second(s)',
-                    HTTP_Request2_Exception::TIMEOUT
-                );
-            }
-
-            $response = $this->readResponse();
-
-            if ($jar = $request->getCookieJar()) {
-                $jar->addCookiesFromResponse($response, $request->getUrl());
-            }
-
-            if (!$this->canKeepAlive($keepAlive, $response)) {
-                $this->disconnect();
-            }
-
-            if ($this->shouldUseProxyDigestAuth($response)) {
-                return $this->sendRequest($request);
-            }
-            if ($this->shouldUseServerDigestAuth($response)) {
-                return $this->sendRequest($request);
-            }
-            if ($authInfo = $response->getHeader('authentication-info')) {
-                $this->updateChallenge($this->serverChallenge, $authInfo);
-            }
-            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
-                $this->updateChallenge($this->proxyChallenge, $proxyInfo);
-            }
-
-        } catch (Exception $e) {
-            $this->disconnect();
-        }
-
-        unset($this->request, $this->requestBody);
-
-        if (!empty($e)) {
-            $this->redirectCountdown = null;
-            throw $e;
-        }
-
-        if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
-            $this->redirectCountdown = null;
-            return $response;
-        } else {
-            return $this->handleRedirect($request, $response);
-        }
-    }
-
-   /**
-    * Connects to the remote server
-    *
-    * @return   bool    whether the connection can be persistent
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function connect()
-    {
-        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
-        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
-        $headers = $this->request->getHeaders();
-        $reqHost = $this->request->getUrl()->getHost();
-        if (!($reqPort = $this->request->getUrl()->getPort())) {
-            $reqPort = $secure? 443: 80;
-        }
-
-        if ($host = $this->request->getConfig('proxy_host')) {
-            if (!($port = $this->request->getConfig('proxy_port'))) {
-                throw new HTTP_Request2_LogicException(
-                    'Proxy port not provided',
-                    HTTP_Request2_Exception::MISSING_VALUE
-                );
-            }
-            $proxy = true;
-        } else {
-            $host  = $reqHost;
-            $port  = $reqPort;
-            $proxy = false;
-        }
-
-        if ($tunnel && !$proxy) {
-            throw new HTTP_Request2_LogicException(
-                "Trying to perform CONNECT request without proxy",
-                HTTP_Request2_Exception::MISSING_VALUE
-            );
-        }
-        if ($secure && !in_array('ssl', stream_get_transports())) {
-            throw new HTTP_Request2_LogicException(
-                'Need OpenSSL support for https:// requests',
-                HTTP_Request2_Exception::MISCONFIGURATION
-            );
-        }
-
-        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
-        // connection token to a proxy server...
-        if ($proxy && !$secure &&
-            !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
-        ) {
-            $this->request->setHeader('connection');
-        }
-
-        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
-                      empty($headers['connection'])) ||
-                     (!empty($headers['connection']) &&
-                      'Keep-Alive' == $headers['connection']);
-        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
-
-        $options = array();
-        if ($secure || $tunnel) {
-            foreach ($this->request->getConfig() as $name => $value) {
-                if ('ssl_' == substr($name, 0, 4) && null !== $value) {
-                    if ('ssl_verify_host' == $name) {
-                        if ($value) {
-                            $options['CN_match'] = $reqHost;
-                        }
-                    } else {
-                        $options[substr($name, 4)] = $value;
-                    }
-                }
-            }
-            ksort($options);
-        }
-
-        // Changing SSL context options after connection is established does *not*
-        // work, we need a new connection if options change
-        $remote    = $host . ':' . $port;
-        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
-                     (empty($options)? '': ':' . serialize($options));
-        unset($this->socket);
-
-        // We use persistent connections and have a connected socket?
-        // Ensure that the socket is still connected, see bug #16149
-        if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
-            !feof(self::$sockets[$socketKey])
-        ) {
-            $this->socket =& self::$sockets[$socketKey];
-
-        } elseif ($secure && $proxy && !$tunnel) {
-            $this->establishTunnel();
-            $this->request->setLastEvent(
-                'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
-            );
-            self::$sockets[$socketKey] =& $this->socket;
-
-        } else {
-            // Set SSL context options if doing HTTPS request or creating a tunnel
-            $context = stream_context_create();
-            foreach ($options as $name => $value) {
-                if (!stream_context_set_option($context, 'ssl', $name, $value)) {
-                    throw new HTTP_Request2_LogicException(
-                        "Error setting SSL context option '{$name}'"
-                    );
-                }
-            }
-            $track = @ini_set('track_errors', 1);
-            $this->socket = @stream_socket_client(
-                $remote, $errno, $errstr,
-                $this->request->getConfig('connect_timeout'),
-                STREAM_CLIENT_CONNECT, $context
-            );
-            if (!$this->socket) {
-                $e = new HTTP_Request2_ConnectionException(
-                    "Unable to connect to {$remote}. Error: "
-                     . (empty($errstr)? $php_errormsg: $errstr), 0, $errno
-                );
-            }
-            @ini_set('track_errors', $track);
-            if (isset($e)) {
-                throw $e;
-            }
-            $this->request->setLastEvent('connect', $remote);
-            self::$sockets[$socketKey] =& $this->socket;
-        }
-        return $keepAlive;
-    }
-
-   /**
-    * Establishes a tunnel to a secure remote server via HTTP CONNECT request
-    *
-    * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP
-    * sees that we are connected to a proxy server (duh!) rather than the server
-    * that presents its certificate.
-    *
-    * @link     http://tools.ietf.org/html/rfc2817#section-5.2
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function establishTunnel()
-    {
-        $donor   = new self;
-        $connect = new HTTP_Request2(
-            $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
-            array_merge($this->request->getConfig(),
-                        array('adapter' => $donor))
-        );
-        $response = $connect->send();
-        // Need any successful (2XX) response
-        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
-            throw new HTTP_Request2_ConnectionException(
-                'Failed to connect via HTTPS proxy. Proxy response: ' .
-                $response->getStatus() . ' ' . $response->getReasonPhrase()
-            );
-        }
-        $this->socket = $donor->socket;
-
-        $modes = array(
-            STREAM_CRYPTO_METHOD_TLS_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
-        );
-
-        foreach ($modes as $mode) {
-            if (stream_socket_enable_crypto($this->socket, true, $mode)) {
-                return;
-            }
-        }
-        throw new HTTP_Request2_ConnectionException(
-            'Failed to enable secure connection when connecting through proxy'
-        );
-    }
-
-   /**
-    * Checks whether current connection may be reused or should be closed
-    *
-    * @param    boolean                 whether connection could be persistent
-    *                                   in the first place
-    * @param    HTTP_Request2_Response  response object to check
-    * @return   boolean
-    */
-    protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
-    {
-        // Do not close socket on successful CONNECT request
-        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
-            200 <= $response->getStatus() && 300 > $response->getStatus()
-        ) {
-            return true;
-        }
-
-        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding'))
-                       || null !== $response->getHeader('content-length')
-                       // no body possible for such responses, see also request #17031
-                       || HTTP_Request2::METHOD_HEAD == $this->request->getMethod()
-                       || in_array($response->getStatus(), array(204, 304));
-        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
-                       (null === $response->getHeader('connection') &&
-                        '1.1' == $response->getVersion());
-        return $requestKeepAlive && $lengthKnown && $persistent;
-    }
-
-   /**
-    * Disconnects from the remote server
-    */
-    protected function disconnect()
-    {
-        if (is_resource($this->socket)) {
-            fclose($this->socket);
-            $this->socket = null;
-            $this->request->setLastEvent('disconnect');
-        }
-    }
-
-   /**
-    * Handles HTTP redirection
-    *
-    * This method will throw an Exception if redirect to a non-HTTP(S) location
-    * is attempted, also if number of redirects performed already is equal to
-    * 'max_redirects' configuration parameter.
-    *
-    * @param    HTTP_Request2               Original request
-    * @param    HTTP_Request2_Response      Response containing redirect
-    * @return   HTTP_Request2_Response      Response from a new location
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function handleRedirect(HTTP_Request2 $request,
-                                      HTTP_Request2_Response $response)
-    {
-        if (is_null($this->redirectCountdown)) {
-            $this->redirectCountdown = $request->getConfig('max_redirects');
-        }
-        if (0 == $this->redirectCountdown) {
-            $this->redirectCountdown = null;
-            // Copying cURL behaviour
-            throw new HTTP_Request2_MessageException (
-                'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed',
-                HTTP_Request2_Exception::TOO_MANY_REDIRECTS
-            );
-        }
-        $redirectUrl = new Net_URL2(
-            $response->getHeader('location'),
-            array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
-        );
-        // refuse non-HTTP redirect
-        if ($redirectUrl->isAbsolute()
-            && !in_array($redirectUrl->getScheme(), array('http', 'https'))
-        ) {
-            $this->redirectCountdown = null;
-            throw new HTTP_Request2_MessageException(
-                'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString(),
-                HTTP_Request2_Exception::NON_HTTP_REDIRECT
-            );
-        }
-        // Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
-        // but in practice it is often not
-        if (!$redirectUrl->isAbsolute()) {
-            $redirectUrl = $request->getUrl()->resolve($redirectUrl);
-        }
-        $redirect = clone $request;
-        $redirect->setUrl($redirectUrl);
-        if (303 == $response->getStatus() || (!$request->getConfig('strict_redirects')
-             && in_array($response->getStatus(), array(301, 302)))
-        ) {
-            $redirect->setMethod(HTTP_Request2::METHOD_GET);
-            $redirect->setBody('');
-        }
-
-        if (0 < $this->redirectCountdown) {
-            $this->redirectCountdown--;
-        }
-        return $this->sendRequest($redirect);
-    }
-
-   /**
-    * Checks whether another request should be performed with server digest auth
-    *
-    * Several conditions should be satisfied for it to return true:
-    *   - response status should be 401
-    *   - auth credentials should be set in the request object
-    *   - response should contain WWW-Authenticate header with digest challenge
-    *   - there is either no challenge stored for this URL or new challenge
-    *     contains stale=true parameter (in other case we probably just failed
-    *     due to invalid username / password)
-    *
-    * The method stores challenge values in $challenges static property
-    *
-    * @param    HTTP_Request2_Response  response to check
-    * @return   boolean whether another request should be performed
-    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
-    */
-    protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
-    {
-        // no sense repeating a request if we don't have credentials
-        if (401 != $response->getStatus() || !$this->request->getAuth()) {
-            return false;
-        }
-        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
-            return false;
-        }
-
-        $url    = $this->request->getUrl();
-        $scheme = $url->getScheme();
-        $host   = $scheme . '://' . $url->getHost();
-        if ($port = $url->getPort()) {
-            if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
-                (0 == strcasecmp($scheme, 'https') && 443 != $port)
-            ) {
-                $host .= ':' . $port;
-            }
-        }
-
-        if (!empty($challenge['domain'])) {
-            $prefixes = array();
-            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
-                // don't bother with different servers
-                if ('/' == substr($prefix, 0, 1)) {
-                    $prefixes[] = $host . $prefix;
-                }
-            }
-        }
-        if (empty($prefixes)) {
-            $prefixes = array($host . '/');
-        }
-
-        $ret = true;
-        foreach ($prefixes as $prefix) {
-            if (!empty(self::$challenges[$prefix]) &&
-                (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
-            ) {
-                // probably credentials are invalid
-                $ret = false;
-            }
-            self::$challenges[$prefix] =& $challenge;
-        }
-        return $ret;
-    }
-
-   /**
-    * Checks whether another request should be performed with proxy digest auth
-    *
-    * Several conditions should be satisfied for it to return true:
-    *   - response status should be 407
-    *   - proxy auth credentials should be set in the request object
-    *   - response should contain Proxy-Authenticate header with digest challenge
-    *   - there is either no challenge stored for this proxy or new challenge
-    *     contains stale=true parameter (in other case we probably just failed
-    *     due to invalid username / password)
-    *
-    * The method stores challenge values in $challenges static property
-    *
-    * @param    HTTP_Request2_Response  response to check
-    * @return   boolean whether another request should be performed
-    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
-    */
-    protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
-    {
-        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
-            return false;
-        }
-        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
-            return false;
-        }
-
-        $key = 'proxy://' . $this->request->getConfig('proxy_host') .
-               ':' . $this->request->getConfig('proxy_port');
-
-        if (!empty(self::$challenges[$key]) &&
-            (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
-        ) {
-            $ret = false;
-        } else {
-            $ret = true;
-        }
-        self::$challenges[$key] = $challenge;
-        return $ret;
-    }
-
-   /**
-    * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value
-    *
-    * There is a problem with implementation of RFC 2617: several of the parameters
-    * are defined as quoted-string there and thus may contain backslash escaped
-    * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as
-    * just value of quoted-string X without surrounding quotes, it doesn't speak
-    * about removing backslash escaping.
-    *
-    * Now realm parameter is user-defined and human-readable, strange things
-    * happen when it contains quotes:
-    *   - Apache allows quotes in realm, but apparently uses realm value without
-    *     backslashes for digest computation
-    *   - Squid allows (manually escaped) quotes there, but it is impossible to
-    *     authorize with either escaped or unescaped quotes used in digest,
-    *     probably it can't parse the response (?)
-    *   - Both IE and Firefox display realm value with backslashes in
-    *     the password popup and apparently use the same value for digest
-    *
-    * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in
-    * quoted-string handling, unfortunately that means failure to authorize
-    * sometimes
-    *
-    * @param    string  value of WWW-Authenticate or Proxy-Authenticate header
-    * @return   mixed   associative array with challenge parameters, false if
-    *                   no challenge is present in header value
-    * @throws   HTTP_Request2_NotImplementedException in case of unsupported challenge parameters
-    */
-    protected function parseDigestChallenge($headerValue)
-    {
-        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
-        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
-        if (!preg_match($challenge, $headerValue, $matches)) {
-            return false;
-        }
-
-        preg_match_all('!' . $authParam . '!', $matches[0], $params);
-        $paramsAry   = array();
-        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
-                             'algorithm', 'qop');
-        for ($i = 0; $i < count($params[0]); $i++) {
-            // section 3.2.1: Any unrecognized directive MUST be ignored.
-            if (in_array($params[1][$i], $knownParams)) {
-                if ('"' == substr($params[2][$i], 0, 1)) {
-                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
-                } else {
-                    $paramsAry[$params[1][$i]] = $params[2][$i];
-                }
-            }
-        }
-        // we only support qop=auth
-        if (!empty($paramsAry['qop']) &&
-            !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
-        ) {
-            throw new HTTP_Request2_NotImplementedException(
-                "Only 'auth' qop is currently supported in digest authentication, " .
-                "server requested '{$paramsAry['qop']}'"
-            );
-        }
-        // we only support algorithm=MD5
-        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
-            throw new HTTP_Request2_NotImplementedException(
-                "Only 'MD5' algorithm is currently supported in digest authentication, " .
-                "server requested '{$paramsAry['algorithm']}'"
-            );
-        }
-
-        return $paramsAry;
-    }
-
-   /**
-    * Parses [Proxy-]Authentication-Info header value and updates challenge
-    *
-    * @param    array   challenge to update
-    * @param    string  value of [Proxy-]Authentication-Info header
-    * @todo     validate server rspauth response
-    */
-    protected function updateChallenge(&$challenge, $headerValue)
-    {
-        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
-        $paramsAry   = array();
-
-        preg_match_all($authParam, $headerValue, $params);
-        for ($i = 0; $i < count($params[0]); $i++) {
-            if ('"' == substr($params[2][$i], 0, 1)) {
-                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
-            } else {
-                $paramsAry[$params[1][$i]] = $params[2][$i];
-            }
-        }
-        // for now, just update the nonce value
-        if (!empty($paramsAry['nextnonce'])) {
-            $challenge['nonce'] = $paramsAry['nextnonce'];
-            $challenge['nc']    = 1;
-        }
-    }
-
-   /**
-    * Creates a value for [Proxy-]Authorization header when using digest authentication
-    *
-    * @param    string  user name
-    * @param    string  password
-    * @param    string  request URL
-    * @param    array   digest challenge parameters
-    * @return   string  value of [Proxy-]Authorization request header
-    * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2
-    */
-    protected function createDigestResponse($user, $password, $url, &$challenge)
-    {
-        if (false !== ($q = strpos($url, '?')) &&
-            $this->request->getConfig('digest_compat_ie')
-        ) {
-            $url = substr($url, 0, $q);
-        }
-
-        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
-        $a2 = md5($this->request->getMethod() . ':' . $url);
-
-        if (empty($challenge['qop'])) {
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
-        } else {
-            $challenge['cnonce'] = 'Req2.' . rand();
-            if (empty($challenge['nc'])) {
-                $challenge['nc'] = 1;
-            }
-            $nc     = sprintf('%08x', $challenge['nc']++);
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
-                          $challenge['cnonce'] . ':auth:' . $a2);
-        }
-        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
-               'realm="' . $challenge['realm'] . '", ' .
-               'nonce="' . $challenge['nonce'] . '", ' .
-               'uri="' . $url . '", ' .
-               'response="' . $digest . '"' .
-               (!empty($challenge['opaque'])?
-                ', opaque="' . $challenge['opaque'] . '"':
-                '') .
-               (!empty($challenge['qop'])?
-                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
-                '');
-    }
-
-   /**
-    * Adds 'Authorization' header (if needed) to request headers array
-    *
-    * @param    array   request headers
-    * @param    string  request host (needed for digest authentication)
-    * @param    string  request URL (needed for digest authentication)
-    * @throws   HTTP_Request2_NotImplementedException
-    */
-    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
-    {
-        if (!($auth = $this->request->getAuth())) {
-            return;
-        }
-        switch ($auth['scheme']) {
-            case HTTP_Request2::AUTH_BASIC:
-                $headers['authorization'] =
-                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
-                break;
-
-            case HTTP_Request2::AUTH_DIGEST:
-                unset($this->serverChallenge);
-                $fullUrl = ('/' == $requestUrl[0])?
-                           $this->request->getUrl()->getScheme() . '://' .
-                            $requestHost . $requestUrl:
-                           $requestUrl;
-                foreach (array_keys(self::$challenges) as $key) {
-                    if ($key == substr($fullUrl, 0, strlen($key))) {
-                        $headers['authorization'] = $this->createDigestResponse(
-                            $auth['user'], $auth['password'],
-                            $requestUrl, self::$challenges[$key]
-                        );
-                        $this->serverChallenge =& self::$challenges[$key];
-                        break;
-                    }
-                }
-                break;
-
-            default:
-                throw new HTTP_Request2_NotImplementedException(
-                    "Unknown HTTP authentication scheme '{$auth['scheme']}'"
-                );
-        }
-    }
-
-   /**
-    * Adds 'Proxy-Authorization' header (if needed) to request headers array
-    *
-    * @param    array   request headers
-    * @param    string  request URL (needed for digest authentication)
-    * @throws   HTTP_Request2_NotImplementedException
-    */
-    protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
-    {
-        if (!$this->request->getConfig('proxy_host') ||
-            !($user = $this->request->getConfig('proxy_user')) ||
-            (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&
-             HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
-        ) {
-            return;
-        }
-
-        $password = $this->request->getConfig('proxy_password');
-        switch ($this->request->getConfig('proxy_auth_scheme')) {
-            case HTTP_Request2::AUTH_BASIC:
-                $headers['proxy-authorization'] =
-                    'Basic ' . base64_encode($user . ':' . $password);
-                break;
-
-            case HTTP_Request2::AUTH_DIGEST:
-                unset($this->proxyChallenge);
-                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
-                            ':' . $this->request->getConfig('proxy_port');
-                if (!empty(self::$challenges[$proxyUrl])) {
-                    $headers['proxy-authorization'] = $this->createDigestResponse(
-                        $user, $password,
-                        $requestUrl, self::$challenges[$proxyUrl]
-                    );
-                    $this->proxyChallenge =& self::$challenges[$proxyUrl];
-                }
-                break;
-
-            default:
-                throw new HTTP_Request2_NotImplementedException(
-                    "Unknown HTTP authentication scheme '" .
-                    $this->request->getConfig('proxy_auth_scheme') . "'"
-                );
-        }
-    }
-
-
-   /**
-    * Creates the string with the Request-Line and request headers
-    *
-    * @return   string
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function prepareHeaders()
-    {
-        $headers = $this->request->getHeaders();
-        $url     = $this->request->getUrl();
-        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
-        $host    = $url->getHost();
-
-        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
-        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
-            $host .= ':' . (empty($port)? $defaultPort: $port);
-        }
-        // Do not overwrite explicitly set 'Host' header, see bug #16146
-        if (!isset($headers['host'])) {
-            $headers['host'] = $host;
-        }
-
-        if ($connect) {
-            $requestUrl = $host;
-
-        } else {
-            if (!$this->request->getConfig('proxy_host') ||
-                0 == strcasecmp($url->getScheme(), 'https')
-            ) {
-                $requestUrl = '';
-            } else {
-                $requestUrl = $url->getScheme() . '://' . $host;
-            }
-            $path        = $url->getPath();
-            $query       = $url->getQuery();
-            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
-        }
-
-        if ('1.1' == $this->request->getConfig('protocol_version') &&
-            extension_loaded('zlib') && !isset($headers['accept-encoding'])
-        ) {
-            $headers['accept-encoding'] = 'gzip, deflate';
-        }
-        if (($jar = $this->request->getCookieJar())
-            && ($cookies = $jar->getMatching($this->request->getUrl(), true))
-        ) {
-            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;
-        }
-
-        $this->addAuthorizationHeader($headers, $host, $requestUrl);
-        $this->addProxyAuthorizationHeader($headers, $requestUrl);
-        $this->calculateRequestLength($headers);
-
-        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
-                      $this->request->getConfig('protocol_version') . "\r\n";
-        foreach ($headers as $name => $value) {
-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";
-        }
-        return $headersStr . "\r\n";
-    }
-
-   /**
-    * Sends the request body
-    *
-    * @throws   HTTP_Request2_MessageException
-    */
-    protected function writeBody()
-    {
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength
-        ) {
-            return;
-        }
-
-        $position   = 0;
-        $bufferSize = $this->request->getConfig('buffer_size');
-        while ($position < $this->contentLength) {
-            if (is_string($this->requestBody)) {
-                $str = substr($this->requestBody, $position, $bufferSize);
-            } elseif (is_resource($this->requestBody)) {
-                $str = fread($this->requestBody, $bufferSize);
-            } else {
-                $str = $this->requestBody->read($bufferSize);
-            }
-            if (false === @fwrite($this->socket, $str, strlen($str))) {
-                throw new HTTP_Request2_MessageException('Error writing request');
-            }
-            // Provide the length of written string to the observer, request #7630
-            $this->request->setLastEvent('sentBodyPart', strlen($str));
-            $position += strlen($str);
-        }
-        $this->request->setLastEvent('sentBody', $this->contentLength);
-    }
-
-   /**
-    * Reads the remote server's response
-    *
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function readResponse()
-    {
-        $bufferSize = $this->request->getConfig('buffer_size');
-
-        do {
-            $response = new HTTP_Request2_Response(
-                $this->readLine($bufferSize), true, $this->request->getUrl()
-            );
-            do {
-                $headerLine = $this->readLine($bufferSize);
-                $response->parseHeaderLine($headerLine);
-            } while ('' != $headerLine);
-        } while (in_array($response->getStatus(), array(100, 101)));
-
-        $this->request->setLastEvent('receivedHeaders', $response);
-
-        // No body possible in such responses
-        if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||
-            (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
-             200 <= $response->getStatus() && 300 > $response->getStatus()) ||
-            in_array($response->getStatus(), array(204, 304))
-        ) {
-            return $response;
-        }
-
-        $chunked = 'chunked' == $response->getHeader('transfer-encoding');
-        $length  = $response->getHeader('content-length');
-        $hasBody = false;
-        if ($chunked || null === $length || 0 < intval($length)) {
-            // RFC 2616, section 4.4:
-            // 3. ... If a message is received with both a
-            // Transfer-Encoding header field and a Content-Length header field,
-            // the latter MUST be ignored.
-            $toRead = ($chunked || null === $length)? null: $length;
-            $this->chunkLength = 0;
-
-            while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
-                if ($chunked) {
-                    $data = $this->readChunked($bufferSize);
-                } elseif (is_null($toRead)) {
-                    $data = $this->fread($bufferSize);
-                } else {
-                    $data    = $this->fread(min($toRead, $bufferSize));
-                    $toRead -= strlen($data);
-                }
-                if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
-                    break;
-                }
-
-                $hasBody = true;
-                if ($this->request->getConfig('store_body')) {
-                    $response->appendBody($data);
-                }
-                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
-                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);
-                } else {
-                    $this->request->setLastEvent('receivedBodyPart', $data);
-                }
-            }
-        }
-
-        if ($hasBody) {
-            $this->request->setLastEvent('receivedBody', $response);
-        }
-        return $response;
-    }
-
-   /**
-    * Reads until either the end of the socket or a newline, whichever comes first
-    *
-    * Strips the trailing newline from the returned data, handles global
-    * request timeout. Method idea borrowed from Net_Socket PEAR package.
-    *
-    * @param    int     buffer size to use for reading
-    * @return   Available data up to the newline (not including newline)
-    * @throws   HTTP_Request2_MessageException     In case of timeout
-    */
-    protected function readLine($bufferSize)
-    {
-        $line = '';
-        while (!feof($this->socket)) {
-            if ($this->deadline) {
-                stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-            }
-            $line .= @fgets($this->socket, $bufferSize);
-            $info  = stream_get_meta_data($this->socket);
-            if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-                $reason = $this->deadline
-                          ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
-                          : 'due to default_socket_timeout php.ini setting';
-                throw new HTTP_Request2_MessageException(
-                    "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
-                );
-            }
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, "\r\n");
-            }
-        }
-        return $line;
-    }
-
-   /**
-    * Wrapper around fread(), handles global request timeout
-    *
-    * @param    int     Reads up to this number of bytes
-    * @return   Data read from socket
-    * @throws   HTTP_Request2_MessageException     In case of timeout
-    */
-    protected function fread($length)
-    {
-        if ($this->deadline) {
-            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-        }
-        $data = fread($this->socket, $length);
-        $info = stream_get_meta_data($this->socket);
-        if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-            $reason = $this->deadline
-                      ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
-                      : 'due to default_socket_timeout php.ini setting';
-            throw new HTTP_Request2_MessageException(
-                "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
-            );
-        }
-        return $data;
-    }
-
-   /**
-    * Reads a part of response body encoded with chunked Transfer-Encoding
-    *
-    * @param    int     buffer size to use for reading
-    * @return   string
-    * @throws   HTTP_Request2_MessageException
-    */
-    protected function readChunked($bufferSize)
-    {
-        // at start of the next chunk?
-        if (0 == $this->chunkLength) {
-            $line = $this->readLine($bufferSize);
-            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
-                throw new HTTP_Request2_MessageException(
-                    "Cannot decode chunked response, invalid chunk length '{$line}'",
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            } else {
-                $this->chunkLength = hexdec($matches[1]);
-                // Chunk with zero length indicates the end
-                if (0 == $this->chunkLength) {
-                    $this->readLine($bufferSize);
-                    return '';
-                }
-            }
-        }
-        $data = $this->fread(min($this->chunkLength, $bufferSize));
-        $this->chunkLength -= strlen($data);
-        if (0 == $this->chunkLength) {
-            $this->readLine($bufferSize); // Trailing CRLF
-        }
-        return $data;
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/lib/ext/HTTP/Request2/CookieJar.php b/lib/ext/HTTP/Request2/CookieJar.php
deleted file mode 100644
index af7534f..0000000
--- a/lib/ext/HTTP/Request2/CookieJar.php
+++ /dev/null
@@ -1,499 +0,0 @@
-<?php
-/**
- * Stores cookies and passes them between HTTP requests
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: CookieJar.php 308629 2011-02-24 17:34:24Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/** Class representing a HTTP request message */
-require_once 'HTTP/Request2.php';
-
-/**
- * Stores cookies and passes them between HTTP requests
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: @package_version@
- */
-class HTTP_Request2_CookieJar implements Serializable
-{
-   /**
-    * Array of stored cookies
-    *
-    * The array is indexed by domain, path and cookie name
-    *   .example.com
-    *     /
-    *       some_cookie => cookie data
-    *     /subdir
-    *       other_cookie => cookie data
-    *   .example.org
-    *     ...
-    *
-    * @var array
-    */
-    protected $cookies = array();
-
-   /**
-    * Whether session cookies should be serialized when serializing the jar
-    * @var bool
-    */
-    protected $serializeSession = false;
-
-   /**
-    * Whether Public Suffix List should be used for domain matching
-    * @var bool
-    */
-    protected $useList = true;
-
-   /**
-    * Array with Public Suffix List data
-    * @var  array
-    * @link http://publicsuffix.org/
-    */
-    protected static $psl = array();
-
-   /**
-    * Class constructor, sets various options
-    *
-    * @param bool Controls serializing session cookies, see {@link serializeSessionCookies()}
-    * @param bool Controls using Public Suffix List, see {@link usePublicSuffixList()}
-    */
-    public function __construct($serializeSessionCookies = false, $usePublicSuffixList = true)
-    {
-        $this->serializeSessionCookies($serializeSessionCookies);
-        $this->usePublicSuffixList($usePublicSuffixList);
-    }
-
-   /**
-    * Returns current time formatted in ISO-8601 at UTC timezone
-    *
-    * @return string
-    */
-    protected function now()
-    {
-        $dt = new DateTime();
-        $dt->setTimezone(new DateTimeZone('UTC'));
-        return $dt->format(DateTime::ISO8601);
-    }
-
-   /**
-    * Checks cookie array for correctness, possibly updating its 'domain', 'path' and 'expires' fields
-    *
-    * The checks are as follows:
-    *   - cookie array should contain 'name' and 'value' fields;
-    *   - name and value should not contain disallowed symbols;
-    *   - 'expires' should be either empty parseable by DateTime;
-    *   - 'domain' and 'path' should be either not empty or an URL where
-    *     cookie was set should be provided.
-    *   - if $setter is provided, then document at that URL should be allowed
-    *     to set a cookie for that 'domain'. If $setter is not provided,
-    *     then no domain checks will be made.
-    *
-    * 'expires' field will be converted to ISO8601 format from COOKIE format,
-    * 'domain' and 'path' will be set from setter URL if empty.
-    *
-    * @param    array    cookie data, as returned by {@link HTTP_Request2_Response::getCookies()}
-    * @param    Net_URL2 URL of the document that sent Set-Cookie header
-    * @return   array    Updated cookie array
-    * @throws   HTTP_Request2_LogicException
-    * @throws   HTTP_Request2_MessageException
-    */
-    protected function checkAndUpdateFields(array $cookie, Net_URL2 $setter = null)
-    {
-        if ($missing = array_diff(array('name', 'value'), array_keys($cookie))) {
-            throw new HTTP_Request2_LogicException(
-                "Cookie array should contain 'name' and 'value' fields",
-                HTTP_Request2_Exception::MISSING_VALUE
-            );
-        }
-        if (preg_match(HTTP_Request2::REGEXP_INVALID_COOKIE, $cookie['name'])) {
-            throw new HTTP_Request2_LogicException(
-                "Invalid cookie name: '{$cookie['name']}'",
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        if (preg_match(HTTP_Request2::REGEXP_INVALID_COOKIE, $cookie['value'])) {
-            throw new HTTP_Request2_LogicException(
-                "Invalid cookie value: '{$cookie['value']}'",
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        $cookie += array('domain' => '', 'path' => '', 'expires' => null, 'secure' => false);
-
-        // Need ISO-8601 date @ UTC timezone
-        if (!empty($cookie['expires'])
-            && !preg_match('/^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\+0000$/', $cookie['expires'])
-        ) {
-            try {
-                $dt = new DateTime($cookie['expires']);
-                $dt->setTimezone(new DateTimeZone('UTC'));
-                $cookie['expires'] = $dt->format(DateTime::ISO8601);
-            } catch (Exception $e) {
-                throw new HTTP_Request2_LogicException($e->getMessage());
-            }
-        }
-
-        if (empty($cookie['domain']) || empty($cookie['path'])) {
-            if (!$setter) {
-                throw new HTTP_Request2_LogicException(
-                    'Cookie misses domain and/or path component, cookie setter URL needed',
-                    HTTP_Request2_Exception::MISSING_VALUE
-                );
-            }
-            if (empty($cookie['domain'])) {
-                if ($host = $setter->getHost()) {
-                    $cookie['domain'] = $host;
-                } else {
-                    throw new HTTP_Request2_LogicException(
-                        'Setter URL does not contain host part, can\'t set cookie domain',
-                        HTTP_Request2_Exception::MISSING_VALUE
-                    );
-                }
-            }
-            if (empty($cookie['path'])) {
-                $path = $setter->getPath();
-                $cookie['path'] = empty($path)? '/': substr($path, 0, strrpos($path, '/') + 1);
-            }
-        }
-
-        if ($setter && !$this->domainMatch($setter->getHost(), $cookie['domain'])) {
-            throw new HTTP_Request2_MessageException(
-                "Domain " . $setter->getHost() . " cannot set cookies for "
-                . $cookie['domain']
-            );
-        }
-
-        return $cookie;
-    }
-
-   /**
-    * Stores a cookie in the jar
-    *
-    * @param    array    cookie data, as returned by {@link HTTP_Request2_Response::getCookies()}
-    * @param    Net_URL2 URL of the document that sent Set-Cookie header
-    * @throws   HTTP_Request2_Exception
-    */
-    public function store(array $cookie, Net_URL2 $setter = null)
-    {
-        $cookie = $this->checkAndUpdateFields($cookie, $setter);
-
-        if (strlen($cookie['value'])
-            && (is_null($cookie['expires']) || $cookie['expires'] > $this->now())
-        ) {
-            if (!isset($this->cookies[$cookie['domain']])) {
-                $this->cookies[$cookie['domain']] = array();
-            }
-            if (!isset($this->cookies[$cookie['domain']][$cookie['path']])) {
-                $this->cookies[$cookie['domain']][$cookie['path']] = array();
-            }
-            $this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']] = $cookie;
-
-        } elseif (isset($this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']])) {
-            unset($this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']]);
-        }
-    }
-
-   /**
-    * Adds cookies set in HTTP response to the jar
-    *
-    * @param HTTP_Request2_Response response
-    * @param Net_URL2               original request URL, needed for setting
-    *                               default domain/path
-    */
-    public function addCookiesFromResponse(HTTP_Request2_Response $response, Net_URL2 $setter)
-    {
-        foreach ($response->getCookies() as $cookie) {
-            $this->store($cookie, $setter);
-        }
-    }
-
-   /**
-    * Returns all cookies matching a given request URL
-    *
-    * The following checks are made:
-    *   - cookie domain should match request host
-    *   - cookie path should be a prefix for request path
-    *   - 'secure' cookies will only be sent for HTTPS requests
-    *
-    * @param  Net_URL2
-    * @param  bool      Whether to return cookies as string for "Cookie: " header
-    * @return array
-    */
-    public function getMatching(Net_URL2 $url, $asString = false)
-    {
-        $host   = $url->getHost();
-        $path   = $url->getPath();
-        $secure = 0 == strcasecmp($url->getScheme(), 'https');
-
-        $matched = $ret = array();
-        foreach (array_keys($this->cookies) as $domain) {
-            if ($this->domainMatch($host, $domain)) {
-                foreach (array_keys($this->cookies[$domain]) as $cPath) {
-                    if (0 === strpos($path, $cPath)) {
-                        foreach ($this->cookies[$domain][$cPath] as $name => $cookie) {
-                            if (!$cookie['secure'] || $secure) {
-                                $matched[$name][strlen($cookie['path'])] = $cookie;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        foreach ($matched as $cookies) {
-            krsort($cookies);
-            $ret = array_merge($ret, $cookies);
-        }
-        if (!$asString) {
-            return $ret;
-        } else {
-            $str = '';
-            foreach ($ret as $c) {
-                $str .= (empty($str)? '': '; ') . $c['name'] . '=' . $c['value'];
-            }
-            return $str;
-        }
-    }
-
-   /**
-    * Returns all cookies stored in a jar
-    *
-    * @return array
-    */
-    public function getAll()
-    {
-        $cookies = array();
-        foreach (array_keys($this->cookies) as $domain) {
-            foreach (array_keys($this->cookies[$domain]) as $path) {
-                foreach ($this->cookies[$domain][$path] as $name => $cookie) {
-                    $cookies[] = $cookie;
-                }
-            }
-        }
-        return $cookies;
-    }
-
-   /**
-    * Sets whether session cookies should be serialized when serializing the jar
-    *
-    * @param    boolean
-    */
-    public function serializeSessionCookies($serialize)
-    {
-        $this->serializeSession = (bool)$serialize;
-    }
-
-   /**
-    * Sets whether Public Suffix List should be used for restricting cookie-setting
-    *
-    * Without PSL {@link domainMatch()} will only prevent setting cookies for
-    * top-level domains like '.com' or '.org'. However, it will not prevent
-    * setting a cookie for '.co.uk' even though only third-level registrations
-    * are possible in .uk domain.
-    *
-    * With the List it is possible to find the highest level at which a domain
-    * may be registered for a particular top-level domain and consequently
-    * prevent cookies set for '.co.uk' or '.msk.ru'. The same list is used by
-    * Firefox, Chrome and Opera browsers to restrict cookie setting.
-    *
-    * Note that PSL is licensed differently to HTTP_Request2 package (refer to
-    * the license information in public-suffix-list.php), so you can disable
-    * its use if this is an issue for you.
-    *
-    * @param    boolean
-    * @link     http://publicsuffix.org/learn/
-    */
-    public function usePublicSuffixList($useList)
-    {
-        $this->useList = (bool)$useList;
-    }
-
-   /**
-    * Returns string representation of object
-    *
-    * @return string
-    * @see    Serializable::serialize()
-    */
-    public function serialize()
-    {
-        $cookies = $this->getAll();
-        if (!$this->serializeSession) {
-            for ($i = count($cookies) - 1; $i >= 0; $i--) {
-                if (empty($cookies[$i]['expires'])) {
-                    unset($cookies[$i]);
-                }
-            }
-        }
-        return serialize(array(
-            'cookies'          => $cookies,
-            'serializeSession' => $this->serializeSession,
-            'useList'          => $this->useList
-        ));
-    }
-
-   /**
-    * Constructs the object from serialized string
-    *
-    * @param string  string representation
-    * @see   Serializable::unserialize()
-    */
-    public function unserialize($serialized)
-    {
-        $data = unserialize($serialized);
-        $now  = $this->now();
-        $this->serializeSessionCookies($data['serializeSession']);
-        $this->usePublicSuffixList($data['useList']);
-        foreach ($data['cookies'] as $cookie) {
-            if (!empty($cookie['expires']) && $cookie['expires'] <= $now) {
-                continue;
-            }
-            if (!isset($this->cookies[$cookie['domain']])) {
-                $this->cookies[$cookie['domain']] = array();
-            }
-            if (!isset($this->cookies[$cookie['domain']][$cookie['path']])) {
-                $this->cookies[$cookie['domain']][$cookie['path']] = array();
-            }
-            $this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']] = $cookie;
-        }
-    }
-
-   /**
-    * Checks whether a cookie domain matches a request host.
-    *
-    * The method is used by {@link store()} to check for whether a document
-    * at given URL can set a cookie with a given domain attribute and by
-    * {@link getMatching()} to find cookies matching the request URL.
-    *
-    * @param    string  request host
-    * @param    string  cookie domain
-    * @return   bool    match success
-    */
-    public function domainMatch($requestHost, $cookieDomain)
-    {
-        if ($requestHost == $cookieDomain) {
-            return true;
-        }
-        // IP address, we require exact match
-        if (preg_match('/^(?:\d{1,3}\.){3}\d{1,3}$/', $requestHost)) {
-            return false;
-        }
-        if ('.' != $cookieDomain[0]) {
-            $cookieDomain = '.' . $cookieDomain;
-        }
-        // prevents setting cookies for '.com' and similar domains
-        if (!$this->useList && substr_count($cookieDomain, '.') < 2
-            || $this->useList && !self::getRegisteredDomain($cookieDomain)
-        ) {
-            return false;
-        }
-        return substr('.' . $requestHost, -strlen($cookieDomain)) == $cookieDomain;
-    }
-
-   /**
-    * Removes subdomains to get the registered domain (the first after top-level)
-    *
-    * The method will check Public Suffix List to find out where top-level
-    * domain ends and registered domain starts. It will remove domain parts
-    * to the left of registered one.
-    *
-    * @param  string        domain name
-    * @return string|bool   registered domain, will return false if $domain is
-    *                       either invalid or a TLD itself
-    */
-    public static function getRegisteredDomain($domain)
-    {
-        $domainParts = explode('.', ltrim($domain, '.'));
-
-        // load the list if needed
-        if (empty(self::$psl)) {
-            $path = '@data_dir@' . DIRECTORY_SEPARATOR . 'HTTP_Request2';
-            if (0 === strpos($path, '@' . 'data_dir@')) {
-                $path = realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . '..'
-                                 . DIRECTORY_SEPARATOR . 'data');
-            }
-            self::$psl = include_once $path . DIRECTORY_SEPARATOR . 'public-suffix-list.php';
-        }
-
-        if (!($result = self::checkDomainsList($domainParts, self::$psl))) {
-            // known TLD, invalid domain name
-            return false;
-        }
-
-        // unknown TLD
-        if (!strpos($result, '.')) {
-            // fallback to checking that domain "has at least two dots"
-            if (2 > ($count = count($domainParts))) {
-                return false;
-            }
-            return $domainParts[$count - 2] . '.' . $domainParts[$count - 1];
-        }
-        return $result;
-    }
-
-   /**
-    * Recursive helper method for {@link getRegisteredDomain()}
-    *
-    * @param  array         remaining domain parts
-    * @param  mixed         node in {@link HTTP_Request2_CookieJar::$psl} to check
-    * @return string|null   concatenated domain parts, null in case of error
-    */
-    protected static function checkDomainsList(array $domainParts, $listNode)
-    {
-        $sub    = array_pop($domainParts);
-        $result = null;
-
-        if (!is_array($listNode) || is_null($sub)
-            || array_key_exists('!' . $sub, $listNode)
-         ) {
-            return $sub;
-
-        } elseif (array_key_exists($sub, $listNode)) {
-            $result = self::checkDomainsList($domainParts, $listNode[$sub]);
-
-        } elseif (array_key_exists('*', $listNode)) {
-            $result = self::checkDomainsList($domainParts, $listNode['*']);
-
-        } else {
-            return $sub;
-        }
-
-        return (strlen($result) > 0) ? ($result . '.' . $sub) : null;
-    }
-}
-?>
\ No newline at end of file
diff --git a/lib/ext/HTTP/Request2/Exception.php b/lib/ext/HTTP/Request2/Exception.php
deleted file mode 100644
index 34256c2..0000000
--- a/lib/ext/HTTP/Request2/Exception.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/**
- * Exception classes for HTTP_Request2 package
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Exception.php 308629 2011-02-24 17:34:24Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for exceptions in PEAR
- */
-require_once 'PEAR/Exception.php';
-
-/**
- * Base exception class for HTTP_Request2 package
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @version    Release: 2.0.0
- * @link       http://pear.php.net/pepr/pepr-proposal-show.php?id=132
- */
-class HTTP_Request2_Exception extends PEAR_Exception
-{
-    /** An invalid argument was passed to a method */
-    const INVALID_ARGUMENT   = 1;
-    /** Some required value was not available */
-    const MISSING_VALUE      = 2;
-    /** Request cannot be processed due to errors in PHP configuration */
-    const MISCONFIGURATION   = 3;
-    /** Error reading the local file */
-    const READ_ERROR         = 4;
-
-    /** Server returned a response that does not conform to HTTP protocol */
-    const MALFORMED_RESPONSE = 10;
-    /** Failure decoding Content-Encoding or Transfer-Encoding of response */
-    const DECODE_ERROR       = 20;
-    /** Operation timed out */
-    const TIMEOUT            = 30;
-    /** Number of redirects exceeded 'max_redirects' configuration parameter */
-    const TOO_MANY_REDIRECTS = 40;
-    /** Redirect to a protocol other than http(s):// */
-    const NON_HTTP_REDIRECT  = 50;
-
-   /**
-    * Native error code
-    * @var int
-    */
-    private $_nativeCode;
-
-   /**
-    * Constructor, can set package error code and native error code
-    *
-    * @param string exception message
-    * @param int    package error code, one of class constants
-    * @param int    error code from underlying PHP extension
-    */
-    public function __construct($message = null, $code = null, $nativeCode = null)
-    {
-        parent::__construct($message, $code);
-        $this->_nativeCode = $nativeCode;
-    }
-
-   /**
-    * Returns error code produced by underlying PHP extension
-    *
-    * For Socket Adapter this may contain error number returned by
-    * stream_socket_client(), for Curl Adapter this will contain error number
-    * returned by curl_errno()
-    *
-    * @return integer
-    */
-    public function getNativeCode()
-    {
-        return $this->_nativeCode;
-    }
-}
-
-/**
- * Exception thrown in case of missing features
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @version    Release: 2.0.0
- */
-class HTTP_Request2_NotImplementedException extends HTTP_Request2_Exception {}
-
-/**
- * Exception that represents error in the program logic
- *
- * This exception usually implies a programmer's error, like passing invalid
- * data to methods or trying to use PHP extensions that weren't installed or
- * enabled. Usually exceptions of this kind will be thrown before request even
- * starts.
- *
- * The exception will usually contain a package error code.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @version    Release: 2.0.0
- */
-class HTTP_Request2_LogicException extends HTTP_Request2_Exception {}
-
-/**
- * Exception thrown when connection to a web or proxy server fails
- *
- * The exception will not contain a package error code, but will contain
- * native error code, as returned by stream_socket_client() or curl_errno().
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @version    Release: 2.0.0
- */
-class HTTP_Request2_ConnectionException extends HTTP_Request2_Exception {}
-
-/**
- * Exception thrown when sending or receiving HTTP message fails
- *
- * The exception may contain both package error code and native error code.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @version    Release: 2.0.0
- */
-class HTTP_Request2_MessageException extends HTTP_Request2_Exception {}
-?>
\ No newline at end of file
diff --git a/lib/ext/HTTP/Request2/MultipartBody.php b/lib/ext/HTTP/Request2/MultipartBody.php
deleted file mode 100644
index 021a199..0000000
--- a/lib/ext/HTTP/Request2/MultipartBody.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-/**
- * Helper class for building multipart/form-data request body
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: MultipartBody.php 308322 2011-02-14 13:58:03Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Class for building multipart/form-data request body
- *
- * The class helps to reduce memory consumption by streaming large file uploads
- * from disk, it also allows monitoring of upload progress (see request #7630)
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 2.0.0
- * @link       http://tools.ietf.org/html/rfc1867
- */
-class HTTP_Request2_MultipartBody
-{
-   /**
-    * MIME boundary
-    * @var  string
-    */
-    private $_boundary;
-
-   /**
-    * Form parameters added via {@link HTTP_Request2::addPostParameter()}
-    * @var  array
-    */
-    private $_params = array();
-
-   /**
-    * File uploads added via {@link HTTP_Request2::addUpload()}
-    * @var  array
-    */
-    private $_uploads = array();
-
-   /**
-    * Header for parts with parameters
-    * @var  string
-    */
-    private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";
-
-   /**
-    * Header for parts with uploads
-    * @var  string
-    */
-    private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
-
-   /**
-    * Current position in parameter and upload arrays
-    *
-    * First number is index of "current" part, second number is position within
-    * "current" part
-    *
-    * @var  array
-    */
-    private $_pos = array(0, 0);
-
-
-   /**
-    * Constructor. Sets the arrays with POST data.
-    *
-    * @param    array   values of form fields set via {@link HTTP_Request2::addPostParameter()}
-    * @param    array   file uploads set via {@link HTTP_Request2::addUpload()}
-    * @param    bool    whether to append brackets to array variable names
-    */
-    public function __construct(array $params, array $uploads, $useBrackets = true)
-    {
-        $this->_params = self::_flattenArray('', $params, $useBrackets);
-        foreach ($uploads as $fieldName => $f) {
-            if (!is_array($f['fp'])) {
-                $this->_uploads[] = $f + array('name' => $fieldName);
-            } else {
-                for ($i = 0; $i < count($f['fp']); $i++) {
-                    $upload = array(
-                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
-                    );
-                    foreach (array('fp', 'filename', 'size', 'type') as $key) {
-                        $upload[$key] = $f[$key][$i];
-                    }
-                    $this->_uploads[] = $upload;
-                }
-            }
-        }
-    }
-
-   /**
-    * Returns the length of the body to use in Content-Length header
-    *
-    * @return   integer
-    */
-    public function getLength()
-    {
-        $boundaryLength     = strlen($this->getBoundary());
-        $headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;
-        $headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;
-        $length             = $boundaryLength + 6;
-        foreach ($this->_params as $p) {
-            $length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;
-        }
-        foreach ($this->_uploads as $u) {
-            $length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +
-                       strlen($u['filename']) + $u['size'] + 2;
-        }
-        return $length;
-    }
-
-   /**
-    * Returns the boundary to use in Content-Type header
-    *
-    * @return   string
-    */
-    public function getBoundary()
-    {
-        if (empty($this->_boundary)) {
-            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
-        }
-        return $this->_boundary;
-    }
-
-   /**
-    * Returns next chunk of request body
-    *
-    * @param    integer Amount of bytes to read
-    * @return   string  Up to $length bytes of data, empty string if at end
-    */
-    public function read($length)
-    {
-        $ret         = '';
-        $boundary    = $this->getBoundary();
-        $paramCount  = count($this->_params);
-        $uploadCount = count($this->_uploads);
-        while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {
-            $oldLength = $length;
-            if ($this->_pos[0] < $paramCount) {
-                $param = sprintf($this->_headerParam, $boundary,
-                                 $this->_params[$this->_pos[0]][0]) .
-                         $this->_params[$this->_pos[0]][1] . "\r\n";
-                $ret    .= substr($param, $this->_pos[1], $length);
-                $length -= min(strlen($param) - $this->_pos[1], $length);
-
-            } elseif ($this->_pos[0] < $paramCount + $uploadCount) {
-                $pos    = $this->_pos[0] - $paramCount;
-                $header = sprintf($this->_headerUpload, $boundary,
-                                  $this->_uploads[$pos]['name'],
-                                  $this->_uploads[$pos]['filename'],
-                                  $this->_uploads[$pos]['type']);
-                if ($this->_pos[1] < strlen($header)) {
-                    $ret    .= substr($header, $this->_pos[1], $length);
-                    $length -= min(strlen($header) - $this->_pos[1], $length);
-                }
-                $filePos  = max(0, $this->_pos[1] - strlen($header));
-                if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {
-                    $ret     .= fread($this->_uploads[$pos]['fp'], $length);
-                    $length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);
-                }
-                if ($length > 0) {
-                    $start   = $this->_pos[1] + ($oldLength - $length) -
-                               strlen($header) - $this->_uploads[$pos]['size'];
-                    $ret    .= substr("\r\n", $start, $length);
-                    $length -= min(2 - $start, $length);
-                }
-
-            } else {
-                $closing  = '--' . $boundary . "--\r\n";
-                $ret     .= substr($closing, $this->_pos[1], $length);
-                $length  -= min(strlen($closing) - $this->_pos[1], $length);
-            }
-            if ($length > 0) {
-                $this->_pos     = array($this->_pos[0] + 1, 0);
-            } else {
-                $this->_pos[1] += $oldLength;
-            }
-        }
-        return $ret;
-    }
-
-   /**
-    * Sets the current position to the start of the body
-    *
-    * This allows reusing the same body in another request
-    */
-    public function rewind()
-    {
-        $this->_pos = array(0, 0);
-        foreach ($this->_uploads as $u) {
-            rewind($u['fp']);
-        }
-    }
-
-   /**
-    * Returns the body as string
-    *
-    * Note that it reads all file uploads into memory so it is a good idea not
-    * to use this method with large file uploads and rely on read() instead.
-    *
-    * @return   string
-    */
-    public function __toString()
-    {
-        $this->rewind();
-        return $this->read($this->getLength());
-    }
-
-
-   /**
-    * Helper function to change the (probably multidimensional) associative array
-    * into the simple one.
-    *
-    * @param    string  name for item
-    * @param    mixed   item's values
-    * @param    bool    whether to append [] to array variables' names
-    * @return   array   array with the following items: array('item name', 'item value');
-    */
-    private static function _flattenArray($name, $values, $useBrackets)
-    {
-        if (!is_array($values)) {
-            return array(array($name, $values));
-        } else {
-            $ret = array();
-            foreach ($values as $k => $v) {
-                if (empty($name)) {
-                    $newName = $k;
-                } elseif ($useBrackets) {
-                    $newName = $name . '[' . $k . ']';
-                } else {
-                    $newName = $name;
-                }
-                $ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));
-            }
-            return $ret;
-        }
-    }
-}
-?>
diff --git a/lib/ext/HTTP/Request2/Observer/Log.php b/lib/ext/HTTP/Request2/Observer/Log.php
deleted file mode 100644
index dd59859..0000000
--- a/lib/ext/HTTP/Request2/Observer/Log.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/**
- * An observer useful for debugging / testing.
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category HTTP
- * @package  HTTP_Request2
- * @author   David Jean Louis <izi@php.net>
- * @author   Alexey Borzov <avb@php.net>
- * @license  http://opensource.org/licenses/bsd-license.php New BSD License
- * @version  SVN: $Id: Log.php 308680 2011-02-25 17:40:17Z avb $
- * @link     http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Exception class for HTTP_Request2 package
- */
-require_once 'HTTP/Request2/Exception.php';
-
-/**
- * A debug observer useful for debugging / testing.
- *
- * This observer logs to a log target data corresponding to the various request
- * and response events, it logs by default to php://output but can be configured
- * to log to a file or via the PEAR Log package.
- *
- * A simple example:
- * <code>
- * require_once 'HTTP/Request2.php';
- * require_once 'HTTP/Request2/Observer/Log.php';
- *
- * $request  = new HTTP_Request2('http://www.example.com');
- * $observer = new HTTP_Request2_Observer_Log();
- * $request->attach($observer);
- * $request->send();
- * </code>
- *
- * A more complex example with PEAR Log:
- * <code>
- * require_once 'HTTP/Request2.php';
- * require_once 'HTTP/Request2/Observer/Log.php';
- * require_once 'Log.php';
- *
- * $request  = new HTTP_Request2('http://www.example.com');
- * // we want to log with PEAR log
- * $observer = new HTTP_Request2_Observer_Log(Log::factory('console'));
- *
- * // we only want to log received headers
- * $observer->events = array('receivedHeaders');
- *
- * $request->attach($observer);
- * $request->send();
- * </code>
- *
- * @category HTTP
- * @package  HTTP_Request2
- * @author   David Jean Louis <izi@php.net>
- * @author   Alexey Borzov <avb@php.net>
- * @license  http://opensource.org/licenses/bsd-license.php New BSD License
- * @version  Release: 2.0.0
- * @link     http://pear.php.net/package/HTTP_Request2
- */
-class HTTP_Request2_Observer_Log implements SplObserver
-{
-    // properties {{{
-
-    /**
-     * The log target, it can be a a resource or a PEAR Log instance.
-     *
-     * @var resource|Log $target
-     */
-    protected $target = null;
-
-    /**
-     * The events to log.
-     *
-     * @var array $events
-     */
-    public $events = array(
-        'connect',
-        'sentHeaders',
-        'sentBody',
-        'receivedHeaders',
-        'receivedBody',
-        'disconnect',
-    );
-
-    // }}}
-    // __construct() {{{
-
-    /**
-     * Constructor.
-     *
-     * @param mixed $target Can be a file path (default: php://output), a resource,
-     *                      or an instance of the PEAR Log class.
-     * @param array $events Array of events to listen to (default: all events)
-     *
-     * @return void
-     */
-    public function __construct($target = 'php://output', array $events = array())
-    {
-        if (!empty($events)) {
-            $this->events = $events;
-        }
-        if (is_resource($target) || $target instanceof Log) {
-            $this->target = $target;
-        } elseif (false === ($this->target = @fopen($target, 'ab'))) {
-            throw new HTTP_Request2_Exception("Unable to open '{$target}'");
-        }
-    }
-
-    // }}}
-    // update() {{{
-
-    /**
-     * Called when the request notifies us of an event.
-     *
-     * @param HTTP_Request2 $subject The HTTP_Request2 instance
-     *
-     * @return void
-     */
-    public function update(SplSubject $subject)
-    {
-        $event = $subject->getLastEvent();
-        if (!in_array($event['name'], $this->events)) {
-            return;
-        }
-
-        switch ($event['name']) {
-        case 'connect':
-            $this->log('* Connected to ' . $event['data']);
-            break;
-        case 'sentHeaders':
-            $headers = explode("\r\n", $event['data']);
-            array_pop($headers);
-            foreach ($headers as $header) {
-                $this->log('> ' . $header);
-            }
-            break;
-        case 'sentBody':
-            $this->log('> ' . $event['data'] . ' byte(s) sent');
-            break;
-        case 'receivedHeaders':
-            $this->log(sprintf('< HTTP/%s %s %s',
-                $event['data']->getVersion(),
-                $event['data']->getStatus(),
-                $event['data']->getReasonPhrase()));
-            $headers = $event['data']->getHeader();
-            foreach ($headers as $key => $val) {
-                $this->log('< ' . $key . ': ' . $val);
-            }
-            $this->log('< ');
-            break;
-        case 'receivedBody':
-            $this->log($event['data']->getBody());
-            break;
-        case 'disconnect':
-            $this->log('* Disconnected');
-            break;
-        }
-    }
-
-    // }}}
-    // log() {{{
-
-    /**
-     * Logs the given message to the configured target.
-     *
-     * @param string $message Message to display
-     *
-     * @return void
-     */
-    protected function log($message)
-    {
-        if ($this->target instanceof Log) {
-            $this->target->debug($message);
-        } elseif (is_resource($this->target)) {
-            fwrite($this->target, $message . "\r\n");
-        }
-    }
-
-    // }}}
-}
-
-?>
\ No newline at end of file
diff --git a/lib/ext/HTTP/Request2/Response.php b/lib/ext/HTTP/Request2/Response.php
deleted file mode 100644
index 6e0f659..0000000
--- a/lib/ext/HTTP/Request2/Response.php
+++ /dev/null
@@ -1,643 +0,0 @@
-<?php
-/**
- * Class representing a HTTP response
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Response.php 317591 2011-10-01 08:37:49Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Exception class for HTTP_Request2 package
- */
-require_once 'HTTP/Request2/Exception.php';
-
-/**
- * Class representing a HTTP response
- *
- * The class is designed to be used in "streaming" scenario, building the
- * response as it is being received:
- * <code>
- * $statusLine = read_status_line();
- * $response = new HTTP_Request2_Response($statusLine);
- * do {
- *     $headerLine = read_header_line();
- *     $response->parseHeaderLine($headerLine);
- * } while ($headerLine != '');
- *
- * while ($chunk = read_body()) {
- *     $response->appendBody($chunk);
- * }
- *
- * var_dump($response->getHeader(), $response->getCookies(), $response->getBody());
- * </code>
- *
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 2.0.0
- * @link       http://tools.ietf.org/html/rfc2616#section-6
- */
-class HTTP_Request2_Response
-{
-   /**
-    * HTTP protocol version (e.g. 1.0, 1.1)
-    * @var  string
-    */
-    protected $version;
-
-   /**
-    * Status code
-    * @var  integer
-    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
-    */
-    protected $code;
-
-   /**
-    * Reason phrase
-    * @var  string
-    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
-    */
-    protected $reasonPhrase;
-
-   /**
-    * Effective URL (may be different from original request URL in case of redirects)
-    * @var  string
-    */
-    protected $effectiveUrl;
-
-   /**
-    * Associative array of response headers
-    * @var  array
-    */
-    protected $headers = array();
-
-   /**
-    * Cookies set in the response
-    * @var  array
-    */
-    protected $cookies = array();
-
-   /**
-    * Name of last header processed by parseHederLine()
-    *
-    * Used to handle the headers that span multiple lines
-    *
-    * @var  string
-    */
-    protected $lastHeader = null;
-
-   /**
-    * Response body
-    * @var  string
-    */
-    protected $body = '';
-
-   /**
-    * Whether the body is still encoded by Content-Encoding
-    *
-    * cURL provides the decoded body to the callback; if we are reading from
-    * socket the body is still gzipped / deflated
-    *
-    * @var  bool
-    */
-    protected $bodyEncoded;
-
-   /**
-    * Associative array of HTTP status code / reason phrase.
-    *
-    * @var  array
-    * @link http://tools.ietf.org/html/rfc2616#section-10
-    */
-    protected static $phrases = array(
-
-        // 1xx: Informational - Request received, continuing process
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-
-        // 2xx: Success - The action was successfully received, understood and
-        // accepted
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-
-        // 3xx: Redirection - Further action must be taken in order to complete
-        // the request
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',  // 1.1
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        307 => 'Temporary Redirect',
-
-        // 4xx: Client Error - The request contains bad syntax or cannot be
-        // fulfilled
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-
-        // 5xx: Server Error - The server failed to fulfill an apparently
-        // valid request
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        509 => 'Bandwidth Limit Exceeded',
-
-    );
-
-   /**
-    * Returns the default reason phrase for the given code or all reason phrases
-    *
-    * @param  int $code         Response code
-    * @return string|array|null Default reason phrase for $code if $code is given
-    *                           (null if no phrase is available), array of all
-    *                           reason phrases if $code is null
-    * @link   http://pear.php.net/bugs/18716
-    */
-    public static function getDefaultReasonPhrase($code = null)
-    {
-        if (null === $code) {
-            return self::$phrases;
-        } else {
-            return isset(self::$phrases[$code]) ? self::$phrases[$code] : null;
-        }
-    }
-
-   /**
-    * Constructor, parses the response status line
-    *
-    * @param    string Response status line (e.g. "HTTP/1.1 200 OK")
-    * @param    bool   Whether body is still encoded by Content-Encoding
-    * @param    string Effective URL of the response
-    * @throws   HTTP_Request2_MessageException if status line is invalid according to spec
-    */
-    public function __construct($statusLine, $bodyEncoded = true, $effectiveUrl = null)
-    {
-        if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {
-            throw new HTTP_Request2_MessageException(
-                "Malformed response: {$statusLine}",
-                HTTP_Request2_Exception::MALFORMED_RESPONSE
-            );
-        }
-        $this->version      = $m[1];
-        $this->code         = intval($m[2]);
-        $this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);
-        $this->bodyEncoded  = (bool)$bodyEncoded;
-        $this->effectiveUrl = (string)$effectiveUrl;
-    }
-
-   /**
-    * Parses the line from HTTP response filling $headers array
-    *
-    * The method should be called after reading the line from socket or receiving
-    * it into cURL callback. Passing an empty string here indicates the end of
-    * response headers and triggers additional processing, so be sure to pass an
-    * empty string in the end.
-    *
-    * @param    string  Line from HTTP response
-    */
-    public function parseHeaderLine($headerLine)
-    {
-        $headerLine = trim($headerLine, "\r\n");
-
-        // empty string signals the end of headers, process the received ones
-        if ('' == $headerLine) {
-            if (!empty($this->headers['set-cookie'])) {
-                $cookies = is_array($this->headers['set-cookie'])?
-                           $this->headers['set-cookie']:
-                           array($this->headers['set-cookie']);
-                foreach ($cookies as $cookieString) {
-                    $this->parseCookie($cookieString);
-                }
-                unset($this->headers['set-cookie']);
-            }
-            foreach (array_keys($this->headers) as $k) {
-                if (is_array($this->headers[$k])) {
-                    $this->headers[$k] = implode(', ', $this->headers[$k]);
-                }
-            }
-
-        // string of the form header-name: header value
-        } elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {
-            $name  = strtolower($m[1]);
-            $value = trim($m[2]);
-            if (empty($this->headers[$name])) {
-                $this->headers[$name] = $value;
-            } else {
-                if (!is_array($this->headers[$name])) {
-                    $this->headers[$name] = array($this->headers[$name]);
-                }
-                $this->headers[$name][] = $value;
-            }
-            $this->lastHeader = $name;
-
-        // continuation of a previous header
-        } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
-            if (!is_array($this->headers[$this->lastHeader])) {
-                $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
-            } else {
-                $key = count($this->headers[$this->lastHeader]) - 1;
-                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
-            }
-        }
-    }
-
-   /**
-    * Parses a Set-Cookie header to fill $cookies array
-    *
-    * @param    string    value of Set-Cookie header
-    * @link     http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
-    */
-    protected function parseCookie($cookieString)
-    {
-        $cookie = array(
-            'expires' => null,
-            'domain'  => null,
-            'path'    => null,
-            'secure'  => false
-        );
-
-        // Only a name=value pair
-        if (!strpos($cookieString, ';')) {
-            $pos = strpos($cookieString, '=');
-            $cookie['name']  = trim(substr($cookieString, 0, $pos));
-            $cookie['value'] = trim(substr($cookieString, $pos + 1));
-
-        // Some optional parameters are supplied
-        } else {
-            $elements = explode(';', $cookieString);
-            $pos = strpos($elements[0], '=');
-            $cookie['name']  = trim(substr($elements[0], 0, $pos));
-            $cookie['value'] = trim(substr($elements[0], $pos + 1));
-
-            for ($i = 1; $i < count($elements); $i++) {
-                if (false === strpos($elements[$i], '=')) {
-                    $elName  = trim($elements[$i]);
-                    $elValue = null;
-                } else {
-                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
-                }
-                $elName = strtolower($elName);
-                if ('secure' == $elName) {
-                    $cookie['secure'] = true;
-                } elseif ('expires' == $elName) {
-                    $cookie['expires'] = str_replace('"', '', $elValue);
-                } elseif ('path' == $elName || 'domain' == $elName) {
-                    $cookie[$elName] = urldecode($elValue);
-                } else {
-                    $cookie[$elName] = $elValue;
-                }
-            }
-        }
-        $this->cookies[] = $cookie;
-    }
-
-   /**
-    * Appends a string to the response body
-    * @param    string
-    */
-    public function appendBody($bodyChunk)
-    {
-        $this->body .= $bodyChunk;
-    }
-
-   /**
-    * Returns the effective URL of the response
-    *
-    * This may be different from the request URL if redirects were followed.
-    *
-    * @return string
-    * @link   http://pear.php.net/bugs/bug.php?id=18412
-    */
-    public function getEffectiveUrl()
-    {
-        return $this->effectiveUrl;
-    }
-
-   /**
-    * Returns the status code
-    * @return   integer
-    */
-    public function getStatus()
-    {
-        return $this->code;
-    }
-
-   /**
-    * Returns the reason phrase
-    * @return   string
-    */
-    public function getReasonPhrase()
-    {
-        return $this->reasonPhrase;
-    }
-
-   /**
-    * Whether response is a redirect that can be automatically handled by HTTP_Request2
-    * @return   bool
-    */
-    public function isRedirect()
-    {
-        return in_array($this->code, array(300, 301, 302, 303, 307))
-               && isset($this->headers['location']);
-    }
-
-   /**
-    * Returns either the named header or all response headers
-    *
-    * @param    string          Name of header to return
-    * @return   string|array    Value of $headerName header (null if header is
-    *                           not present), array of all response headers if
-    *                           $headerName is null
-    */
-    public function getHeader($headerName = null)
-    {
-        if (null === $headerName) {
-            return $this->headers;
-        } else {
-            $headerName = strtolower($headerName);
-            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
-        }
-    }
-
-   /**
-    * Returns cookies set in response
-    *
-    * @return   array
-    */
-    public function getCookies()
-    {
-        return $this->cookies;
-    }
-
-   /**
-    * Returns the body of the response
-    *
-    * @return   string
-    * @throws   HTTP_Request2_Exception if body cannot be decoded
-    */
-    public function getBody()
-    {
-        if (0 == strlen($this->body) || !$this->bodyEncoded ||
-            !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))
-        ) {
-            return $this->body;
-
-        } else {
-            if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
-                $oldEncoding = mb_internal_encoding();
-                mb_internal_encoding('iso-8859-1');
-            }
-
-            try {
-                switch (strtolower($this->getHeader('content-encoding'))) {
-                    case 'gzip':
-                        $decoded = self::decodeGzip($this->body);
-                        break;
-                    case 'deflate':
-                        $decoded = self::decodeDeflate($this->body);
-                }
-            } catch (Exception $e) {
-            }
-
-            if (!empty($oldEncoding)) {
-                mb_internal_encoding($oldEncoding);
-            }
-            if (!empty($e)) {
-                throw $e;
-            }
-            return $decoded;
-        }
-    }
-
-   /**
-    * Get the HTTP version of the response
-    *
-    * @return   string
-    */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
-   /**
-    * Decodes the message-body encoded by gzip
-    *
-    * The real decoding work is done by gzinflate() built-in function, this
-    * method only parses the header and checks data for compliance with
-    * RFC 1952
-    *
-    * @param    string  gzip-encoded data
-    * @return   string  decoded data
-    * @throws   HTTP_Request2_LogicException
-    * @throws   HTTP_Request2_MessageException
-    * @link     http://tools.ietf.org/html/rfc1952
-    */
-    public static function decodeGzip($data)
-    {
-        $length = strlen($data);
-        // If it doesn't look like gzip-encoded data, don't bother
-        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
-            return $data;
-        }
-        if (!function_exists('gzinflate')) {
-            throw new HTTP_Request2_LogicException(
-                'Unable to decode body: gzip extension not available',
-                HTTP_Request2_Exception::MISCONFIGURATION
-            );
-        }
-        $method = ord(substr($data, 2, 1));
-        if (8 != $method) {
-            throw new HTTP_Request2_MessageException(
-                'Error parsing gzip header: unknown compression method',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        }
-        $flags = ord(substr($data, 3, 1));
-        if ($flags & 224) {
-            throw new HTTP_Request2_MessageException(
-                'Error parsing gzip header: reserved bits are set',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        }
-
-        // header is 10 bytes minimum. may be longer, though.
-        $headerLength = 10;
-        // extra fields, need to skip 'em
-        if ($flags & 4) {
-            if ($length - $headerLength - 2 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $extraLength = unpack('v', substr($data, 10, 2));
-            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $headerLength += $extraLength[1] + 2;
-        }
-        // file name, need to skip that
-        if ($flags & 8) {
-            if ($length - $headerLength - 1 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $filenameLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $headerLength += $filenameLength + 1;
-        }
-        // comment, need to skip that also
-        if ($flags & 16) {
-            if ($length - $headerLength - 1 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $commentLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $headerLength += $commentLength + 1;
-        }
-        // have a CRC for header. let's check
-        if ($flags & 2) {
-            if ($length - $headerLength - 2 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
-            $crcStored = unpack('v', substr($data, $headerLength, 2));
-            if ($crcReal != $crcStored[1]) {
-                throw new HTTP_Request2_MessageException(
-                    'Header CRC check failed',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $headerLength += 2;
-        }
-        // unpacked data CRC and size at the end of encoded data
-        $tmp = unpack('V2', substr($data, -8));
-        $dataCrc  = $tmp[1];
-        $dataSize = $tmp[2];
-
-        // finally, call the gzinflate() function
-        // don't pass $dataSize to gzinflate, see bugs #13135, #14370
-        $unpacked = gzinflate(substr($data, $headerLength, -8));
-        if (false === $unpacked) {
-            throw new HTTP_Request2_MessageException(
-                'gzinflate() call failed',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        } elseif ($dataSize != strlen($unpacked)) {
-            throw new HTTP_Request2_MessageException(
-                'Data size check failed',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
-            throw new HTTP_Request2_Exception(
-                'Data CRC check failed',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        }
-        return $unpacked;
-    }
-
-   /**
-    * Decodes the message-body encoded by deflate
-    *
-    * @param    string  deflate-encoded data
-    * @return   string  decoded data
-    * @throws   HTTP_Request2_LogicException
-    */
-    public static function decodeDeflate($data)
-    {
-        if (!function_exists('gzuncompress')) {
-            throw new HTTP_Request2_LogicException(
-                'Unable to decode body: gzip extension not available',
-                HTTP_Request2_Exception::MISCONFIGURATION
-            );
-        }
-        // RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,
-        // while many applications send raw deflate stream from RFC 1951.
-        // We should check for presence of zlib header and use gzuncompress() or
-        // gzinflate() as needed. See bug #15305
-        $header = unpack('n', substr($data, 0, 2));
-        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
-    }
-}
-?>
\ No newline at end of file
diff --git a/lib/ext/Mail/mime.php b/lib/ext/Mail/mime.php
deleted file mode 100644
index c459b91..0000000
--- a/lib/ext/Mail/mime.php
+++ /dev/null
@@ -1,1476 +0,0 @@
-<?php
-/**
- * The Mail_Mime class is used to create MIME E-mail messages
- *
- * The Mail_Mime class provides an OO interface to create MIME
- * enabled email messages. This way you can create emails that
- * contain plain-text bodies, HTML bodies, attachments, inline
- * images and specific headers.
- *
- * Compatible with PHP versions 4 and 5
- *
- * LICENSE: This LICENSE is in the BSD license style.
- * Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
- * Copyright (c) 2003-2006, PEAR <pear-group@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - Neither the name of the authors, nor the names of its contributors 
- *   may be used to endorse or promote products derived from this 
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Mail
- * @package   Mail_Mime
- * @author    Richard Heyes  <richard@phpguru.org>
- * @author    Tomas V.V. Cox <cox@idecnet.com>
- * @author    Cipriano Groenendal <cipri@php.net>
- * @author    Sean Coates <sean@php.net>
- * @author    Aleksander Machniak <alec@php.net>
- * @copyright 2003-2006 PEAR <pear-group@php.net>
- * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   1.8.5
- * @link      http://pear.php.net/package/Mail_mime
- *
- *            This class is based on HTML Mime Mail class from
- *            Richard Heyes <richard@phpguru.org> which was based also
- *            in the mime_mail.class by Tobias Ratschiller <tobias@dnet.it>
- *            and Sascha Schumann <sascha@schumann.cx>
- */
-
-
-/**
- * require PEAR
- *
- * This package depends on PEAR to raise errors.
- */
-require_once 'PEAR.php';
-
-/**
- * require Mail_mimePart
- *
- * Mail_mimePart contains the code required to
- * create all the different parts a mail can
- * consist of.
- */
-require_once 'Mail/mimePart.php';
-
-
-/**
- * The Mail_Mime class provides an OO interface to create MIME
- * enabled email messages. This way you can create emails that
- * contain plain-text bodies, HTML bodies, attachments, inline
- * images and specific headers.
- *
- * @category  Mail
- * @package   Mail_Mime
- * @author    Richard Heyes  <richard@phpguru.org>
- * @author    Tomas V.V. Cox <cox@idecnet.com>
- * @author    Cipriano Groenendal <cipri@php.net>
- * @author    Sean Coates <sean@php.net>
- * @copyright 2003-2006 PEAR <pear-group@php.net>
- * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   Release: 1.8.5
- * @link      http://pear.php.net/package/Mail_mime
- */
-class Mail_mime
-{
-    /**
-     * Contains the plain text part of the email
-     *
-     * @var string
-     * @access private
-     */
-    var $_txtbody;
-
-    /**
-     * Contains the html part of the email
-     *
-     * @var string
-     * @access private
-     */
-    var $_htmlbody;
-
-    /**
-     * list of the attached images
-     *
-     * @var array
-     * @access private
-     */
-    var $_html_images = array();
-
-    /**
-     * list of the attachements
-     *
-     * @var array
-     * @access private
-     */
-    var $_parts = array();
-
-    /**
-     * Headers for the mail
-     *
-     * @var array
-     * @access private
-     */
-    var $_headers = array();
-
-    /**
-     * Build parameters
-     *
-     * @var array
-     * @access private
-     */
-    var $_build_params = array(
-        // What encoding to use for the headers
-        // Options: quoted-printable or base64
-        'head_encoding' => 'quoted-printable',
-        // What encoding to use for plain text
-        // Options: 7bit, 8bit, base64, or quoted-printable
-        'text_encoding' => 'quoted-printable',
-        // What encoding to use for html
-        // Options: 7bit, 8bit, base64, or quoted-printable
-        'html_encoding' => 'quoted-printable',
-        // The character set to use for html
-        'html_charset'  => 'ISO-8859-1',
-        // The character set to use for text
-        'text_charset'  => 'ISO-8859-1',
-        // The character set to use for headers
-        'head_charset'  => 'ISO-8859-1',
-        // End-of-line sequence
-        'eol'           => "\r\n",
-        // Delay attachment files IO until building the message
-        'delay_file_io' => false
-    );
-
-    /**
-     * Constructor function
-     *
-     * @param mixed $params Build parameters that change the way the email
-     *                      is built. Should be an associative array.
-     *                      See $_build_params.
-     *
-     * @return void
-     * @access public
-     */
-    function Mail_mime($params = array())
-    {
-        // Backward-compatible EOL setting
-        if (is_string($params)) {
-            $this->_build_params['eol'] = $params;
-        } else if (defined('MAIL_MIME_CRLF') && !isset($params['eol'])) {
-            $this->_build_params['eol'] = MAIL_MIME_CRLF;
-        }
-
-        // Update build parameters
-        if (!empty($params) && is_array($params)) {
-            while (list($key, $value) = each($params)) {
-                $this->_build_params[$key] = $value;
-            }
-        }
-    }
-
-    /**
-     * Set build parameter value
-     *
-     * @param string $name  Parameter name
-     * @param string $value Parameter value
-     *
-     * @return void
-     * @access public
-     * @since 1.6.0
-     */
-    function setParam($name, $value)
-    {
-        $this->_build_params[$name] = $value;
-    }
-
-    /**
-     * Get build parameter value
-     *
-     * @param string $name Parameter name
-     *
-     * @return mixed Parameter value
-     * @access public
-     * @since 1.6.0
-     */
-    function getParam($name)
-    {
-        return isset($this->_build_params[$name]) ? $this->_build_params[$name] : null;
-    }
-
-    /**
-     * Accessor function to set the body text. Body text is used if
-     * it's not an html mail being sent or else is used to fill the
-     * text/plain part that emails clients who don't support
-     * html should show.
-     *
-     * @param string $data   Either a string or
-     *                       the file name with the contents
-     * @param bool   $isfile If true the first param should be treated
-     *                       as a file name, else as a string (default)
-     * @param bool   $append If true the text or file is appended to
-     *                       the existing body, else the old body is
-     *                       overwritten
-     *
-     * @return mixed         True on success or PEAR_Error object
-     * @access public
-     */
-    function setTXTBody($data, $isfile = false, $append = false)
-    {
-        if (!$isfile) {
-            if (!$append) {
-                $this->_txtbody = $data;
-            } else {
-                $this->_txtbody .= $data;
-            }
-        } else {
-            $cont = $this->_file2str($data);
-            if (PEAR::isError($cont)) {
-                return $cont;
-            }
-            if (!$append) {
-                $this->_txtbody = $cont;
-            } else {
-                $this->_txtbody .= $cont;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Get message text body
-     *
-     * @return string Text body
-     * @access public
-     * @since 1.6.0
-     */
-    function getTXTBody()
-    {
-        return $this->_txtbody;
-    }
-
-    /**
-     * Adds a html part to the mail.
-     *
-     * @param string $data   Either a string or the file name with the
-     *                       contents
-     * @param bool   $isfile A flag that determines whether $data is a
-     *                       filename, or a string(false, default)
-     *
-     * @return bool          True on success
-     * @access public
-     */
-    function setHTMLBody($data, $isfile = false)
-    {
-        if (!$isfile) {
-            $this->_htmlbody = $data;
-        } else {
-            $cont = $this->_file2str($data);
-            if (PEAR::isError($cont)) {
-                return $cont;
-            }
-            $this->_htmlbody = $cont;
-        }
-
-        return true;
-    }
-
-    /**
-     * Get message HTML body
-     *
-     * @return string HTML body
-     * @access public
-     * @since 1.6.0
-     */
-    function getHTMLBody()
-    {
-        return $this->_htmlbody;
-    }
-
-    /**
-     * Adds an image to the list of embedded images.
-     *
-     * @param string $file       The image file name OR image data itself
-     * @param string $c_type     The content type
-     * @param string $name       The filename of the image.
-     *                           Only used if $file is the image data.
-     * @param bool   $isfile     Whether $file is a filename or not.
-     *                           Defaults to true
-     * @param string $content_id Desired Content-ID of MIME part
-     *                           Defaults to generated unique ID
-     *
-     * @return bool          True on success
-     * @access public
-     */
-    function addHTMLImage($file,
-        $c_type='application/octet-stream',
-        $name = '',
-        $isfile = true,
-        $content_id = null
-    ) {
-        $bodyfile = null;
-
-        if ($isfile) {
-            // Don't load file into memory
-            if ($this->_build_params['delay_file_io']) {
-                $filedata = null;
-                $bodyfile = $file;
-            } else {
-                if (PEAR::isError($filedata = $this->_file2str($file))) {
-                    return $filedata;
-                }
-            }
-            $filename = ($name ? $name : $file);
-        } else {
-            $filedata = $file;
-            $filename = $name;
-        }
-
-        if (!$content_id) {
-            $content_id = md5(uniqid(time()));
-        }
-
-        $this->_html_images[] = array(
-            'body'      => $filedata,
-            'body_file' => $bodyfile,
-            'name'      => $filename,
-            'c_type'    => $c_type,
-            'cid'       => $content_id
-        );
-
-        return true;
-    }
-
-    /**
-     * Adds a file to the list of attachments.
-     *
-     * @param string $file        The file name of the file to attach
-     *                            or the file contents itself
-     * @param string $c_type      The content type
-     * @param string $name        The filename of the attachment
-     *                            Only use if $file is the contents
-     * @param bool   $isfile      Whether $file is a filename or not. Defaults to true
-     * @param string $encoding    The type of encoding to use. Defaults to base64.
-     *                            Possible values: 7bit, 8bit, base64 or quoted-printable.
-     * @param string $disposition The content-disposition of this file
-     *                            Defaults to attachment.
-     *                            Possible values: attachment, inline.
-     * @param string $charset     The character set of attachment's content.
-     * @param string $language    The language of the attachment
-     * @param string $location    The RFC 2557.4 location of the attachment
-     * @param string $n_encoding  Encoding of the attachment's name in Content-Type
-     *                            By default filenames are encoded using RFC2231 method
-     *                            Here you can set RFC2047 encoding (quoted-printable
-     *                            or base64) instead
-     * @param string $f_encoding  Encoding of the attachment's filename
-     *                            in Content-Disposition header.
-     * @param string $description Content-Description header
-     * @param string $h_charset   The character set of the headers e.g. filename
-     *                            If not specified, $charset will be used
-     * @param array  $add_headers Additional part headers. Array keys can be in form
-     *                            of <header_name>:<parameter_name>
-     *
-     * @return mixed              True on success or PEAR_Error object
-     * @access public
-     */
-    function addAttachment($file,
-        $c_type      = 'application/octet-stream',
-        $name        = '',
-        $isfile      = true,
-        $encoding    = 'base64',
-        $disposition = 'attachment',
-        $charset     = '',
-        $language    = '',
-        $location    = '',
-        $n_encoding  = null,
-        $f_encoding  = null,
-        $description = '',
-        $h_charset   = null,
-        $add_headers = array()
-    ) {
-        $bodyfile = null;
-
-        if ($isfile) {
-            // Don't load file into memory
-            if ($this->_build_params['delay_file_io']) {
-                $filedata = null;
-                $bodyfile = $file;
-            } else {
-                if (PEAR::isError($filedata = $this->_file2str($file))) {
-                    return $filedata;
-                }
-            }
-            // Force the name the user supplied, otherwise use $file
-            $filename = ($name ? $name : $file);
-        } else {
-            $filedata = $file;
-            $filename = $name;
-        }
-
-        if (!strlen($filename)) {
-            $msg = "The supplied filename for the attachment can't be empty";
-            $err = PEAR::raiseError($msg);
-            return $err;
-        }
-        $filename = $this->_basename($filename);
-
-        $this->_parts[] = array(
-            'body'        => $filedata,
-            'body_file'   => $bodyfile,
-            'name'        => $filename,
-            'c_type'      => $c_type,
-            'charset'     => $charset,
-            'encoding'    => $encoding,
-            'language'    => $language,
-            'location'    => $location,
-            'disposition' => $disposition,
-            'description' => $description,
-            'add_headers' => $add_headers,
-            'name_encoding'     => $n_encoding,
-            'filename_encoding' => $f_encoding,
-            'headers_charset'   => $h_charset,
-        );
-
-        return true;
-    }
-
-    /**
-     * Get the contents of the given file name as string
-     *
-     * @param string $file_name Path of file to process
-     *
-     * @return string           Contents of $file_name
-     * @access private
-     */
-    function &_file2str($file_name)
-    {
-        // Check state of file and raise an error properly
-        if (!file_exists($file_name)) {
-            $err = PEAR::raiseError('File not found: ' . $file_name);
-            return $err;
-        }
-        if (!is_file($file_name)) {
-            $err = PEAR::raiseError('Not a regular file: ' . $file_name);
-            return $err;
-        }
-        if (!is_readable($file_name)) {
-            $err = PEAR::raiseError('File is not readable: ' . $file_name);
-            return $err;
-        }
-
-        // Temporarily reset magic_quotes_runtime and read file contents
-        if ($magic_quote_setting = get_magic_quotes_runtime()) {
-            @ini_set('magic_quotes_runtime', 0);
-        }
-        $cont = file_get_contents($file_name);
-        if ($magic_quote_setting) {
-            @ini_set('magic_quotes_runtime', $magic_quote_setting);
-        }
-
-        return $cont;
-    }
-
-    /**
-     * Adds a text subpart to the mimePart object and
-     * returns it during the build process.
-     *
-     * @param mixed  &$obj The object to add the part to, or
-     *                     null if a new object is to be created.
-     * @param string $text The text to add.
-     *
-     * @return object      The text mimePart object
-     * @access private
-     */
-    function &_addTextPart(&$obj, $text)
-    {
-        $params['content_type'] = 'text/plain';
-        $params['encoding']     = $this->_build_params['text_encoding'];
-        $params['charset']      = $this->_build_params['text_charset'];
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (is_object($obj)) {
-            $ret = $obj->addSubpart($text, $params);
-            return $ret;
-        } else {
-            $ret = new Mail_mimePart($text, $params);
-            return $ret;
-        }
-    }
-
-    /**
-     * Adds a html subpart to the mimePart object and
-     * returns it during the build process.
-     *
-     * @param mixed &$obj The object to add the part to, or
-     *                    null if a new object is to be created.
-     *
-     * @return object     The html mimePart object
-     * @access private
-     */
-    function &_addHtmlPart(&$obj)
-    {
-        $params['content_type'] = 'text/html';
-        $params['encoding']     = $this->_build_params['html_encoding'];
-        $params['charset']      = $this->_build_params['html_charset'];
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (is_object($obj)) {
-            $ret = $obj->addSubpart($this->_htmlbody, $params);
-            return $ret;
-        } else {
-            $ret = new Mail_mimePart($this->_htmlbody, $params);
-            return $ret;
-        }
-    }
-
-    /**
-     * Creates a new mimePart object, using multipart/mixed as
-     * the initial content-type and returns it during the
-     * build process.
-     *
-     * @return object The multipart/mixed mimePart object
-     * @access private
-     */
-    function &_addMixedPart()
-    {
-        $params                 = array();
-        $params['content_type'] = 'multipart/mixed';
-        $params['eol']          = $this->_build_params['eol'];
-
-        // Create empty multipart/mixed Mail_mimePart object to return
-        $ret = new Mail_mimePart('', $params);
-        return $ret;
-    }
-
-    /**
-     * Adds a multipart/alternative part to a mimePart
-     * object (or creates one), and returns it during
-     * the build process.
-     *
-     * @param mixed &$obj The object to add the part to, or
-     *                    null if a new object is to be created.
-     *
-     * @return object     The multipart/mixed mimePart object
-     * @access private
-     */
-    function &_addAlternativePart(&$obj)
-    {
-        $params['content_type'] = 'multipart/alternative';
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (is_object($obj)) {
-            return $obj->addSubpart('', $params);
-        } else {
-            $ret = new Mail_mimePart('', $params);
-            return $ret;
-        }
-    }
-
-    /**
-     * Adds a multipart/related part to a mimePart
-     * object (or creates one), and returns it during
-     * the build process.
-     *
-     * @param mixed &$obj The object to add the part to, or
-     *                    null if a new object is to be created
-     *
-     * @return object     The multipart/mixed mimePart object
-     * @access private
-     */
-    function &_addRelatedPart(&$obj)
-    {
-        $params['content_type'] = 'multipart/related';
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (is_object($obj)) {
-            return $obj->addSubpart('', $params);
-        } else {
-            $ret = new Mail_mimePart('', $params);
-            return $ret;
-        }
-    }
-
-    /**
-     * Adds an html image subpart to a mimePart object
-     * and returns it during the build process.
-     *
-     * @param object &$obj  The mimePart to add the image to
-     * @param array  $value The image information
-     *
-     * @return object       The image mimePart object
-     * @access private
-     */
-    function &_addHtmlImagePart(&$obj, $value)
-    {
-        $params['content_type'] = $value['c_type'];
-        $params['encoding']     = 'base64';
-        $params['disposition']  = 'inline';
-        $params['filename']     = $value['name'];
-        $params['cid']          = $value['cid'];
-        $params['body_file']    = $value['body_file'];
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (!empty($value['name_encoding'])) {
-            $params['name_encoding'] = $value['name_encoding'];
-        }
-        if (!empty($value['filename_encoding'])) {
-            $params['filename_encoding'] = $value['filename_encoding'];
-        }
-
-        $ret = $obj->addSubpart($value['body'], $params);
-        return $ret;
-    }
-
-    /**
-     * Adds an attachment subpart to a mimePart object
-     * and returns it during the build process.
-     *
-     * @param object &$obj  The mimePart to add the image to
-     * @param array  $value The attachment information
-     *
-     * @return object       The image mimePart object
-     * @access private
-     */
-    function &_addAttachmentPart(&$obj, $value)
-    {
-        $params['eol']          = $this->_build_params['eol'];
-        $params['filename']     = $value['name'];
-        $params['encoding']     = $value['encoding'];
-        $params['content_type'] = $value['c_type'];
-        $params['body_file']    = $value['body_file'];
-        $params['disposition']  = isset($value['disposition']) ? 
-                                  $value['disposition'] : 'attachment';
-
-        // content charset
-        if (!empty($value['charset'])) {
-            $params['charset'] = $value['charset'];
-        }
-        // headers charset (filename, description)
-        if (!empty($value['headers_charset'])) {
-            $params['headers_charset'] = $value['headers_charset'];
-        }
-        if (!empty($value['language'])) {
-            $params['language'] = $value['language'];
-        }
-        if (!empty($value['location'])) {
-            $params['location'] = $value['location'];
-        }
-        if (!empty($value['name_encoding'])) {
-            $params['name_encoding'] = $value['name_encoding'];
-        }
-        if (!empty($value['filename_encoding'])) {
-            $params['filename_encoding'] = $value['filename_encoding'];
-        }
-        if (!empty($value['description'])) {
-            $params['description'] = $value['description'];
-        }
-        if (is_array($value['add_headers'])) {
-            $params['headers'] = $value['add_headers'];
-        }
-
-        $ret = $obj->addSubpart($value['body'], $params);
-        return $ret;
-    }
-
-    /**
-     * Returns the complete e-mail, ready to send using an alternative
-     * mail delivery method. Note that only the mailpart that is made
-     * with Mail_Mime is created. This means that,
-     * YOU WILL HAVE NO TO: HEADERS UNLESS YOU SET IT YOURSELF 
-     * using the $headers parameter!
-     * 
-     * @param string $separation The separation between these two parts.
-     * @param array  $params     The Build parameters passed to the
-     *                           &get() function. See &get for more info.
-     * @param array  $headers    The extra headers that should be passed
-     *                           to the &headers() function.
-     *                           See that function for more info.
-     * @param bool   $overwrite  Overwrite the existing headers with new.
-     *
-     * @return mixed The complete e-mail or PEAR error object
-     * @access public
-     */
-    function getMessage($separation = null, $params = null, $headers = null,
-        $overwrite = false
-    ) {
-        if ($separation === null) {
-            $separation = $this->_build_params['eol'];
-        }
-
-        $body = $this->get($params);
-
-        if (PEAR::isError($body)) {
-            return $body;
-        }
-
-        $head = $this->txtHeaders($headers, $overwrite);
-        $mail = $head . $separation . $body;
-        return $mail;
-    }
-
-    /**
-     * Returns the complete e-mail body, ready to send using an alternative
-     * mail delivery method.
-     * 
-     * @param array $params The Build parameters passed to the
-     *                      &get() function. See &get for more info.
-     *
-     * @return mixed The e-mail body or PEAR error object
-     * @access public
-     * @since 1.6.0
-     */
-    function getMessageBody($params = null)
-    {
-        return $this->get($params, null, true);
-    }
-
-    /**
-     * Writes (appends) the complete e-mail into file.
-     * 
-     * @param string $filename  Output file location
-     * @param array  $params    The Build parameters passed to the
-     *                          &get() function. See &get for more info.
-     * @param array  $headers   The extra headers that should be passed
-     *                          to the &headers() function.
-     *                          See that function for more info.
-     * @param bool   $overwrite Overwrite the existing headers with new.
-     *
-     * @return mixed True or PEAR error object
-     * @access public
-     * @since 1.6.0
-     */
-    function saveMessage($filename, $params = null, $headers = null, $overwrite = false)
-    {
-        // Check state of file and raise an error properly
-        if (file_exists($filename) && !is_writable($filename)) {
-            $err = PEAR::raiseError('File is not writable: ' . $filename);
-            return $err;
-        }
-
-        // Temporarily reset magic_quotes_runtime and read file contents
-        if ($magic_quote_setting = get_magic_quotes_runtime()) {
-            @ini_set('magic_quotes_runtime', 0);
-        }
-
-        if (!($fh = fopen($filename, 'ab'))) {
-            $err = PEAR::raiseError('Unable to open file: ' . $filename);
-            return $err;
-        }
-
-        // Write message headers into file (skipping Content-* headers)
-        $head = $this->txtHeaders($headers, $overwrite, true);
-        if (fwrite($fh, $head) === false) {
-            $err = PEAR::raiseError('Error writing to file: ' . $filename);
-            return $err;
-        }
-
-        fclose($fh);
-
-        if ($magic_quote_setting) {
-            @ini_set('magic_quotes_runtime', $magic_quote_setting);
-        }
-
-        // Write the rest of the message into file
-        $res = $this->get($params, $filename);
-
-        return $res ? $res : true;
-    }
-
-    /**
-     * Writes (appends) the complete e-mail body into file.
-     * 
-     * @param string $filename Output file location
-     * @param array  $params   The Build parameters passed to the
-     *                         &get() function. See &get for more info.
-     *
-     * @return mixed True or PEAR error object
-     * @access public
-     * @since 1.6.0
-     */
-    function saveMessageBody($filename, $params = null)
-    {
-        // Check state of file and raise an error properly
-        if (file_exists($filename) && !is_writable($filename)) {
-            $err = PEAR::raiseError('File is not writable: ' . $filename);
-            return $err;
-        }
-
-        // Temporarily reset magic_quotes_runtime and read file contents
-        if ($magic_quote_setting = get_magic_quotes_runtime()) {
-            @ini_set('magic_quotes_runtime', 0);
-        }
-
-        if (!($fh = fopen($filename, 'ab'))) {
-            $err = PEAR::raiseError('Unable to open file: ' . $filename);
-            return $err;
-        }
-
-        // Write the rest of the message into file
-        $res = $this->get($params, $filename, true);
-
-        return $res ? $res : true;
-    }
-
-    /**
-     * Builds the multipart message from the list ($this->_parts) and
-     * returns the mime content.
-     *
-     * @param array    $params    Build parameters that change the way the email
-     *                            is built. Should be associative. See $_build_params.
-     * @param resource $filename  Output file where to save the message instead of
-     *                            returning it
-     * @param boolean  $skip_head True if you want to return/save only the message
-     *                            without headers
-     *
-     * @return mixed The MIME message content string, null or PEAR error object
-     * @access public
-     */
-    function &get($params = null, $filename = null, $skip_head = false)
-    {
-        if (isset($params)) {
-            while (list($key, $value) = each($params)) {
-                $this->_build_params[$key] = $value;
-            }
-        }
-
-        if (isset($this->_headers['From'])) {
-            // Bug #11381: Illegal characters in domain ID
-            if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $this->_headers['From'], $matches)) {
-                $domainID = $matches[1];
-            } else {
-                $domainID = '@localhost';
-            }
-            foreach ($this->_html_images as $i => $img) {
-                $cid = $this->_html_images[$i]['cid']; 
-                if (!preg_match('#'.preg_quote($domainID).'$#', $cid)) {
-                    $this->_html_images[$i]['cid'] = $cid . $domainID;
-                }
-            }
-        }
-
-        if (count($this->_html_images) && isset($this->_htmlbody)) {
-            foreach ($this->_html_images as $key => $value) {
-                $regex   = array();
-                $regex[] = '#(\s)((?i)src|background|href(?-i))\s*=\s*(["\']?)' .
-                            preg_quote($value['name'], '#') . '\3#';
-                $regex[] = '#(?i)url(?-i)\(\s*(["\']?)' .
-                            preg_quote($value['name'], '#') . '\1\s*\)#';
-
-                $rep   = array();
-                $rep[] = '\1\2=\3cid:' . $value['cid'] .'\3';
-                $rep[] = 'url(\1cid:' . $value['cid'] . '\1)';
-
-                $this->_htmlbody = preg_replace($regex, $rep, $this->_htmlbody);
-                $this->_html_images[$key]['name']
-                    = $this->_basename($this->_html_images[$key]['name']);
-            }
-        }
-
-        $this->_checkParams();
-
-        $null        = null;
-        $attachments = count($this->_parts)                 ? true : false;
-        $html_images = count($this->_html_images)           ? true : false;
-        $html        = strlen($this->_htmlbody)             ? true : false;
-        $text        = (!$html && strlen($this->_txtbody))  ? true : false;
-
-        switch (true) {
-        case $text && !$attachments:
-            $message =& $this->_addTextPart($null, $this->_txtbody);
-            break;
-
-        case !$text && !$html && $attachments:
-            $message =& $this->_addMixedPart();
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        case $text && $attachments:
-            $message =& $this->_addMixedPart();
-            $this->_addTextPart($message, $this->_txtbody);
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        case $html && !$attachments && !$html_images:
-            if (isset($this->_txtbody)) {
-                $message =& $this->_addAlternativePart($null);
-                $this->_addTextPart($message, $this->_txtbody);
-                $this->_addHtmlPart($message);
-            } else {
-                $message =& $this->_addHtmlPart($null);
-            }
-            break;
-
-        case $html && !$attachments && $html_images:
-            // * Content-Type: multipart/alternative;
-            //    * text
-            //    * Content-Type: multipart/related;
-            //       * html
-            //       * image...
-            if (isset($this->_txtbody)) {
-                $message =& $this->_addAlternativePart($null);
-                $this->_addTextPart($message, $this->_txtbody);
-
-                $ht =& $this->_addRelatedPart($message);
-                $this->_addHtmlPart($ht);
-                for ($i = 0; $i < count($this->_html_images); $i++) {
-                    $this->_addHtmlImagePart($ht, $this->_html_images[$i]);
-                }
-            } else {
-                // * Content-Type: multipart/related;
-                //    * html
-                //    * image...
-                $message =& $this->_addRelatedPart($null);
-                $this->_addHtmlPart($message);
-                for ($i = 0; $i < count($this->_html_images); $i++) {
-                    $this->_addHtmlImagePart($message, $this->_html_images[$i]);
-                }
-            }
-            /*
-            // #13444, #9725: the code below was a non-RFC compliant hack
-            // * Content-Type: multipart/related;
-            //    * Content-Type: multipart/alternative;
-            //        * text
-            //        * html
-            //    * image...
-            $message =& $this->_addRelatedPart($null);
-            if (isset($this->_txtbody)) {
-                $alt =& $this->_addAlternativePart($message);
-                $this->_addTextPart($alt, $this->_txtbody);
-                $this->_addHtmlPart($alt);
-            } else {
-                $this->_addHtmlPart($message);
-            }
-            for ($i = 0; $i < count($this->_html_images); $i++) {
-                $this->_addHtmlImagePart($message, $this->_html_images[$i]);
-            }
-            */
-            break;
-
-        case $html && $attachments && !$html_images:
-            $message =& $this->_addMixedPart();
-            if (isset($this->_txtbody)) {
-                $alt =& $this->_addAlternativePart($message);
-                $this->_addTextPart($alt, $this->_txtbody);
-                $this->_addHtmlPart($alt);
-            } else {
-                $this->_addHtmlPart($message);
-            }
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        case $html && $attachments && $html_images:
-            $message =& $this->_addMixedPart();
-            if (isset($this->_txtbody)) {
-                $alt =& $this->_addAlternativePart($message);
-                $this->_addTextPart($alt, $this->_txtbody);
-                $rel =& $this->_addRelatedPart($alt);
-            } else {
-                $rel =& $this->_addRelatedPart($message);
-            }
-            $this->_addHtmlPart($rel);
-            for ($i = 0; $i < count($this->_html_images); $i++) {
-                $this->_addHtmlImagePart($rel, $this->_html_images[$i]);
-            }
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        }
-
-        if (!isset($message)) {
-            $ret = null;
-            return $ret;
-        }
-
-        // Use saved boundary
-        if (!empty($this->_build_params['boundary'])) {
-            $boundary = $this->_build_params['boundary'];
-        } else {
-            $boundary = null;
-        }
-
-        // Write output to file
-        if ($filename) {
-            // Append mimePart message headers and body into file
-            $headers = $message->encodeToFile($filename, $boundary, $skip_head);
-            if (PEAR::isError($headers)) {
-                return $headers;
-            }
-            $this->_headers = array_merge($this->_headers, $headers);
-            $ret = null;
-            return $ret;
-        } else {
-            $output = $message->encode($boundary, $skip_head);
-            if (PEAR::isError($output)) {
-                return $output;
-            }
-            $this->_headers = array_merge($this->_headers, $output['headers']);
-            $body = $output['body'];
-            return $body;
-        }
-    }
-
-    /**
-     * Returns an array with the headers needed to prepend to the email
-     * (MIME-Version and Content-Type). Format of argument is:
-     * $array['header-name'] = 'header-value';
-     *
-     * @param array $xtra_headers Assoc array with any extra headers (optional)
-     *                            (Don't set Content-Type for multipart messages here!)
-     * @param bool  $overwrite    Overwrite already existing headers.
-     * @param bool  $skip_content Don't return content headers: Content-Type,
-     *                            Content-Disposition and Content-Transfer-Encoding
-     * 
-     * @return array              Assoc array with the mime headers
-     * @access public
-     */
-    function &headers($xtra_headers = null, $overwrite = false, $skip_content = false)
-    {
-        // Add mime version header
-        $headers['MIME-Version'] = '1.0';
-
-        // Content-Type and Content-Transfer-Encoding headers should already
-        // be present if get() was called, but we'll re-set them to make sure
-        // we got them when called before get() or something in the message
-        // has been changed after get() [#14780]
-        if (!$skip_content) {
-            $headers += $this->_contentHeaders();
-        }
-
-        if (!empty($xtra_headers)) {
-            $headers = array_merge($headers, $xtra_headers);
-        }
-
-        if ($overwrite) {
-            $this->_headers = array_merge($this->_headers, $headers);
-        } else {
-            $this->_headers = array_merge($headers, $this->_headers);
-        }
-
-        $headers = $this->_headers;
-
-        if ($skip_content) {
-            unset($headers['Content-Type']);
-            unset($headers['Content-Transfer-Encoding']);
-            unset($headers['Content-Disposition']);
-        } else if (!empty($this->_build_params['ctype'])) {
-            $headers['Content-Type'] = $this->_build_params['ctype'];
-        }
-
-        $encodedHeaders = $this->_encodeHeaders($headers);
-        return $encodedHeaders;
-    }
-
-    /**
-     * Get the text version of the headers
-     * (useful if you want to use the PHP mail() function)
-     *
-     * @param array $xtra_headers Assoc array with any extra headers (optional)
-     *                            (Don't set Content-Type for multipart messages here!)
-     * @param bool  $overwrite    Overwrite the existing headers with new.
-     * @param bool  $skip_content Don't return content headers: Content-Type,
-     *                            Content-Disposition and Content-Transfer-Encoding
-     *
-     * @return string             Plain text headers
-     * @access public
-     */
-    function txtHeaders($xtra_headers = null, $overwrite = false, $skip_content = false)
-    {
-        $headers = $this->headers($xtra_headers, $overwrite, $skip_content);
-
-        // Place Received: headers at the beginning of the message
-        // Spam detectors often flag messages with it after the Subject: as spam
-        if (isset($headers['Received'])) {
-            $received = $headers['Received'];
-            unset($headers['Received']);
-            $headers = array('Received' => $received) + $headers;
-        }
-
-        $ret = '';
-        $eol = $this->_build_params['eol'];
-
-        foreach ($headers as $key => $val) {
-            if (is_array($val)) {
-                foreach ($val as $value) {
-                    $ret .= "$key: $value" . $eol;
-                }
-            } else {
-                $ret .= "$key: $val" . $eol;
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Sets message Content-Type header.
-     * Use it to build messages with various content-types e.g. miltipart/raport
-     * not supported by _contentHeaders() function.
-     *
-     * @param string $type   Type name
-     * @param array  $params Hash array of header parameters
-     *
-     * @return void
-     * @access public
-     * @since 1.7.0
-     */
-    function setContentType($type, $params = array())
-    {
-        $header = $type;
-
-        $eol = !empty($this->_build_params['eol'])
-            ? $this->_build_params['eol'] : "\r\n";
-
-        // add parameters
-        $token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
-            . '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
-        if (is_array($params)) {
-            foreach ($params as $name => $value) {
-                if ($name == 'boundary') {
-                    $this->_build_params['boundary'] = $value;
-                }
-                if (!preg_match($token_regexp, $value)) {
-                    $header .= ";$eol $name=$value";
-                } else {
-                    $value = addcslashes($value, '\\"');
-                    $header .= ";$eol $name=\"$value\"";
-                }
-            }
-        }
-
-        // add required boundary parameter if not defined
-        if (preg_match('/^multipart\//i', $type)) {
-            if (empty($this->_build_params['boundary'])) {
-                $this->_build_params['boundary'] = '=_' . md5(rand() . microtime());
-            }
-
-            $header .= ";$eol boundary=\"".$this->_build_params['boundary']."\"";
-        }
-
-        $this->_build_params['ctype'] = $header;
-    }
-
-    /**
-     * Sets the Subject header
-     *
-     * @param string $subject String to set the subject to.
-     *
-     * @return void
-     * @access public
-     */
-    function setSubject($subject)
-    {
-        $this->_headers['Subject'] = $subject;
-    }
-
-    /**
-     * Set an email to the From (the sender) header
-     *
-     * @param string $email The email address to use
-     *
-     * @return void
-     * @access public
-     */
-    function setFrom($email)
-    {
-        $this->_headers['From'] = $email;
-    }
-
-    /**
-     * Add an email to the To header
-     * (multiple calls to this method are allowed)
-     *
-     * @param string $email The email direction to add
-     *
-     * @return void
-     * @access public
-     */
-    function addTo($email)
-    {
-        if (isset($this->_headers['To'])) {
-            $this->_headers['To'] .= ", $email";
-        } else {
-            $this->_headers['To'] = $email;
-        }
-    }
-
-    /**
-     * Add an email to the Cc (carbon copy) header
-     * (multiple calls to this method are allowed)
-     *
-     * @param string $email The email direction to add
-     *
-     * @return void
-     * @access public
-     */
-    function addCc($email)
-    {
-        if (isset($this->_headers['Cc'])) {
-            $this->_headers['Cc'] .= ", $email";
-        } else {
-            $this->_headers['Cc'] = $email;
-        }
-    }
-
-    /**
-     * Add an email to the Bcc (blank carbon copy) header
-     * (multiple calls to this method are allowed)
-     *
-     * @param string $email The email direction to add
-     *
-     * @return void
-     * @access public
-     */
-    function addBcc($email)
-    {
-        if (isset($this->_headers['Bcc'])) {
-            $this->_headers['Bcc'] .= ", $email";
-        } else {
-            $this->_headers['Bcc'] = $email;
-        }
-    }
-
-    /**
-     * Since the PHP send function requires you to specify
-     * recipients (To: header) separately from the other
-     * headers, the To: header is not properly encoded.
-     * To fix this, you can use this public method to 
-     * encode your recipients before sending to the send
-     * function
-     *
-     * @param string $recipients A comma-delimited list of recipients
-     *
-     * @return string            Encoded data
-     * @access public
-     */
-    function encodeRecipients($recipients)
-    {
-        $input = array("To" => $recipients);
-        $retval = $this->_encodeHeaders($input);
-        return $retval["To"] ;
-    }
-
-    /**
-     * Encodes headers as per RFC2047
-     *
-     * @param array $input  The header data to encode
-     * @param array $params Extra build parameters
-     *
-     * @return array        Encoded data
-     * @access private
-     */
-    function _encodeHeaders($input, $params = array())
-    {
-        $build_params = $this->_build_params;
-        while (list($key, $value) = each($params)) {
-            $build_params[$key] = $value;
-        }
-
-        foreach ($input as $hdr_name => $hdr_value) {
-            if (is_array($hdr_value)) {
-                foreach ($hdr_value as $idx => $value) {
-                    $input[$hdr_name][$idx] = $this->encodeHeader(
-                        $hdr_name, $value,
-                        $build_params['head_charset'], $build_params['head_encoding']
-                    );
-                }
-            } else {
-                $input[$hdr_name] = $this->encodeHeader(
-                    $hdr_name, $hdr_value,
-                    $build_params['head_charset'], $build_params['head_encoding']
-                );
-            }
-        }
-
-        return $input;
-    }
-
-    /**
-     * Encodes a header as per RFC2047
-     *
-     * @param string $name     The header name
-     * @param string $value    The header data to encode
-     * @param string $charset  Character set name
-     * @param string $encoding Encoding name (base64 or quoted-printable)
-     *
-     * @return string          Encoded header data (without a name)
-     * @access public
-     * @since 1.5.3
-     */
-    function encodeHeader($name, $value, $charset, $encoding)
-    {
-        $mime_part = new Mail_mimePart;
-        return $mime_part->encodeHeader(
-            $name, $value, $charset, $encoding, $this->_build_params['eol']
-        );
-    }
-
-    /**
-     * Get file's basename (locale independent) 
-     *
-     * @param string $filename Filename
-     *
-     * @return string          Basename
-     * @access private
-     */
-    function _basename($filename)
-    {
-        // basename() is not unicode safe and locale dependent
-        if (stristr(PHP_OS, 'win') || stristr(PHP_OS, 'netware')) {
-            return preg_replace('/^.*[\\\\\\/]/', '', $filename);
-        } else {
-            return preg_replace('/^.*[\/]/', '', $filename);
-        }
-    }
-
-    /**
-     * Get Content-Type and Content-Transfer-Encoding headers of the message
-     *
-     * @return array Headers array
-     * @access private
-     */
-    function _contentHeaders()
-    {
-        $attachments = count($this->_parts)                 ? true : false;
-        $html_images = count($this->_html_images)           ? true : false;
-        $html        = strlen($this->_htmlbody)             ? true : false;
-        $text        = (!$html && strlen($this->_txtbody))  ? true : false;
-        $headers     = array();
-
-        // See get()
-        switch (true) {
-        case $text && !$attachments:
-            $headers['Content-Type'] = 'text/plain';
-            break;
-
-        case !$text && !$html && $attachments:
-        case $text && $attachments:
-        case $html && $attachments && !$html_images:
-        case $html && $attachments && $html_images:
-            $headers['Content-Type'] = 'multipart/mixed';
-            break;
-
-        case $html && !$attachments && !$html_images && isset($this->_txtbody):
-        case $html && !$attachments && $html_images && isset($this->_txtbody):
-            $headers['Content-Type'] = 'multipart/alternative';
-            break;
-
-        case $html && !$attachments && !$html_images && !isset($this->_txtbody):
-            $headers['Content-Type'] = 'text/html';
-            break;
-
-        case $html && !$attachments && $html_images && !isset($this->_txtbody):
-            $headers['Content-Type'] = 'multipart/related';
-            break;
-
-        default:
-            return $headers;
-        }
-
-        $this->_checkParams();
-
-        $eol = !empty($this->_build_params['eol'])
-            ? $this->_build_params['eol'] : "\r\n";
-
-        if ($headers['Content-Type'] == 'text/plain') {
-            // single-part message: add charset and encoding
-            $charset = 'charset=' . $this->_build_params['text_charset'];
-            // place charset parameter in the same line, if possible
-            // 26 = strlen("Content-Type: text/plain; ")
-            $headers['Content-Type']
-                .= (strlen($charset) + 26 <= 76) ? "; $charset" : ";$eol $charset";
-            $headers['Content-Transfer-Encoding']
-                = $this->_build_params['text_encoding'];
-        } else if ($headers['Content-Type'] == 'text/html') {
-            // single-part message: add charset and encoding
-            $charset = 'charset=' . $this->_build_params['html_charset'];
-            // place charset parameter in the same line, if possible
-            $headers['Content-Type']
-                .= (strlen($charset) + 25 <= 76) ? "; $charset" : ";$eol $charset";
-            $headers['Content-Transfer-Encoding']
-                = $this->_build_params['html_encoding'];
-        } else {
-            // multipart message: and boundary
-            if (!empty($this->_build_params['boundary'])) {
-                $boundary = $this->_build_params['boundary'];
-            } else if (!empty($this->_headers['Content-Type'])
-                && preg_match('/boundary="([^"]+)"/', $this->_headers['Content-Type'], $m)
-            ) {
-                $boundary = $m[1];
-            } else {
-                $boundary = '=_' . md5(rand() . microtime());
-            }
-
-            $this->_build_params['boundary'] = $boundary;
-            $headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Validate and set build parameters
-     *
-     * @return void
-     * @access private
-     */
-    function _checkParams()
-    {
-        $encodings = array('7bit', '8bit', 'base64', 'quoted-printable');
-
-        $this->_build_params['text_encoding']
-            = strtolower($this->_build_params['text_encoding']);
-        $this->_build_params['html_encoding']
-            = strtolower($this->_build_params['html_encoding']);
-
-        if (!in_array($this->_build_params['text_encoding'], $encodings)) {
-            $this->_build_params['text_encoding'] = '7bit';
-        }
-        if (!in_array($this->_build_params['html_encoding'], $encodings)) {
-            $this->_build_params['html_encoding'] = '7bit';
-        }
-
-        // text body
-        if ($this->_build_params['text_encoding'] == '7bit'
-            && !preg_match('/ascii/i', $this->_build_params['text_charset'])
-            && preg_match('/[^\x00-\x7F]/', $this->_txtbody)
-        ) {
-            $this->_build_params['text_encoding'] = 'quoted-printable';
-        }
-        // html body
-        if ($this->_build_params['html_encoding'] == '7bit'
-            && !preg_match('/ascii/i', $this->_build_params['html_charset'])
-            && preg_match('/[^\x00-\x7F]/', $this->_htmlbody)
-        ) {
-            $this->_build_params['html_encoding'] = 'quoted-printable';
-        }
-    }
-
-} // End of class
diff --git a/lib/ext/Mail/mimeDecode.php b/lib/ext/Mail/mimeDecode.php
deleted file mode 100644
index 677d245..0000000
--- a/lib/ext/Mail/mimeDecode.php
+++ /dev/null
@@ -1,1003 +0,0 @@
-<?php
-/**
- * The Mail_mimeDecode class is used to decode mail/mime messages
- *
- * This class will parse a raw mime email and return
- * the structure. Returned structure is similar to
- * that returned by imap_fetchstructure().
- *
- *  +----------------------------- IMPORTANT ------------------------------+
- *  | Usage of this class compared to native php extensions such as        |
- *  | mailparse or imap, is slow and may be feature deficient. If available|
- *  | you are STRONGLY recommended to use the php extensions.              |
- *  +----------------------------------------------------------------------+
- *
- * Compatible with PHP versions 4 and 5
- *
- * LICENSE: This LICENSE is in the BSD license style.
- * Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
- * Copyright (c) 2003-2006, PEAR <pear-group@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - Neither the name of the authors, nor the names of its contributors 
- *   may be used to endorse or promote products derived from this 
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Mail
- * @package    Mail_Mime
- * @author     Richard Heyes  <richard@phpguru.org>
- * @author     George Schlossnagle <george@omniti.com>
- * @author     Cipriano Groenendal <cipri@php.net>
- * @author     Sean Coates <sean@php.net>
- * @copyright  2003-2006 PEAR <pear-group@php.net>
- * @license    http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Mail_mime
- */
-
-
-/**
- * require PEAR
- *
- * This package depends on PEAR to raise errors.
- */
-require_once 'PEAR.php';
-
-
-/**
- * The Mail_mimeDecode class is used to decode mail/mime messages
- *
- * This class will parse a raw mime email and return the structure.
- * Returned structure is similar to that returned by imap_fetchstructure().
- *
- *  +----------------------------- IMPORTANT ------------------------------+
- *  | Usage of this class compared to native php extensions such as        |
- *  | mailparse or imap, is slow and may be feature deficient. If available|
- *  | you are STRONGLY recommended to use the php extensions.              |
- *  +----------------------------------------------------------------------+
- *
- * @category   Mail
- * @package    Mail_Mime
- * @author     Richard Heyes  <richard@phpguru.org>
- * @author     George Schlossnagle <george@omniti.com>
- * @author     Cipriano Groenendal <cipri@php.net>
- * @author     Sean Coates <sean@php.net>
- * @copyright  2003-2006 PEAR <pear-group@php.net>
- * @license    http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Mail_mime
- */
-class Mail_mimeDecode extends PEAR
-{
-    /**
-     * The raw email to decode
-     *
-     * @var    string
-     * @access private
-     */
-    var $_input;
-
-    /**
-     * The header part of the input
-     *
-     * @var    string
-     * @access private
-     */
-    var $_header;
-
-    /**
-     * The body part of the input
-     *
-     * @var    string
-     * @access private
-     */
-    var $_body;
-
-    /**
-     * If an error occurs, this is used to store the message
-     *
-     * @var    string
-     * @access private
-     */
-    var $_error;
-
-    /**
-     * Flag to determine whether to include bodies in the
-     * returned object.
-     *
-     * @var    boolean
-     * @access private
-     */
-    var $_include_bodies;
-
-    /**
-     * Flag to determine whether to decode bodies
-     *
-     * @var    boolean
-     * @access private
-     */
-    var $_decode_bodies;
-
-    /**
-     * Flag to determine whether to decode headers
-     *
-     * @var    boolean
-     * @access private
-     */
-    var $_decode_headers;
-
-    /**
-     * Flag to determine whether to include attached messages
-     * as body in the returned object. Depends on $_include_bodies
-     *
-     * @var    boolean
-     * @access private
-     */
-    var $_rfc822_bodies;
-
-    /**
-     * Constructor.
-     *
-     * Sets up the object, initialise the variables, and splits and
-     * stores the header and body of the input.
-     *
-     * @param string The input to decode
-     * @access public
-     */
-    function Mail_mimeDecode($input)
-    {
-        list($header, $body)   = $this->_splitBodyHeader($input);
-
-        $this->_input          = $input;
-        $this->_header         = $header;
-        $this->_body           = $body;
-        $this->_decode_bodies  = false;
-        $this->_include_bodies = true;
-        $this->_rfc822_bodies  = false;
-    }
-
-    /**
-     * Begins the decoding process. If called statically
-     * it will create an object and call the decode() method
-     * of it.
-     *
-     * @param array An array of various parameters that determine
-     *              various things:
-     *              include_bodies - Whether to include the body in the returned
-     *                               object.
-     *              decode_bodies  - Whether to decode the bodies
-     *                               of the parts. (Transfer encoding)
-     *              decode_headers - Whether to decode headers
-     *              input          - If called statically, this will be treated
-     *                               as the input
-     * @return object Decoded results
-     * @access public
-     */
-    function decode($params = null)
-    {
-        // determine if this method has been called statically
-        $isStatic = empty($this) || !is_a($this, __CLASS__);
-
-        // Have we been called statically?
-	// If so, create an object and pass details to that.
-        if ($isStatic AND isset($params['input'])) {
-
-            $obj = new Mail_mimeDecode($params['input']);
-            $structure = $obj->decode($params);
-
-        // Called statically but no input
-        } elseif ($isStatic) {
-            return PEAR::raiseError('Called statically and no input given');
-
-        // Called via an object
-        } else {
-            $this->_include_bodies = isset($params['include_bodies']) ?
-	                             $params['include_bodies'] : false;
-            $this->_decode_bodies  = isset($params['decode_bodies']) ?
-	                             $params['decode_bodies']  : false;
-            $this->_decode_headers = isset($params['decode_headers']) ?
-	                             $params['decode_headers'] : false;
-            $this->_rfc822_bodies  = isset($params['rfc_822bodies']) ?
-	                             $params['rfc_822bodies']  : false;
-
-            $structure = $this->_decode($this->_header, $this->_body);
-            if ($structure === false) {
-                $structure = $this->raiseError($this->_error);
-            }
-        }
-
-        return $structure;
-    }
-
-    /**
-     * Performs the decoding. Decodes the body string passed to it
-     * If it finds certain content-types it will call itself in a
-     * recursive fashion
-     *
-     * @param string Header section
-     * @param string Body section
-     * @return object Results of decoding process
-     * @access private
-     */
-    function _decode($headers, $body, $default_ctype = 'text/plain')
-    {
-        $return = new stdClass;
-        $return->headers = array();
-        $headers = $this->_parseHeaders($headers);
-
-        foreach ($headers as $value) {
-            $value['value'] = $this->_decode_headers ? $this->_decodeHeader($value['value']) : $value['value'];
-            if (isset($return->headers[strtolower($value['name'])]) AND !is_array($return->headers[strtolower($value['name'])])) {
-                $return->headers[strtolower($value['name'])]   = array($return->headers[strtolower($value['name'])]);
-                $return->headers[strtolower($value['name'])][] = $value['value'];
-
-            } elseif (isset($return->headers[strtolower($value['name'])])) {
-                $return->headers[strtolower($value['name'])][] = $value['value'];
-
-            } else {
-                $return->headers[strtolower($value['name'])] = $value['value'];
-            }
-        }
-
-
-        foreach ($headers as $key => $value) {
-            $headers[$key]['name'] = strtolower($headers[$key]['name']);
-            switch ($headers[$key]['name']) {
-
-                case 'content-type':
-                    $content_type = $this->_parseHeaderValue($headers[$key]['value']);
-
-                    if (preg_match('/([0-9a-z+.-]+)\/([0-9a-z+.-]+)/i', $content_type['value'], $regs)) {
-                        $return->ctype_primary   = $regs[1];
-                        $return->ctype_secondary = $regs[2];
-                    }
-
-                    if (isset($content_type['other'])) {
-                        foreach($content_type['other'] as $p_name => $p_value) {
-                            $return->ctype_parameters[$p_name] = $p_value;
-                        }
-                    }
-                    break;
-
-                case 'content-disposition':
-                    $content_disposition = $this->_parseHeaderValue($headers[$key]['value']);
-                    $return->disposition   = $content_disposition['value'];
-                    if (isset($content_disposition['other'])) {
-                        foreach($content_disposition['other'] as $p_name => $p_value) {
-                            $return->d_parameters[$p_name] = $p_value;
-                        }
-                    }
-                    break;
-
-                case 'content-transfer-encoding':
-                    $content_transfer_encoding = $this->_parseHeaderValue($headers[$key]['value']);
-                    break;
-            }
-        }
-
-        if (isset($content_type)) {
-            switch (strtolower($content_type['value'])) {
-                case 'text/plain':
-                    $encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
-                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body) : null;
-                    break;
-
-                case 'text/html':
-                    $encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
-                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body) : null;
-                    break;
-
-                case 'multipart/parallel':
-                case 'multipart/appledouble': // Appledouble mail
-                case 'multipart/report': // RFC1892
-                case 'multipart/signed': // PGP
-                case 'multipart/digest':
-                case 'multipart/alternative':
-                case 'multipart/related':
-                case 'multipart/mixed':
-                case 'application/vnd.wap.multipart.related':
-                    if(!isset($content_type['other']['boundary'])){
-                        $this->_error = 'No boundary found for ' . $content_type['value'] . ' part';
-                        return false;
-                    }
-
-                    $default_ctype = (strtolower($content_type['value']) === 'multipart/digest') ? 'message/rfc822' : 'text/plain';
-
-                    $parts = $this->_boundarySplit($body, $content_type['other']['boundary']);
-                    for ($i = 0; $i < count($parts); $i++) {
-                        list($part_header, $part_body) = $this->_splitBodyHeader($parts[$i]);
-                        $part = $this->_decode($part_header, $part_body, $default_ctype);
-                        if($part === false)
-                            $part = $this->raiseError($this->_error);
-                        $return->parts[] = $part;
-                    }
-                    break;
-
-                case 'message/rfc822':
-					if ($this->_rfc822_bodies) {
-						$encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
-						$return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body);
-					}
-                    $obj = new Mail_mimeDecode($body);
-                    $return->parts[] = $obj->decode(array('include_bodies' => $this->_include_bodies,
-					                                      'decode_bodies'  => $this->_decode_bodies,
-														  'decode_headers' => $this->_decode_headers));
-                    unset($obj);
-                    break;
-
-                default:
-                    if(!isset($content_transfer_encoding['value']))
-                        $content_transfer_encoding['value'] = '7bit';
-                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $content_transfer_encoding['value']) : $body) : null;
-                    break;
-            }
-
-        } else {
-            $ctype = explode('/', $default_ctype);
-            $return->ctype_primary   = $ctype[0];
-            $return->ctype_secondary = $ctype[1];
-            $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body) : $body) : null;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Given the output of the above function, this will return an
-     * array of references to the parts, indexed by mime number.
-     *
-     * @param  object $structure   The structure to go through
-     * @param  string $mime_number Internal use only.
-     * @return array               Mime numbers
-     */
-    function &getMimeNumbers(&$structure, $no_refs = false, $mime_number = '', $prepend = '')
-    {
-        $return = array();
-        if (!empty($structure->parts)) {
-            if ($mime_number != '') {
-                $structure->mime_id = $prepend . $mime_number;
-                $return[$prepend . $mime_number] = &$structure;
-            }
-            for ($i = 0; $i < count($structure->parts); $i++) {
-
-            
-                if (!empty($structure->headers['content-type']) AND substr(strtolower($structure->headers['content-type']), 0, 8) == 'message/') {
-                    $prepend      = $prepend . $mime_number . '.';
-                    $_mime_number = '';
-                } else {
-                    $_mime_number = ($mime_number == '' ? $i + 1 : sprintf('%s.%s', $mime_number, $i + 1));
-                }
-
-                $arr = &Mail_mimeDecode::getMimeNumbers($structure->parts[$i], $no_refs, $_mime_number, $prepend);
-                foreach ($arr as $key => $val) {
-                    $no_refs ? $return[$key] = '' : $return[$key] = &$arr[$key];
-                }
-            }
-        } else {
-            if ($mime_number == '') {
-                $mime_number = '1';
-            }
-            $structure->mime_id = $prepend . $mime_number;
-            $no_refs ? $return[$prepend . $mime_number] = '' : $return[$prepend . $mime_number] = &$structure;
-        }
-        
-        return $return;
-    }
-
-    /**
-     * Given a string containing a header and body
-     * section, this function will split them (at the first
-     * blank line) and return them.
-     *
-     * @param string Input to split apart
-     * @return array Contains header and body section
-     * @access private
-     */
-    function _splitBodyHeader($input)
-    {
-        if (preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $input, $match)) {
-            return array($match[1], $match[2]);
-        }
-        // bug #17325 - empty bodies are allowed. - we just check that at least one line 
-        // of headers exist..
-        if (count(explode("\n",$input))) {
-            return array($input, '');
-        }
-        $this->_error = 'Could not split header and body';
-        return false;
-    }
-
-    /**
-     * Parse headers given in $input and return
-     * as assoc array.
-     *
-     * @param string Headers to parse
-     * @return array Contains parsed headers
-     * @access private
-     */
-    function _parseHeaders($input)
-    {
-
-        if ($input !== '') {
-            // Unfold the input
-            $input   = preg_replace("/\r?\n/", "\r\n", $input);
-            //#7065 - wrapping.. with encoded stuff.. - probably not needed,
-            // wrapping space should only get removed if the trailing item on previous line is a 
-            // encoded character
-            $input   = preg_replace("/=\r\n(\t| )+/", '=', $input);
-            $input   = preg_replace("/\r\n(\t| )+/", ' ', $input);
-            
-            $headers = explode("\r\n", trim($input));
-
-            foreach ($headers as $value) {
-                $hdr_name = substr($value, 0, $pos = strpos($value, ':'));
-                $hdr_value = substr($value, $pos+1);
-                if($hdr_value[0] == ' ')
-                    $hdr_value = substr($hdr_value, 1);
-
-                $return[] = array(
-                                  'name'  => $hdr_name,
-                                  'value' =>  $hdr_value
-                                 );
-            }
-        } else {
-            $return = array();
-        }
-
-        return $return;
-    }
-
-    /**
-     * Function to parse a header value,
-     * extract first part, and any secondary
-     * parts (after ;) This function is not as
-     * robust as it could be. Eg. header comments
-     * in the wrong place will probably break it.
-     *
-     * @param string Header value to parse
-     * @return array Contains parsed result
-     * @access private
-     */
-    function _parseHeaderValue($input)
-    {
-
-        if (($pos = strpos($input, ';')) === false) {
-            $input = $this->_decode_headers ? $this->_decodeHeader($input) : $input;
-            $return['value'] = trim($input);
-            return $return;
-        }
-
-
-
-        $value = substr($input, 0, $pos);
-        $value = $this->_decode_headers ? $this->_decodeHeader($value) : $value;
-        $return['value'] = trim($value);
-        $input = trim(substr($input, $pos+1));
-
-        if (!strlen($input) > 0) {
-            return $return;
-        }
-        // at this point input contains xxxx=".....";zzzz="...."
-        // since we are dealing with quoted strings, we need to handle this properly..
-        $i = 0;
-        $l = strlen($input);
-        $key = '';
-        $val = false; // our string - including quotes..
-        $q = false; // in quote..
-        $lq = ''; // last quote..
-
-        while ($i < $l) {
-            
-            $c = $input[$i];
-            //var_dump(array('i'=>$i,'c'=>$c,'q'=>$q, 'lq'=>$lq, 'key'=>$key, 'val' =>$val));
-
-            $escaped = false;
-            if ($c == '\\') {
-                $i++;
-                if ($i == $l-1) { // end of string.
-                    break;
-                }
-                $escaped = true;
-                $c = $input[$i];
-            }            
-
-
-            // state - in key..
-            if ($val === false) {
-                if (!$escaped && $c == '=') {
-                    $val = '';
-                    $key = trim($key);
-                    $i++;
-                    continue;
-                }
-                if (!$escaped && $c == ';') {
-                    if ($key) { // a key without a value..
-                        $key= trim($key);
-                        $return['other'][$key] = '';
-                        $return['other'][strtolower($key)] = '';
-                    }
-                    $key = '';
-                }
-                $key .= $c;
-                $i++;
-                continue;
-            }
-                     
-            // state - in value.. (as $val is set..)
-
-            if ($q === false) {
-                // not in quote yet.
-                if ((!strlen($val) || $lq !== false) && $c == ' ' ||  $c == "\t") {
-                    $i++;
-                    continue; // skip leading spaces after '=' or after '"'
-                }
-                if (!$escaped && ($c == '"' || $c == "'")) {
-                    // start quoted area..
-                    $q = $c;
-                    // in theory should not happen raw text in value part..
-                    // but we will handle it as a merged part of the string..
-                    $val = !strlen(trim($val)) ? '' : trim($val);
-                    $i++;
-                    continue;
-                }
-                // got end....
-                if (!$escaped && $c == ';') {
-
-                    $val = trim($val);
-                    $added = false;
-                    if (preg_match('/\*[0-9]+$/', $key)) {
-                        // this is the extended aaa*0=...;aaa*1=.... code
-                        // it assumes the pieces arrive in order, and are valid...
-                        $key = preg_replace('/\*[0-9]+$/', '', $key);
-                        if (isset($return['other'][$key])) {
-                            $return['other'][$key] .= $val;
-                            if (strtolower($key) != $key) {
-                                $return['other'][strtolower($key)] .= $val;
-                            }
-                            $added = true;
-                        }
-                        // continue and use standard setters..
-                    }
-                    if (!$added) {
-                        $return['other'][$key] = $val;
-                        $return['other'][strtolower($key)] = $val;
-                    }
-                    $val = false;
-                    $key = '';
-                    $lq = false;
-                    $i++;
-                    continue;
-                }
-
-                $val .= $c;
-                $i++;
-                continue;
-            }
-            
-            // state - in quote..
-            if (!$escaped && $c == $q) {  // potential exit state..
-
-                // end of quoted string..
-                $lq = $q;
-                $q = false;
-                $i++;
-                continue;
-            }
-                
-            // normal char inside of quoted string..
-            $val.= $c;
-            $i++;
-        }
-        
-        // do we have anything left..
-        if (strlen(trim($key)) || $val !== false) {
-           
-            $val = trim($val);
-            $added = false;
-            if ($val !== false && preg_match('/\*[0-9]+$/', $key)) {
-                // no dupes due to our crazy regexp.
-                $key = preg_replace('/\*[0-9]+$/', '', $key);
-                if (isset($return['other'][$key])) {
-                    $return['other'][$key] .= $val;
-                    if (strtolower($key) != $key) {
-                        $return['other'][strtolower($key)] .= $val;
-                    }
-                    $added = true;
-                }
-                // continue and use standard setters..
-            }
-            if (!$added) {
-                $return['other'][$key] = $val;
-                $return['other'][strtolower($key)] = $val;
-            }
-        }
-        // decode values.
-        foreach($return['other'] as $key =>$val) {
-            $return['other'][$key] = $this->_decode_headers ? $this->_decodeHeader($val) : $val;
-        }
-       //print_r($return);
-        return $return;
-    }
-
-    /**
-     * This function splits the input based
-     * on the given boundary
-     *
-     * @param string Input to parse
-     * @return array Contains array of resulting mime parts
-     * @access private
-     */
-    function _boundarySplit($input, $boundary)
-    {
-        $parts = array();
-
-        $bs_possible = substr($boundary, 2, -2);
-        $bs_check = '\"' . $bs_possible . '\"';
-
-        if ($boundary == $bs_check) {
-            $boundary = $bs_possible;
-        }
-        $tmp = preg_split("/--".preg_quote($boundary, '/')."((?=\s)|--)/", $input);
-
-        $len = count($tmp) -1;
-        for ($i = 1; $i < $len; $i++) {
-            if (strlen(trim($tmp[$i]))) {
-                $parts[] = $tmp[$i];
-            }
-        }
-        
-        // add the last part on if it does not end with the 'closing indicator'
-        if (!empty($tmp[$len]) && strlen(trim($tmp[$len])) && $tmp[$len][0] != '-') {
-            $parts[] = $tmp[$len];
-        }
-        return $parts;
-    }
-
-    /**
-     * Given a header, this function will decode it
-     * according to RFC2047. Probably not *exactly*
-     * conformant, but it does pass all the given
-     * examples (in RFC2047).
-     *
-     * @param string Input header value to decode
-     * @return string Decoded header value
-     * @access private
-     */
-    function _decodeHeader($input)
-    {
-        // Remove white space between encoded-words
-        $input = preg_replace('/(=\?[^?]+\?(q|b)\?[^?]*\?=)(\s)+=\?/i', '\1=?', $input);
-
-        // For each encoded-word...
-        while (preg_match('/(=\?([^?]+)\?(q|b)\?([^?]*)\?=)/i', $input, $matches)) {
-
-            $encoded  = $matches[1];
-            $charset  = $matches[2];
-            $encoding = $matches[3];
-            $text     = $matches[4];
-
-            switch (strtolower($encoding)) {
-                case 'b':
-                    $text = base64_decode($text);
-                    break;
-
-                case 'q':
-                    $text = str_replace('_', ' ', $text);
-                    preg_match_all('/=([a-f0-9]{2})/i', $text, $matches);
-                    foreach($matches[1] as $value)
-                        $text = str_replace('='.$value, chr(hexdec($value)), $text);
-                    break;
-            }
-
-            $input = str_replace($encoded, $text, $input);
-        }
-
-        return $input;
-    }
-
-    /**
-     * Given a body string and an encoding type,
-     * this function will decode and return it.
-     *
-     * @param  string Input body to decode
-     * @param  string Encoding type to use.
-     * @return string Decoded body
-     * @access private
-     */
-    function _decodeBody($input, $encoding = '7bit')
-    {
-        switch (strtolower($encoding)) {
-            case '7bit':
-                return $input;
-                break;
-
-            case 'quoted-printable':
-                return $this->_quotedPrintableDecode($input);
-                break;
-
-            case 'base64':
-                return base64_decode($input);
-                break;
-
-            default:
-                return $input;
-        }
-    }
-
-    /**
-     * Given a quoted-printable string, this
-     * function will decode and return it.
-     *
-     * @param  string Input body to decode
-     * @return string Decoded body
-     * @access private
-     */
-    function _quotedPrintableDecode($input)
-    {
-        // Remove soft line breaks
-        $input = preg_replace("/=\r?\n/", '', $input);
-
-        // Replace encoded characters
-		$input = preg_replace('/=([a-f0-9]{2})/ie', "chr(hexdec('\\1'))", $input);
-
-        return $input;
-    }
-
-    /**
-     * Checks the input for uuencoded files and returns
-     * an array of them. Can be called statically, eg:
-     *
-     * $files =& Mail_mimeDecode::uudecode($some_text);
-     *
-     * It will check for the begin 666 ... end syntax
-     * however and won't just blindly decode whatever you
-     * pass it.
-     *
-     * @param  string Input body to look for attahcments in
-     * @return array  Decoded bodies, filenames and permissions
-     * @access public
-     * @author Unknown
-     */
-    function &uudecode($input)
-    {
-        // Find all uuencoded sections
-        preg_match_all("/begin ([0-7]{3}) (.+)\r?\n(.+)\r?\nend/Us", $input, $matches);
-
-        for ($j = 0; $j < count($matches[3]); $j++) {
-
-            $str      = $matches[3][$j];
-            $filename = $matches[2][$j];
-            $fileperm = $matches[1][$j];
-
-            $file = '';
-            $str = preg_split("/\r?\n/", trim($str));
-            $strlen = count($str);
-
-            for ($i = 0; $i < $strlen; $i++) {
-                $pos = 1;
-                $d = 0;
-                $len=(int)(((ord(substr($str[$i],0,1)) -32) - ' ') & 077);
-
-                while (($d + 3 <= $len) AND ($pos + 4 <= strlen($str[$i]))) {
-                    $c0 = (ord(substr($str[$i],$pos,1)) ^ 0x20);
-                    $c1 = (ord(substr($str[$i],$pos+1,1)) ^ 0x20);
-                    $c2 = (ord(substr($str[$i],$pos+2,1)) ^ 0x20);
-                    $c3 = (ord(substr($str[$i],$pos+3,1)) ^ 0x20);
-                    $file .= chr(((($c0 - ' ') & 077) << 2) | ((($c1 - ' ') & 077) >> 4));
-
-                    $file .= chr(((($c1 - ' ') & 077) << 4) | ((($c2 - ' ') & 077) >> 2));
-
-                    $file .= chr(((($c2 - ' ') & 077) << 6) |  (($c3 - ' ') & 077));
-
-                    $pos += 4;
-                    $d += 3;
-                }
-
-                if (($d + 2 <= $len) && ($pos + 3 <= strlen($str[$i]))) {
-                    $c0 = (ord(substr($str[$i],$pos,1)) ^ 0x20);
-                    $c1 = (ord(substr($str[$i],$pos+1,1)) ^ 0x20);
-                    $c2 = (ord(substr($str[$i],$pos+2,1)) ^ 0x20);
-                    $file .= chr(((($c0 - ' ') & 077) << 2) | ((($c1 - ' ') & 077) >> 4));
-
-                    $file .= chr(((($c1 - ' ') & 077) << 4) | ((($c2 - ' ') & 077) >> 2));
-
-                    $pos += 3;
-                    $d += 2;
-                }
-
-                if (($d + 1 <= $len) && ($pos + 2 <= strlen($str[$i]))) {
-                    $c0 = (ord(substr($str[$i],$pos,1)) ^ 0x20);
-                    $c1 = (ord(substr($str[$i],$pos+1,1)) ^ 0x20);
-                    $file .= chr(((($c0 - ' ') & 077) << 2) | ((($c1 - ' ') & 077) >> 4));
-
-                }
-            }
-            $files[] = array('filename' => $filename, 'fileperm' => $fileperm, 'filedata' => $file);
-        }
-
-        return $files;
-    }
-
-    /**
-     * getSendArray() returns the arguments required for Mail::send()
-     * used to build the arguments for a mail::send() call 
-     *
-     * Usage:
-     * $mailtext = Full email (for example generated by a template)
-     * $decoder = new Mail_mimeDecode($mailtext);
-     * $parts =  $decoder->getSendArray();
-     * if (!PEAR::isError($parts) {
-     *     list($recipents,$headers,$body) = $parts;
-     *     $mail = Mail::factory('smtp');
-     *     $mail->send($recipents,$headers,$body);
-     * } else {
-     *     echo $parts->message;
-     * }
-     * @return mixed   array of recipeint, headers,body or Pear_Error
-     * @access public
-     * @author Alan Knowles <alan@akbkhome.com>
-     */
-    function getSendArray()
-    {
-        // prevent warning if this is not set
-        $this->_decode_headers = FALSE;
-        $headerlist =$this->_parseHeaders($this->_header);
-        $to = "";
-        if (!$headerlist) {
-            return $this->raiseError("Message did not contain headers");
-        }
-        foreach($headerlist as $item) {
-            $header[$item['name']] = $item['value'];
-            switch (strtolower($item['name'])) {
-                case "to":
-                case "cc":
-                case "bcc":
-                    $to .= ",".$item['value'];
-                default:
-                   break;
-            }
-        }
-        if ($to == "") {
-            return $this->raiseError("Message did not contain any recipents");
-        }
-        $to = substr($to,1);
-        return array($to,$header,$this->_body);
-    } 
-
-    /**
-     * Returns a xml copy of the output of
-     * Mail_mimeDecode::decode. Pass the output in as the
-     * argument. This function can be called statically. Eg:
-     *
-     * $output = $obj->decode();
-     * $xml    = Mail_mimeDecode::getXML($output);
-     *
-     * The DTD used for this should have been in the package. Or
-     * alternatively you can get it from cvs, or here:
-     * http://www.phpguru.org/xmail/xmail.dtd.
-     *
-     * @param  object Input to convert to xml. This should be the
-     *                output of the Mail_mimeDecode::decode function
-     * @return string XML version of input
-     * @access public
-     */
-    function getXML($input)
-    {
-        $crlf    =  "\r\n";
-        $output  = '<?xml version=\'1.0\'?>' . $crlf .
-                   '<!DOCTYPE email SYSTEM "http://www.phpguru.org/xmail/xmail.dtd">' . $crlf .
-                   '<email>' . $crlf .
-                   Mail_mimeDecode::_getXML($input) .
-                   '</email>';
-
-        return $output;
-    }
-
-    /**
-     * Function that does the actual conversion to xml. Does a single
-     * mimepart at a time.
-     *
-     * @param  object  Input to convert to xml. This is a mimepart object.
-     *                 It may or may not contain subparts.
-     * @param  integer Number of tabs to indent
-     * @return string  XML version of input
-     * @access private
-     */
-    function _getXML($input, $indent = 1)
-    {
-        $htab    =  "\t";
-        $crlf    =  "\r\n";
-        $output  =  '';
-        $headers = @(array)$input->headers;
-
-        foreach ($headers as $hdr_name => $hdr_value) {
-
-            // Multiple headers with this name
-            if (is_array($headers[$hdr_name])) {
-                for ($i = 0; $i < count($hdr_value); $i++) {
-                    $output .= Mail_mimeDecode::_getXML_helper($hdr_name, $hdr_value[$i], $indent);
-                }
-
-            // Only one header of this sort
-            } else {
-                $output .= Mail_mimeDecode::_getXML_helper($hdr_name, $hdr_value, $indent);
-            }
-        }
-
-        if (!empty($input->parts)) {
-            for ($i = 0; $i < count($input->parts); $i++) {
-                $output .= $crlf . str_repeat($htab, $indent) . '<mimepart>' . $crlf .
-                           Mail_mimeDecode::_getXML($input->parts[$i], $indent+1) .
-                           str_repeat($htab, $indent) . '</mimepart>' . $crlf;
-            }
-        } elseif (isset($input->body)) {
-            $output .= $crlf . str_repeat($htab, $indent) . '<body><![CDATA[' .
-                       $input->body . ']]></body>' . $crlf;
-        }
-
-        return $output;
-    }
-
-    /**
-     * Helper function to _getXML(). Returns xml of a header.
-     *
-     * @param  string  Name of header
-     * @param  string  Value of header
-     * @param  integer Number of tabs to indent
-     * @return string  XML version of input
-     * @access private
-     */
-    function _getXML_helper($hdr_name, $hdr_value, $indent)
-    {
-        $htab   = "\t";
-        $crlf   = "\r\n";
-        $return = '';
-
-        $new_hdr_value = ($hdr_name != 'received') ? Mail_mimeDecode::_parseHeaderValue($hdr_value) : array('value' => $hdr_value);
-        $new_hdr_name  = str_replace(' ', '-', ucwords(str_replace('-', ' ', $hdr_name)));
-
-        // Sort out any parameters
-        if (!empty($new_hdr_value['other'])) {
-            foreach ($new_hdr_value['other'] as $paramname => $paramvalue) {
-                $params[] = str_repeat($htab, $indent) . $htab . '<parameter>' . $crlf .
-                            str_repeat($htab, $indent) . $htab . $htab . '<paramname>' . htmlspecialchars($paramname) . '</paramname>' . $crlf .
-                            str_repeat($htab, $indent) . $htab . $htab . '<paramvalue>' . htmlspecialchars($paramvalue) . '</paramvalue>' . $crlf .
-                            str_repeat($htab, $indent) . $htab . '</parameter>' . $crlf;
-            }
-
-            $params = implode('', $params);
-        } else {
-            $params = '';
-        }
-
-        $return = str_repeat($htab, $indent) . '<header>' . $crlf .
-                  str_repeat($htab, $indent) . $htab . '<headername>' . htmlspecialchars($new_hdr_name) . '</headername>' . $crlf .
-                  str_repeat($htab, $indent) . $htab . '<headervalue>' . htmlspecialchars($new_hdr_value['value']) . '</headervalue>' . $crlf .
-                  $params .
-                  str_repeat($htab, $indent) . '</header>' . $crlf;
-
-        return $return;
-    }
-
-} // End of class
diff --git a/lib/ext/Mail/mimePart.php b/lib/ext/Mail/mimePart.php
deleted file mode 100644
index 292227f..0000000
--- a/lib/ext/Mail/mimePart.php
+++ /dev/null
@@ -1,1228 +0,0 @@
-<?php
-/**
- * The Mail_mimePart class is used to create MIME E-mail messages
- *
- * This class enables you to manipulate and build a mime email
- * from the ground up. The Mail_Mime class is a userfriendly api
- * to this class for people who aren't interested in the internals
- * of mime mail.
- * This class however allows full control over the email.
- *
- * Compatible with PHP versions 4 and 5
- *
- * LICENSE: This LICENSE is in the BSD license style.
- * Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
- * Copyright (c) 2003-2006, PEAR <pear-group@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - Neither the name of the authors, nor the names of its contributors 
- *   may be used to endorse or promote products derived from this 
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Mail
- * @package   Mail_Mime
- * @author    Richard Heyes  <richard@phpguru.org>
- * @author    Cipriano Groenendal <cipri@php.net>
- * @author    Sean Coates <sean@php.net>
- * @author    Aleksander Machniak <alec@php.net>
- * @copyright 2003-2006 PEAR <pear-group@php.net>
- * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   1.8.5
- * @link      http://pear.php.net/package/Mail_mime
- */
-
-
-/**
- * The Mail_mimePart class is used to create MIME E-mail messages
- *
- * This class enables you to manipulate and build a mime email
- * from the ground up. The Mail_Mime class is a userfriendly api
- * to this class for people who aren't interested in the internals
- * of mime mail.
- * This class however allows full control over the email.
- *
- * @category  Mail
- * @package   Mail_Mime
- * @author    Richard Heyes  <richard@phpguru.org>
- * @author    Cipriano Groenendal <cipri@php.net>
- * @author    Sean Coates <sean@php.net>
- * @author    Aleksander Machniak <alec@php.net>
- * @copyright 2003-2006 PEAR <pear-group@php.net>
- * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   Release: 1.8.5
- * @link      http://pear.php.net/package/Mail_mime
- */
-class Mail_mimePart
-{
-    /**
-    * The encoding type of this part
-    *
-    * @var string
-    * @access private
-    */
-    var $_encoding;
-
-    /**
-    * An array of subparts
-    *
-    * @var array
-    * @access private
-    */
-    var $_subparts;
-
-    /**
-    * The output of this part after being built
-    *
-    * @var string
-    * @access private
-    */
-    var $_encoded;
-
-    /**
-    * Headers for this part
-    *
-    * @var array
-    * @access private
-    */
-    var $_headers;
-
-    /**
-    * The body of this part (not encoded)
-    *
-    * @var string
-    * @access private
-    */
-    var $_body;
-
-    /**
-    * The location of file with body of this part (not encoded)
-    *
-    * @var string
-    * @access private
-    */
-    var $_body_file;
-
-    /**
-    * The end-of-line sequence
-    *
-    * @var string
-    * @access private
-    */
-    var $_eol = "\r\n";
-
-
-    /**
-    * Constructor.
-    *
-    * Sets up the object.
-    *
-    * @param string $body   The body of the mime part if any.
-    * @param array  $params An associative array of optional parameters:
-    *     content_type      - The content type for this part eg multipart/mixed
-    *     encoding          - The encoding to use, 7bit, 8bit,
-    *                         base64, or quoted-printable
-    *     charset           - Content character set
-    *     cid               - Content ID to apply
-    *     disposition       - Content disposition, inline or attachment
-    *     filename          - Filename parameter for content disposition
-    *     description       - Content description
-    *     name_encoding     - Encoding of the attachment name (Content-Type)
-    *                         By default filenames are encoded using RFC2231
-    *                         Here you can set RFC2047 encoding (quoted-printable
-    *                         or base64) instead
-    *     filename_encoding - Encoding of the attachment filename (Content-Disposition)
-    *                         See 'name_encoding'
-    *     headers_charset   - Charset of the headers e.g. filename, description.
-    *                         If not set, 'charset' will be used
-    *     eol               - End of line sequence. Default: "\r\n"
-    *     headers           - Hash array with additional part headers. Array keys can be
-    *                         in form of <header_name>:<parameter_name>
-    *     body_file         - Location of file with part's body (instead of $body)
-    *
-    * @access public
-    */
-    function Mail_mimePart($body = '', $params = array())
-    {
-        if (!empty($params['eol'])) {
-            $this->_eol = $params['eol'];
-        } else if (defined('MAIL_MIMEPART_CRLF')) { // backward-copat.
-            $this->_eol = MAIL_MIMEPART_CRLF;
-        }
-
-        // Additional part headers
-        if (!empty($params['headers']) && is_array($params['headers'])) {
-            $headers = $params['headers'];
-        }
-
-        foreach ($params as $key => $value) {
-            switch ($key) {
-            case 'encoding':
-                $this->_encoding = $value;
-                $headers['Content-Transfer-Encoding'] = $value;
-                break;
-
-            case 'cid':
-                $headers['Content-ID'] = '<' . $value . '>';
-                break;
-
-            case 'location':
-                $headers['Content-Location'] = $value;
-                break;
-
-            case 'body_file':
-                $this->_body_file = $value;
-                break;
-
-            // for backward compatibility
-            case 'dfilename':
-                $params['filename'] = $value;
-                break;
-            }
-        }
-
-        // Default content-type
-        if (empty($params['content_type'])) {
-            $params['content_type'] = 'text/plain';
-        }
-
-        // Content-Type
-        $headers['Content-Type'] = $params['content_type'];
-        if (!empty($params['charset'])) {
-            $charset = "charset={$params['charset']}";
-            // place charset parameter in the same line, if possible
-            if ((strlen($headers['Content-Type']) + strlen($charset) + 16) <= 76) {
-                $headers['Content-Type'] .= '; ';
-            } else {
-                $headers['Content-Type'] .= ';' . $this->_eol . ' ';
-            }
-            $headers['Content-Type'] .= $charset;
-
-            // Default headers charset
-            if (!isset($params['headers_charset'])) {
-                $params['headers_charset'] = $params['charset'];
-            }
-        }
-
-        // header values encoding parameters
-        $h_charset  = !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII';
-        $h_language = !empty($params['language']) ? $params['language'] : null;
-        $h_encoding = !empty($params['name_encoding']) ? $params['name_encoding'] : null;
-
-
-        if (!empty($params['filename'])) {
-            $headers['Content-Type'] .= ';' . $this->_eol;
-            $headers['Content-Type'] .= $this->_buildHeaderParam(
-                'name', $params['filename'], $h_charset, $h_language, $h_encoding
-            );
-        }
-
-        // Content-Disposition
-        if (!empty($params['disposition'])) {
-            $headers['Content-Disposition'] = $params['disposition'];
-            if (!empty($params['filename'])) {
-                $headers['Content-Disposition'] .= ';' . $this->_eol;
-                $headers['Content-Disposition'] .= $this->_buildHeaderParam(
-                    'filename', $params['filename'], $h_charset, $h_language,
-                    !empty($params['filename_encoding']) ? $params['filename_encoding'] : null
-                );
-            }
-
-            // add attachment size
-            $size = $this->_body_file ? filesize($this->_body_file) : strlen($body);
-            if ($size) {
-                $headers['Content-Disposition'] .= ';' . $this->_eol . ' size=' . $size;
-            }
-        }
-
-        if (!empty($params['description'])) {
-            $headers['Content-Description'] = $this->encodeHeader(
-                'Content-Description', $params['description'], $h_charset, $h_encoding,
-                $this->_eol
-            );
-        }
-
-        // Search and add existing headers' parameters
-        foreach ($headers as $key => $value) {
-            $items = explode(':', $key);
-            if (count($items) == 2) {
-                $header = $items[0];
-                $param  = $items[1];
-                if (isset($headers[$header])) {
-                    $headers[$header] .= ';' . $this->_eol;
-                }
-                $headers[$header] .= $this->_buildHeaderParam(
-                    $param, $value, $h_charset, $h_language, $h_encoding
-                );
-                unset($headers[$key]);
-            }
-        }
-
-        // Default encoding
-        if (!isset($this->_encoding)) {
-            $this->_encoding = '7bit';
-        }
-
-        // Assign stuff to member variables
-        $this->_encoded  = array();
-        $this->_headers  = $headers;
-        $this->_body     = $body;
-    }
-
-    /**
-     * Encodes and returns the email. Also stores
-     * it in the encoded member variable
-     *
-     * @param string $boundary Pre-defined boundary string
-     *
-     * @return An associative array containing two elements,
-     *         body and headers. The headers element is itself
-     *         an indexed array. On error returns PEAR error object.
-     * @access public
-     */
-    function encode($boundary=null)
-    {
-        $encoded =& $this->_encoded;
-
-        if (count($this->_subparts)) {
-            $boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
-            $eol = $this->_eol;
-
-            $this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
-
-            $encoded['body'] = ''; 
-
-            for ($i = 0; $i < count($this->_subparts); $i++) {
-                $encoded['body'] .= '--' . $boundary . $eol;
-                $tmp = $this->_subparts[$i]->encode();
-                if (PEAR::isError($tmp)) {
-                    return $tmp;
-                }
-                foreach ($tmp['headers'] as $key => $value) {
-                    $encoded['body'] .= $key . ': ' . $value . $eol;
-                }
-                $encoded['body'] .= $eol . $tmp['body'] . $eol;
-            }
-
-            $encoded['body'] .= '--' . $boundary . '--' . $eol;
-
-        } else if ($this->_body) {
-            $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding);
-        } else if ($this->_body_file) {
-            // Temporarily reset magic_quotes_runtime for file reads and writes
-            if ($magic_quote_setting = get_magic_quotes_runtime()) {
-                @ini_set('magic_quotes_runtime', 0);
-            }
-            $body = $this->_getEncodedDataFromFile($this->_body_file, $this->_encoding);
-            if ($magic_quote_setting) {
-                @ini_set('magic_quotes_runtime', $magic_quote_setting);
-            }
-
-            if (PEAR::isError($body)) {
-                return $body;
-            }
-            $encoded['body'] = $body;
-        } else {
-            $encoded['body'] = '';
-        }
-
-        // Add headers to $encoded
-        $encoded['headers'] =& $this->_headers;
-
-        return $encoded;
-    }
-
-    /**
-     * Encodes and saves the email into file. File must exist.
-     * Data will be appended to the file.
-     *
-     * @param string  $filename  Output file location
-     * @param string  $boundary  Pre-defined boundary string
-     * @param boolean $skip_head True if you don't want to save headers
-     *
-     * @return array An associative array containing message headers
-     *               or PEAR error object
-     * @access public
-     * @since 1.6.0
-     */
-    function encodeToFile($filename, $boundary=null, $skip_head=false)
-    {
-        if (file_exists($filename) && !is_writable($filename)) {
-            $err = PEAR::raiseError('File is not writeable: ' . $filename);
-            return $err;
-        }
-
-        if (!($fh = fopen($filename, 'ab'))) {
-            $err = PEAR::raiseError('Unable to open file: ' . $filename);
-            return $err;
-        }
-
-        // Temporarily reset magic_quotes_runtime for file reads and writes
-        if ($magic_quote_setting = get_magic_quotes_runtime()) {
-            @ini_set('magic_quotes_runtime', 0);
-        }
-
-        $res = $this->_encodePartToFile($fh, $boundary, $skip_head);
-
-        fclose($fh);
-
-        if ($magic_quote_setting) {
-            @ini_set('magic_quotes_runtime', $magic_quote_setting);
-        }
-
-        return PEAR::isError($res) ? $res : $this->_headers;
-    }
-
-    /**
-     * Encodes given email part into file
-     *
-     * @param string  $fh        Output file handle
-     * @param string  $boundary  Pre-defined boundary string
-     * @param boolean $skip_head True if you don't want to save headers
-     *
-     * @return array True on sucess or PEAR error object
-     * @access private
-     */
-    function _encodePartToFile($fh, $boundary=null, $skip_head=false)
-    {
-        $eol = $this->_eol;
-
-        if (count($this->_subparts)) {
-            $boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
-            $this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
-        }
-
-        if (!$skip_head) {
-            foreach ($this->_headers as $key => $value) {
-                fwrite($fh, $key . ': ' . $value . $eol);
-            }
-            $f_eol = $eol;
-        } else {
-            $f_eol = '';
-        }
-
-        if (count($this->_subparts)) {
-            for ($i = 0; $i < count($this->_subparts); $i++) {
-                fwrite($fh, $f_eol . '--' . $boundary . $eol);
-                $res = $this->_subparts[$i]->_encodePartToFile($fh);
-                if (PEAR::isError($res)) {
-                    return $res;
-                }
-                $f_eol = $eol;
-            }
-
-            fwrite($fh, $eol . '--' . $boundary . '--' . $eol);
-
-        } else if ($this->_body) {
-            fwrite($fh, $f_eol . $this->_getEncodedData($this->_body, $this->_encoding));
-        } else if ($this->_body_file) {
-            fwrite($fh, $f_eol);
-            $res = $this->_getEncodedDataFromFile(
-                $this->_body_file, $this->_encoding, $fh
-            );
-            if (PEAR::isError($res)) {
-                return $res;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Adds a subpart to current mime part and returns
-     * a reference to it
-     *
-     * @param string $body   The body of the subpart, if any.
-     * @param array  $params The parameters for the subpart, same
-     *                       as the $params argument for constructor.
-     *
-     * @return Mail_mimePart A reference to the part you just added. It is
-     *                       crucial if using multipart/* in your subparts that
-     *                       you use =& in your script when calling this function,
-     *                       otherwise you will not be able to add further subparts.
-     * @access public
-     */
-    function &addSubpart($body, $params)
-    {
-        $this->_subparts[] = new Mail_mimePart($body, $params);
-        return $this->_subparts[count($this->_subparts) - 1];
-    }
-
-    /**
-     * Returns encoded data based upon encoding passed to it
-     *
-     * @param string $data     The data to encode.
-     * @param string $encoding The encoding type to use, 7bit, base64,
-     *                         or quoted-printable.
-     *
-     * @return string
-     * @access private
-     */
-    function _getEncodedData($data, $encoding)
-    {
-        switch ($encoding) {
-        case 'quoted-printable':
-            return $this->_quotedPrintableEncode($data);
-            break;
-
-        case 'base64':
-            return rtrim(chunk_split(base64_encode($data), 76, $this->_eol));
-            break;
-
-        case '8bit':
-        case '7bit':
-        default:
-            return $data;
-        }
-    }
-
-    /**
-     * Returns encoded data based upon encoding passed to it
-     *
-     * @param string   $filename Data file location
-     * @param string   $encoding The encoding type to use, 7bit, base64,
-     *                           or quoted-printable.
-     * @param resource $fh       Output file handle. If set, data will be
-     *                           stored into it instead of returning it
-     *
-     * @return string Encoded data or PEAR error object
-     * @access private
-     */
-    function _getEncodedDataFromFile($filename, $encoding, $fh=null)
-    {
-        if (!is_readable($filename)) {
-            $err = PEAR::raiseError('Unable to read file: ' . $filename);
-            return $err;
-        }
-
-        if (!($fd = fopen($filename, 'rb'))) {
-            $err = PEAR::raiseError('Could not open file: ' . $filename);
-            return $err;
-        }
-
-        $data = '';
-
-        switch ($encoding) {
-        case 'quoted-printable':
-            while (!feof($fd)) {
-                $buffer = $this->_quotedPrintableEncode(fgets($fd));
-                if ($fh) {
-                    fwrite($fh, $buffer);
-                } else {
-                    $data .= $buffer;
-                }
-            }
-            break;
-
-        case 'base64':
-            while (!feof($fd)) {
-                // Should read in a multiple of 57 bytes so that
-                // the output is 76 bytes per line. Don't use big chunks
-                // because base64 encoding is memory expensive
-                $buffer = fread($fd, 57 * 9198); // ca. 0.5 MB
-                $buffer = base64_encode($buffer);
-                $buffer = chunk_split($buffer, 76, $this->_eol);
-                if (feof($fd)) {
-                    $buffer = rtrim($buffer);
-                }
-
-                if ($fh) {
-                    fwrite($fh, $buffer);
-                } else {
-                    $data .= $buffer;
-                }
-            }
-            break;
-
-        case '8bit':
-        case '7bit':
-        default:
-            while (!feof($fd)) {
-                $buffer = fread($fd, 1048576); // 1 MB
-                if ($fh) {
-                    fwrite($fh, $buffer);
-                } else {
-                    $data .= $buffer;
-                }
-            }
-        }
-
-        fclose($fd);
-
-        if (!$fh) {
-            return $data;
-        }
-    }
-
-    /**
-     * Encodes data to quoted-printable standard.
-     *
-     * @param string $input    The data to encode
-     * @param int    $line_max Optional max line length. Should
-     *                         not be more than 76 chars
-     *
-     * @return string Encoded data
-     *
-     * @access private
-     */
-    function _quotedPrintableEncode($input , $line_max = 76)
-    {
-        $eol = $this->_eol;
-        /*
-        // imap_8bit() is extremely fast, but doesn't handle properly some characters
-        if (function_exists('imap_8bit') && $line_max == 76) {
-            $input = preg_replace('/\r?\n/', "\r\n", $input);
-            $input = imap_8bit($input);
-            if ($eol != "\r\n") {
-                $input = str_replace("\r\n", $eol, $input);
-            }
-            return $input;
-        }
-        */
-        $lines  = preg_split("/\r?\n/", $input);
-        $escape = '=';
-        $output = '';
-
-        while (list($idx, $line) = each($lines)) {
-            $newline = '';
-            $i = 0;
-
-            while (isset($line[$i])) {
-                $char = $line[$i];
-                $dec  = ord($char);
-                $i++;
-
-                if (($dec == 32) && (!isset($line[$i]))) {
-                    // convert space at eol only
-                    $char = '=20';
-                } elseif ($dec == 9 && isset($line[$i])) {
-                    ; // Do nothing if a TAB is not on eol
-                } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) {
-                    $char = $escape . sprintf('%02X', $dec);
-                } elseif (($dec == 46) && (($newline == '')
-                    || ((strlen($newline) + strlen("=2E")) >= $line_max))
-                ) {
-                    // Bug #9722: convert full-stop at bol,
-                    // some Windows servers need this, won't break anything (cipri)
-                    // Bug #11731: full-stop at bol also needs to be encoded
-                    // if this line would push us over the line_max limit.
-                    $char = '=2E';
-                }
-
-                // Note, when changing this line, also change the ($dec == 46)
-                // check line, as it mimics this line due to Bug #11731
-                // EOL is not counted
-                if ((strlen($newline) + strlen($char)) >= $line_max) {
-                    // soft line break; " =\r\n" is okay
-                    $output  .= $newline . $escape . $eol;
-                    $newline  = '';
-                }
-                $newline .= $char;
-            } // end of for
-            $output .= $newline . $eol;
-            unset($lines[$idx]);
-        }
-        // Don't want last crlf
-        $output = substr($output, 0, -1 * strlen($eol));
-        return $output;
-    }
-
-    /**
-     * Encodes the parameter of a header.
-     *
-     * @param string $name      The name of the header-parameter
-     * @param string $value     The value of the paramter
-     * @param string $charset   The characterset of $value
-     * @param string $language  The language used in $value
-     * @param string $encoding  Parameter encoding. If not set, parameter value
-     *                          is encoded according to RFC2231
-     * @param int    $maxLength The maximum length of a line. Defauls to 75
-     *
-     * @return string
-     *
-     * @access private
-     */
-    function _buildHeaderParam($name, $value, $charset=null, $language=null,
-        $encoding=null, $maxLength=75
-    ) {
-        // RFC 2045:
-        // value needs encoding if contains non-ASCII chars or is longer than 78 chars
-        if (!preg_match('#[^\x20-\x7E]#', $value)) {
-            $token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
-                . '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
-            if (!preg_match($token_regexp, $value)) {
-                // token
-                if (strlen($name) + strlen($value) + 3 <= $maxLength) {
-                    return " {$name}={$value}";
-                }
-            } else {
-                // quoted-string
-                $quoted = addcslashes($value, '\\"');
-                if (strlen($name) + strlen($quoted) + 5 <= $maxLength) {
-                    return " {$name}=\"{$quoted}\"";
-                }
-            }
-        }
-
-        // RFC2047: use quoted-printable/base64 encoding
-        if ($encoding == 'quoted-printable' || $encoding == 'base64') {
-            return $this->_buildRFC2047Param($name, $value, $charset, $encoding);
-        }
-
-        // RFC2231:
-        $encValue = preg_replace_callback(
-            '/([^\x21\x23\x24\x26\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E])/',
-            array($this, '_encodeReplaceCallback'), $value
-        );
-        $value = "$charset'$language'$encValue";
-
-        $header = " {$name}*={$value}";
-        if (strlen($header) <= $maxLength) {
-            return $header;
-        }
-
-        $preLength = strlen(" {$name}*0*=");
-        $maxLength = max(16, $maxLength - $preLength - 3);
-        $maxLengthReg = "|(.{0,$maxLength}[^\%][^\%])|";
-
-        $headers = array();
-        $headCount = 0;
-        while ($value) {
-            $matches = array();
-            $found = preg_match($maxLengthReg, $value, $matches);
-            if ($found) {
-                $headers[] = " {$name}*{$headCount}*={$matches[0]}";
-                $value = substr($value, strlen($matches[0]));
-            } else {
-                $headers[] = " {$name}*{$headCount}*={$value}";
-                $value = '';
-            }
-            $headCount++;
-        }
-
-        $headers = implode(';' . $this->_eol, $headers);
-        return $headers;
-    }
-
-    /**
-     * Encodes header parameter as per RFC2047 if needed
-     *
-     * @param string $name      The parameter name
-     * @param string $value     The parameter value
-     * @param string $charset   The parameter charset
-     * @param string $encoding  Encoding type (quoted-printable or base64)
-     * @param int    $maxLength Encoded parameter max length. Default: 76
-     *
-     * @return string Parameter line
-     * @access private
-     */
-    function _buildRFC2047Param($name, $value, $charset,
-        $encoding='quoted-printable', $maxLength=76
-    ) {
-        // WARNING: RFC 2047 says: "An 'encoded-word' MUST NOT be used in
-        // parameter of a MIME Content-Type or Content-Disposition field",
-        // but... it's supported by many clients/servers
-        $quoted = '';
-
-        if ($encoding == 'base64') {
-            $value = base64_encode($value);
-            $prefix = '=?' . $charset . '?B?';
-            $suffix = '?=';
-
-            // 2 x SPACE, 2 x '"', '=', ';'
-            $add_len = strlen($prefix . $suffix) + strlen($name) + 6;
-            $len = $add_len + strlen($value);
-
-            while ($len > $maxLength) { 
-                // We can cut base64-encoded string every 4 characters
-                $real_len = floor(($maxLength - $add_len) / 4) * 4;
-                $_quote = substr($value, 0, $real_len);
-                $value = substr($value, $real_len);
-
-                $quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
-                $add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
-                $len = strlen($value) + $add_len;
-            }
-            $quoted .= $prefix . $value . $suffix;
-
-        } else {
-            // quoted-printable
-            $value = $this->encodeQP($value);
-            $prefix = '=?' . $charset . '?Q?';
-            $suffix = '?=';
-
-            // 2 x SPACE, 2 x '"', '=', ';'
-            $add_len = strlen($prefix . $suffix) + strlen($name) + 6;
-            $len = $add_len + strlen($value);
-
-            while ($len > $maxLength) {
-                $length = $maxLength - $add_len;
-                // don't break any encoded letters
-                if (preg_match("/^(.{0,$length}[^\=][^\=])/", $value, $matches)) {
-                    $_quote = $matches[1];
-                }
-
-                $quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
-                $value = substr($value, strlen($_quote));
-                $add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
-                $len = strlen($value) + $add_len;
-            }
-
-            $quoted .= $prefix . $value . $suffix;
-        }
-
-        return " {$name}=\"{$quoted}\"";
-    }
-
-    /**
-     * Encodes a header as per RFC2047
-     *
-     * @param string $name     The header name
-     * @param string $value    The header data to encode
-     * @param string $charset  Character set name
-     * @param string $encoding Encoding name (base64 or quoted-printable)
-     * @param string $eol      End-of-line sequence. Default: "\r\n"
-     *
-     * @return string          Encoded header data (without a name)
-     * @access public
-     * @since 1.6.1
-     */
-    function encodeHeader($name, $value, $charset='ISO-8859-1',
-        $encoding='quoted-printable', $eol="\r\n"
-    ) {
-        // Structured headers
-        $comma_headers = array(
-            'from', 'to', 'cc', 'bcc', 'sender', 'reply-to',
-            'resent-from', 'resent-to', 'resent-cc', 'resent-bcc',
-            'resent-sender', 'resent-reply-to',
-            'return-receipt-to', 'disposition-notification-to',
-        );
-        $other_headers = array(
-            'references', 'in-reply-to', 'message-id', 'resent-message-id',
-        );
-
-        $name = strtolower($name);
-
-        if (in_array($name, $comma_headers)) {
-            $separator = ',';
-        } else if (in_array($name, $other_headers)) {
-            $separator = ' ';
-        }
-
-        if (!$charset) {
-            $charset = 'ISO-8859-1';
-        }
-
-        // Structured header (make sure addr-spec inside is not encoded)
-        if (!empty($separator)) {
-            // Simple e-mail address regexp
-            $email_regexp = '([^\s<]+|("[^\r\n"]+"))@\S+';
-
-            $parts = Mail_mimePart::_explodeQuotedString($separator, $value);
-            $value = '';
-
-            foreach ($parts as $part) {
-                $part = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $part);
-                $part = trim($part);
-
-                if (!$part) {
-                    continue;
-                }
-                if ($value) {
-                    $value .= $separator==',' ? $separator.' ' : ' ';
-                } else {
-                    $value = $name . ': ';
-                }
-
-                // let's find phrase (name) and/or addr-spec
-                if (preg_match('/^<' . $email_regexp . '>$/', $part)) {
-                    $value .= $part;
-                } else if (preg_match('/^' . $email_regexp . '$/', $part)) {
-                    // address without brackets and without name
-                    $value .= $part;
-                } else if (preg_match('/<*' . $email_regexp . '>*$/', $part, $matches)) {
-                    // address with name (handle name)
-                    $address = $matches[0];
-                    $word = str_replace($address, '', $part);
-                    $word = trim($word);
-                    // check if phrase requires quoting
-                    if ($word) {
-                        // non-ASCII: require encoding
-                        if (preg_match('#([\x80-\xFF]){1}#', $word)) {
-                            if ($word[0] == '"' && $word[strlen($word)-1] == '"') {
-                                // de-quote quoted-string, encoding changes
-                                // string to atom
-                                $search = array("\\\"", "\\\\");
-                                $replace = array("\"", "\\");
-                                $word = str_replace($search, $replace, $word);
-                                $word = substr($word, 1, -1);
-                            }
-                            // find length of last line
-                            if (($pos = strrpos($value, $eol)) !== false) {
-                                $last_len = strlen($value) - $pos;
-                            } else {
-                                $last_len = strlen($value);
-                            }
-                            $word = Mail_mimePart::encodeHeaderValue(
-                                $word, $charset, $encoding, $last_len, $eol
-                            );
-                        } else if (($word[0] != '"' || $word[strlen($word)-1] != '"')
-                            && preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $word)
-                        ) {
-                            // ASCII: quote string if needed
-                            $word = '"'.addcslashes($word, '\\"').'"';
-                        }
-                    }
-                    $value .= $word.' '.$address;
-                } else {
-                    // addr-spec not found, don't encode (?)
-                    $value .= $part;
-                }
-
-                // RFC2822 recommends 78 characters limit, use 76 from RFC2047
-                $value = wordwrap($value, 76, $eol . ' ');
-            }
-
-            // remove header name prefix (there could be EOL too)
-            $value = preg_replace(
-                '/^'.$name.':('.preg_quote($eol, '/').')* /', '', $value
-            );
-
-        } else {
-            // Unstructured header
-            // non-ASCII: require encoding
-            if (preg_match('#([\x80-\xFF]){1}#', $value)) {
-                if ($value[0] == '"' && $value[strlen($value)-1] == '"') {
-                    // de-quote quoted-string, encoding changes
-                    // string to atom
-                    $search = array("\\\"", "\\\\");
-                    $replace = array("\"", "\\");
-                    $value = str_replace($search, $replace, $value);
-                    $value = substr($value, 1, -1);
-                }
-                $value = Mail_mimePart::encodeHeaderValue(
-                    $value, $charset, $encoding, strlen($name) + 2, $eol
-                );
-            } else if (strlen($name.': '.$value) > 78) {
-                // ASCII: check if header line isn't too long and use folding
-                $value = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $value);
-                $tmp = wordwrap($name.': '.$value, 78, $eol . ' ');
-                $value = preg_replace('/^'.$name.':\s*/', '', $tmp);
-                // hard limit 998 (RFC2822)
-                $value = wordwrap($value, 998, $eol . ' ', true);
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Explode quoted string
-     *
-     * @param string $delimiter Delimiter expression string for preg_match()
-     * @param string $string    Input string
-     *
-     * @return array            String tokens array
-     * @access private
-     */
-    function _explodeQuotedString($delimiter, $string)
-    {
-        $result = array();
-        $strlen = strlen($string);
-
-        for ($q=$p=$i=0; $i < $strlen; $i++) {
-            if ($string[$i] == "\""
-                && (empty($string[$i-1]) || $string[$i-1] != "\\")
-            ) {
-                $q = $q ? false : true;
-            } else if (!$q && preg_match("/$delimiter/", $string[$i])) {
-                $result[] = substr($string, $p, $i - $p);
-                $p = $i + 1;
-            }
-        }
-
-        $result[] = substr($string, $p);
-        return $result;
-    }
-
-    /**
-     * Encodes a header value as per RFC2047
-     *
-     * @param string $value      The header data to encode
-     * @param string $charset    Character set name
-     * @param string $encoding   Encoding name (base64 or quoted-printable)
-     * @param int    $prefix_len Prefix length. Default: 0
-     * @param string $eol        End-of-line sequence. Default: "\r\n"
-     *
-     * @return string            Encoded header data
-     * @access public
-     * @since 1.6.1
-     */
-    function encodeHeaderValue($value, $charset, $encoding, $prefix_len=0, $eol="\r\n")
-    {
-        // #17311: Use multibyte aware method (requires mbstring extension)
-        if ($result = Mail_mimePart::encodeMB($value, $charset, $encoding, $prefix_len, $eol)) {
-            return $result;
-        }
-
-        // Generate the header using the specified params and dynamicly
-        // determine the maximum length of such strings.
-        // 75 is the value specified in the RFC.
-        $encoding = $encoding == 'base64' ? 'B' : 'Q';
-        $prefix = '=?' . $charset . '?' . $encoding .'?';
-        $suffix = '?=';
-        $maxLength = 75 - strlen($prefix . $suffix);
-        $maxLength1stLine = $maxLength - $prefix_len;
-
-        if ($encoding == 'B') {
-            // Base64 encode the entire string
-            $value = base64_encode($value);
-
-            // We can cut base64 every 4 characters, so the real max
-            // we can get must be rounded down.
-            $maxLength = $maxLength - ($maxLength % 4);
-            $maxLength1stLine = $maxLength1stLine - ($maxLength1stLine % 4);
-
-            $cutpoint = $maxLength1stLine;
-            $output = '';
-
-            while ($value) {
-                // Split translated string at every $maxLength
-                $part = substr($value, 0, $cutpoint);
-                $value = substr($value, $cutpoint);
-                $cutpoint = $maxLength;
-                // RFC 2047 specifies that any split header should
-                // be seperated by a CRLF SPACE.
-                if ($output) {
-                    $output .= $eol . ' ';
-                }
-                $output .= $prefix . $part . $suffix;
-            }
-            $value = $output;
-        } else {
-            // quoted-printable encoding has been selected
-            $value = Mail_mimePart::encodeQP($value);
-
-            // This regexp will break QP-encoded text at every $maxLength
-            // but will not break any encoded letters.
-            $reg1st = "|(.{0,$maxLength1stLine}[^\=][^\=])|";
-            $reg2nd = "|(.{0,$maxLength}[^\=][^\=])|";
-
-            if (strlen($value) > $maxLength1stLine) {
-                // Begin with the regexp for the first line.
-                $reg = $reg1st;
-                $output = '';
-                while ($value) {
-                    // Split translated string at every $maxLength
-                    // But make sure not to break any translated chars.
-                    $found = preg_match($reg, $value, $matches);
-
-                    // After this first line, we need to use a different
-                    // regexp for the first line.
-                    $reg = $reg2nd;
-
-                    // Save the found part and encapsulate it in the
-                    // prefix & suffix. Then remove the part from the
-                    // $value_out variable.
-                    if ($found) {
-                        $part = $matches[0];
-                        $len = strlen($matches[0]);
-                        $value = substr($value, $len);
-                    } else {
-                        $part = $value;
-                        $value = '';
-                    }
-
-                    // RFC 2047 specifies that any split header should
-                    // be seperated by a CRLF SPACE
-                    if ($output) {
-                        $output .= $eol . ' ';
-                    }
-                    $output .= $prefix . $part . $suffix;
-                }
-                $value = $output;
-            } else {
-                $value = $prefix . $value . $suffix;
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Encodes the given string using quoted-printable
-     *
-     * @param string $str String to encode
-     *
-     * @return string     Encoded string
-     * @access public
-     * @since 1.6.0
-     */
-    function encodeQP($str)
-    {
-        // Bug #17226 RFC 2047 restricts some characters
-        // if the word is inside a phrase, permitted chars are only:
-        // ASCII letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
-
-        // "=",  "_",  "?" must be encoded
-        $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
-        $str = preg_replace_callback(
-            $regexp, array('Mail_mimePart', '_qpReplaceCallback'), $str
-        );
-
-        return str_replace(' ', '_', $str);
-    }
-
-    /**
-     * Encodes the given string using base64 or quoted-printable.
-     * This method makes sure that encoded-word represents an integral
-     * number of characters as per RFC2047.
-     *
-     * @param string $str        String to encode
-     * @param string $charset    Character set name
-     * @param string $encoding   Encoding name (base64 or quoted-printable)
-     * @param int    $prefix_len Prefix length. Default: 0
-     * @param string $eol        End-of-line sequence. Default: "\r\n"
-     *
-     * @return string     Encoded string
-     * @access public
-     * @since 1.8.0
-     */
-    function encodeMB($str, $charset, $encoding, $prefix_len=0, $eol="\r\n")
-    {
-        if (!function_exists('mb_substr') || !function_exists('mb_strlen')) {
-            return;
-        }
-
-        $encoding = $encoding == 'base64' ? 'B' : 'Q';
-        // 75 is the value specified in the RFC
-        $prefix = '=?' . $charset . '?'.$encoding.'?';
-        $suffix = '?=';
-        $maxLength = 75 - strlen($prefix . $suffix);
-
-        // A multi-octet character may not be split across adjacent encoded-words
-        // So, we'll loop over each character
-        // mb_stlen() with wrong charset will generate a warning here and return null
-        $length      = mb_strlen($str, $charset);
-        $result      = '';
-        $line_length = $prefix_len;
-
-        if ($encoding == 'B') {
-            // base64
-            $start = 0;
-            $prev  = '';
-
-            for ($i=1; $i<=$length; $i++) {
-                // See #17311
-                $chunk = mb_substr($str, $start, $i-$start, $charset);
-                $chunk = base64_encode($chunk);
-                $chunk_len = strlen($chunk);
-
-                if ($line_length + $chunk_len == $maxLength || $i == $length) {
-                    if ($result) {
-                        $result .= "\n";
-                    }
-                    $result .= $chunk;
-                    $line_length = 0;
-                    $start = $i;
-                } else if ($line_length + $chunk_len > $maxLength) {
-                    if ($result) {
-                        $result .= "\n";
-                    }
-                    if ($prev) {
-                        $result .= $prev;
-                    }
-                    $line_length = 0;
-                    $start = $i - 1;
-                } else {
-                    $prev = $chunk;
-                }
-            }
-        } else {
-            // quoted-printable
-            // see encodeQP()
-            $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
-
-            for ($i=0; $i<=$length; $i++) {
-                $char = mb_substr($str, $i, 1, $charset);
-                // RFC recommends underline (instead of =20) in place of the space
-                // that's one of the reasons why we're not using iconv_mime_encode()
-                if ($char == ' ') {
-                    $char = '_';
-                    $char_len = 1;
-                } else {
-                    $char = preg_replace_callback(
-                        $regexp, array('Mail_mimePart', '_qpReplaceCallback'), $char
-                    );
-                    $char_len = strlen($char);
-                }
-
-                if ($line_length + $char_len > $maxLength) {
-                    if ($result) {
-                        $result .= "\n";
-                    }
-                    $line_length = 0;
-                }
-
-                $result      .= $char;
-                $line_length += $char_len;
-            }
-        }
-
-        if ($result) {
-            $result = $prefix
-                .str_replace("\n", $suffix.$eol.' '.$prefix, $result).$suffix;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Callback function to replace extended characters (\x80-xFF) with their
-     * ASCII values (RFC2047: quoted-printable)
-     *
-     * @param array $matches Preg_replace's matches array
-     *
-     * @return string        Encoded character string
-     * @access private
-     */
-    function _qpReplaceCallback($matches)
-    {
-        return sprintf('=%02X', ord($matches[1]));
-    }
-
-    /**
-     * Callback function to replace extended characters (\x80-xFF) with their
-     * ASCII values (RFC2231)
-     *
-     * @param array $matches Preg_replace's matches array
-     *
-     * @return string        Encoded character string
-     * @access private
-     */
-    function _encodeReplaceCallback($matches)
-    {
-        return sprintf('%%%02X', ord($matches[1]));
-    }
-
-} // End of class
diff --git a/lib/ext/Net/IDNA2.php b/lib/ext/Net/IDNA2.php
deleted file mode 100644
index 8c366fb..0000000
--- a/lib/ext/Net/IDNA2.php
+++ /dev/null
@@ -1,3402 +0,0 @@
-<?php
-
-// {{{ license
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 foldmethod=marker: */
-//
-// +----------------------------------------------------------------------+
-// | This library is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU Lesser General Public License as       |
-// | published by the Free Software Foundation; either version 2.1 of the |
-// | License, or (at your option) any later version.                      |
-// |                                                                      |
-// | This library is distributed in the hope that it will be useful, but  |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of           |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU    |
-// | Lesser General Public License for more details.                      |
-// |                                                                      |
-// | You should have received a copy of the GNU Lesser General Public     |
-// | License along with this library; if not, write to the Free Software  |
-// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 |
-// | USA.                                                                 |
-// +----------------------------------------------------------------------+
-//
-
-// }}}
-require_once 'Net/IDNA2/Exception.php';
-require_once 'Net/IDNA2/Exception/Nameprep.php';
-
-/**
- * Encode/decode Internationalized Domain Names.
- *
- * The class allows to convert internationalized domain names
- * (see RFC 3490 for details) as they can be used with various registries worldwide
- * to be translated between their original (localized) form and their encoded form
- * as it will be used in the DNS (Domain Name System).
- *
- * The class provides two public methods, encode() and decode(), which do exactly
- * what you would expect them to do. You are allowed to use complete domain names,
- * simple strings and complete email addresses as well. That means, that you might
- * use any of the following notations:
- *
- * - www.n�rgler.com
- * - xn--nrgler-wxa
- * - xn--brse-5qa.xn--knrz-1ra.info
- *
- * Unicode input might be given as either UTF-8 string, UCS-4 string or UCS-4
- * array. Unicode output is available in the same formats.
- * You can select your preferred format via {@link set_paramter()}.
- *
- * ACE input and output is always expected to be ASCII.
- *
- * @package Net
- * @author  Markus Nix <mnix@docuverse.de>
- * @author  Matthias Sommerfeld <mso@phlylabs.de>
- * @author  Stefan Neufeind <pear.neufeind@speedpartner.de>
- * @version $Id: IDNA2.php 305344 2010-11-14 23:52:42Z neufeind $
- */
-class Net_IDNA2
-{
-    // {{{ npdata
-    /**
-     * These Unicode codepoints are
-     * mapped to nothing, See RFC3454 for details
-     *
-     * @static
-     * @var array
-     * @access private
-     */
-    private static $_np_map_nothing = array(
-        0xAD,
-        0x34F,
-        0x1806,
-        0x180B,
-        0x180C,
-        0x180D,
-        0x200B,
-        0x200C,
-        0x200D,
-        0x2060,
-        0xFE00,
-        0xFE01,
-        0xFE02,
-        0xFE03,
-        0xFE04,
-        0xFE05,
-        0xFE06,
-        0xFE07,
-        0xFE08,
-        0xFE09,
-        0xFE0A,
-        0xFE0B,
-        0xFE0C,
-        0xFE0D,
-        0xFE0E,
-        0xFE0F,
-        0xFEFF
-    );
-
-    /**
-     * Prohibited codepints
-     *
-     * @static
-     * @var array
-     * @access private
-     */
-    private static $_general_prohibited = array(
-        0,
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        0xA,
-        0xB,
-        0xC,
-        0xD,
-        0xE,
-        0xF,
-        0x10,
-        0x11,
-        0x12,
-        0x13,
-        0x14,
-        0x15,
-        0x16,
-        0x17,
-        0x18,
-        0x19,
-        0x1A,
-        0x1B,
-        0x1C,
-        0x1D,
-        0x1E,
-        0x1F,
-        0x20,
-        0x21,
-        0x22,
-        0x23,
-        0x24,
-        0x25,
-        0x26,
-        0x27,
-        0x28,
-        0x29,
-        0x2A,
-        0x2B,
-        0x2C,
-        0x2F,
-        0x3B,
-        0x3C,
-        0x3D,
-        0x3E,
-        0x3F,
-        0x40,
-        0x5B,
-        0x5C,
-        0x5D,
-        0x5E,
-        0x5F,
-        0x60,
-        0x7B,
-        0x7C,
-        0x7D,
-        0x7E,
-        0x7F,
-        0x3002
-    );
-
-    /**
-     * Codepints prohibited by Nameprep
-     * @static
-     * @var array
-     * @access private
-     */
-    private static $_np_prohibit = array(
-        0xA0,
-        0x1680,
-        0x2000,
-        0x2001,
-        0x2002,
-        0x2003,
-        0x2004,
-        0x2005,
-        0x2006,
-        0x2007,
-        0x2008,
-        0x2009,
-        0x200A,
-        0x200B,
-        0x202F,
-        0x205F,
-        0x3000,
-        0x6DD,
-        0x70F,
-        0x180E,
-        0x200C,
-        0x200D,
-        0x2028,
-        0x2029,
-        0xFEFF,
-        0xFFF9,
-        0xFFFA,
-        0xFFFB,
-        0xFFFC,
-        0xFFFE,
-        0xFFFF,
-        0x1FFFE,
-        0x1FFFF,
-        0x2FFFE,
-        0x2FFFF,
-        0x3FFFE,
-        0x3FFFF,
-        0x4FFFE,
-        0x4FFFF,
-        0x5FFFE,
-        0x5FFFF,
-        0x6FFFE,
-        0x6FFFF,
-        0x7FFFE,
-        0x7FFFF,
-        0x8FFFE,
-        0x8FFFF,
-        0x9FFFE,
-        0x9FFFF,
-        0xAFFFE,
-        0xAFFFF,
-        0xBFFFE,
-        0xBFFFF,
-        0xCFFFE,
-        0xCFFFF,
-        0xDFFFE,
-        0xDFFFF,
-        0xEFFFE,
-        0xEFFFF,
-        0xFFFFE,
-        0xFFFFF,
-        0x10FFFE,
-        0x10FFFF,
-        0xFFF9,
-        0xFFFA,
-        0xFFFB,
-        0xFFFC,
-        0xFFFD,
-        0x340,
-        0x341,
-        0x200E,
-        0x200F,
-        0x202A,
-        0x202B,
-        0x202C,
-        0x202D,
-        0x202E,
-        0x206A,
-        0x206B,
-        0x206C,
-        0x206D,
-        0x206E,
-        0x206F,
-        0xE0001
-    );
-
-    /**
-     * Codepoint ranges prohibited by nameprep
-     *
-     * @static
-     * @var array
-     * @access private
-     */
-    private static $_np_prohibit_ranges = array(
-        array(0x80,     0x9F    ),
-        array(0x2060,   0x206F  ),
-        array(0x1D173,  0x1D17A ),
-        array(0xE000,   0xF8FF  ),
-        array(0xF0000,  0xFFFFD ),
-        array(0x100000, 0x10FFFD),
-        array(0xFDD0,   0xFDEF  ),
-        array(0xD800,   0xDFFF  ),
-        array(0x2FF0,   0x2FFB  ),
-        array(0xE0020,  0xE007F )
-    );
-
-    /**
-     * Replacement mappings (casemapping, replacement sequences, ...)
-     *
-     * @static
-     * @var array
-     * @access private
-     */
-    private static $_np_replacemaps = array(
-        0x41    => array(0x61),
-        0x42    => array(0x62),
-        0x43    => array(0x63),
-        0x44    => array(0x64),
-        0x45    => array(0x65),
-        0x46    => array(0x66),
-        0x47    => array(0x67),
-        0x48    => array(0x68),
-        0x49    => array(0x69),
-        0x4A    => array(0x6A),
-        0x4B    => array(0x6B),
-        0x4C    => array(0x6C),
-        0x4D    => array(0x6D),
-        0x4E    => array(0x6E),
-        0x4F    => array(0x6F),
-        0x50    => array(0x70),
-        0x51    => array(0x71),
-        0x52    => array(0x72),
-        0x53    => array(0x73),
-        0x54    => array(0x74),
-        0x55    => array(0x75),
-        0x56    => array(0x76),
-        0x57    => array(0x77),
-        0x58    => array(0x78),
-        0x59    => array(0x79),
-        0x5A    => array(0x7A),
-        0xB5    => array(0x3BC),
-        0xC0    => array(0xE0),
-        0xC1    => array(0xE1),
-        0xC2    => array(0xE2),
-        0xC3    => array(0xE3),
-        0xC4    => array(0xE4),
-        0xC5    => array(0xE5),
-        0xC6    => array(0xE6),
-        0xC7    => array(0xE7),
-        0xC8    => array(0xE8),
-        0xC9    => array(0xE9),
-        0xCA    => array(0xEA),
-        0xCB    => array(0xEB),
-        0xCC    => array(0xEC),
-        0xCD    => array(0xED),
-        0xCE    => array(0xEE),
-        0xCF    => array(0xEF),
-        0xD0    => array(0xF0),
-        0xD1    => array(0xF1),
-        0xD2    => array(0xF2),
-        0xD3    => array(0xF3),
-        0xD4    => array(0xF4),
-        0xD5    => array(0xF5),
-        0xD6    => array(0xF6),
-        0xD8    => array(0xF8),
-        0xD9    => array(0xF9),
-        0xDA    => array(0xFA),
-        0xDB    => array(0xFB),
-        0xDC    => array(0xFC),
-        0xDD    => array(0xFD),
-        0xDE    => array(0xFE),
-        0xDF    => array(0x73, 0x73),
-        0x100   => array(0x101),
-        0x102   => array(0x103),
-        0x104   => array(0x105),
-        0x106   => array(0x107),
-        0x108   => array(0x109),
-        0x10A   => array(0x10B),
-        0x10C   => array(0x10D),
-        0x10E   => array(0x10F),
-        0x110   => array(0x111),
-        0x112   => array(0x113),
-        0x114   => array(0x115),
-        0x116   => array(0x117),
-        0x118   => array(0x119),
-        0x11A   => array(0x11B),
-        0x11C   => array(0x11D),
-        0x11E   => array(0x11F),
-        0x120   => array(0x121),
-        0x122   => array(0x123),
-        0x124   => array(0x125),
-        0x126   => array(0x127),
-        0x128   => array(0x129),
-        0x12A   => array(0x12B),
-        0x12C   => array(0x12D),
-        0x12E   => array(0x12F),
-        0x130   => array(0x69, 0x307),
-        0x132   => array(0x133),
-        0x134   => array(0x135),
-        0x136   => array(0x137),
-        0x139   => array(0x13A),
-        0x13B   => array(0x13C),
-        0x13D   => array(0x13E),
-        0x13F   => array(0x140),
-        0x141   => array(0x142),
-        0x143   => array(0x144),
-        0x145   => array(0x146),
-        0x147   => array(0x148),
-        0x149   => array(0x2BC, 0x6E),
-        0x14A   => array(0x14B),
-        0x14C   => array(0x14D),
-        0x14E   => array(0x14F),
-        0x150   => array(0x151),
-        0x152   => array(0x153),
-        0x154   => array(0x155),
-        0x156   => array(0x157),
-        0x158   => array(0x159),
-        0x15A   => array(0x15B),
-        0x15C   => array(0x15D),
-        0x15E   => array(0x15F),
-        0x160   => array(0x161),
-        0x162   => array(0x163),
-        0x164   => array(0x165),
-        0x166   => array(0x167),
-        0x168   => array(0x169),
-        0x16A   => array(0x16B),
-        0x16C   => array(0x16D),
-        0x16E   => array(0x16F),
-        0x170   => array(0x171),
-        0x172   => array(0x173),
-        0x174   => array(0x175),
-        0x176   => array(0x177),
-        0x178   => array(0xFF),
-        0x179   => array(0x17A),
-        0x17B   => array(0x17C),
-        0x17D   => array(0x17E),
-        0x17F   => array(0x73),
-        0x181   => array(0x253),
-        0x182   => array(0x183),
-        0x184   => array(0x185),
-        0x186   => array(0x254),
-        0x187   => array(0x188),
-        0x189   => array(0x256),
-        0x18A   => array(0x257),
-        0x18B   => array(0x18C),
-        0x18E   => array(0x1DD),
-        0x18F   => array(0x259),
-        0x190   => array(0x25B),
-        0x191   => array(0x192),
-        0x193   => array(0x260),
-        0x194   => array(0x263),
-        0x196   => array(0x269),
-        0x197   => array(0x268),
-        0x198   => array(0x199),
-        0x19C   => array(0x26F),
-        0x19D   => array(0x272),
-        0x19F   => array(0x275),
-        0x1A0   => array(0x1A1),
-        0x1A2   => array(0x1A3),
-        0x1A4   => array(0x1A5),
-        0x1A6   => array(0x280),
-        0x1A7   => array(0x1A8),
-        0x1A9   => array(0x283),
-        0x1AC   => array(0x1AD),
-        0x1AE   => array(0x288),
-        0x1AF   => array(0x1B0),
-        0x1B1   => array(0x28A),
-        0x1B2   => array(0x28B),
-        0x1B3   => array(0x1B4),
-        0x1B5   => array(0x1B6),
-        0x1B7   => array(0x292),
-        0x1B8   => array(0x1B9),
-        0x1BC   => array(0x1BD),
-        0x1C4   => array(0x1C6),
-        0x1C5   => array(0x1C6),
-        0x1C7   => array(0x1C9),
-        0x1C8   => array(0x1C9),
-        0x1CA   => array(0x1CC),
-        0x1CB   => array(0x1CC),
-        0x1CD   => array(0x1CE),
-        0x1CF   => array(0x1D0),
-        0x1D1   => array(0x1D2),
-        0x1D3   => array(0x1D4),
-        0x1D5   => array(0x1D6),
-        0x1D7   => array(0x1D8),
-        0x1D9   => array(0x1DA),
-        0x1DB   => array(0x1DC),
-        0x1DE   => array(0x1DF),
-        0x1E0   => array(0x1E1),
-        0x1E2   => array(0x1E3),
-        0x1E4   => array(0x1E5),
-        0x1E6   => array(0x1E7),
-        0x1E8   => array(0x1E9),
-        0x1EA   => array(0x1EB),
-        0x1EC   => array(0x1ED),
-        0x1EE   => array(0x1EF),
-        0x1F0   => array(0x6A, 0x30C),
-        0x1F1   => array(0x1F3),
-        0x1F2   => array(0x1F3),
-        0x1F4   => array(0x1F5),
-        0x1F6   => array(0x195),
-        0x1F7   => array(0x1BF),
-        0x1F8   => array(0x1F9),
-        0x1FA   => array(0x1FB),
-        0x1FC   => array(0x1FD),
-        0x1FE   => array(0x1FF),
-        0x200   => array(0x201),
-        0x202   => array(0x203),
-        0x204   => array(0x205),
-        0x206   => array(0x207),
-        0x208   => array(0x209),
-        0x20A   => array(0x20B),
-        0x20C   => array(0x20D),
-        0x20E   => array(0x20F),
-        0x210   => array(0x211),
-        0x212   => array(0x213),
-        0x214   => array(0x215),
-        0x216   => array(0x217),
-        0x218   => array(0x219),
-        0x21A   => array(0x21B),
-        0x21C   => array(0x21D),
-        0x21E   => array(0x21F),
-        0x220   => array(0x19E),
-        0x222   => array(0x223),
-        0x224   => array(0x225),
-        0x226   => array(0x227),
-        0x228   => array(0x229),
-        0x22A   => array(0x22B),
-        0x22C   => array(0x22D),
-        0x22E   => array(0x22F),
-        0x230   => array(0x231),
-        0x232   => array(0x233),
-        0x345   => array(0x3B9),
-        0x37A   => array(0x20, 0x3B9),
-        0x386   => array(0x3AC),
-        0x388   => array(0x3AD),
-        0x389   => array(0x3AE),
-        0x38A   => array(0x3AF),
-        0x38C   => array(0x3CC),
-        0x38E   => array(0x3CD),
-        0x38F   => array(0x3CE),
-        0x390   => array(0x3B9, 0x308, 0x301),
-        0x391   => array(0x3B1),
-        0x392   => array(0x3B2),
-        0x393   => array(0x3B3),
-        0x394   => array(0x3B4),
-        0x395   => array(0x3B5),
-        0x396   => array(0x3B6),
-        0x397   => array(0x3B7),
-        0x398   => array(0x3B8),
-        0x399   => array(0x3B9),
-        0x39A   => array(0x3BA),
-        0x39B   => array(0x3BB),
-        0x39C   => array(0x3BC),
-        0x39D   => array(0x3BD),
-        0x39E   => array(0x3BE),
-        0x39F   => array(0x3BF),
-        0x3A0   => array(0x3C0),
-        0x3A1   => array(0x3C1),
-        0x3A3   => array(0x3C3),
-        0x3A4   => array(0x3C4),
-        0x3A5   => array(0x3C5),
-        0x3A6   => array(0x3C6),
-        0x3A7   => array(0x3C7),
-        0x3A8   => array(0x3C8),
-        0x3A9   => array(0x3C9),
-        0x3AA   => array(0x3CA),
-        0x3AB   => array(0x3CB),
-        0x3B0   => array(0x3C5, 0x308, 0x301),
-        0x3C2   => array(0x3C3),
-        0x3D0   => array(0x3B2),
-        0x3D1   => array(0x3B8),
-        0x3D2   => array(0x3C5),
-        0x3D3   => array(0x3CD),
-        0x3D4   => array(0x3CB),
-        0x3D5   => array(0x3C6),
-        0x3D6   => array(0x3C0),
-        0x3D8   => array(0x3D9),
-        0x3DA   => array(0x3DB),
-        0x3DC   => array(0x3DD),
-        0x3DE   => array(0x3DF),
-        0x3E0   => array(0x3E1),
-        0x3E2   => array(0x3E3),
-        0x3E4   => array(0x3E5),
-        0x3E6   => array(0x3E7),
-        0x3E8   => array(0x3E9),
-        0x3EA   => array(0x3EB),
-        0x3EC   => array(0x3ED),
-        0x3EE   => array(0x3EF),
-        0x3F0   => array(0x3BA),
-        0x3F1   => array(0x3C1),
-        0x3F2   => array(0x3C3),
-        0x3F4   => array(0x3B8),
-        0x3F5   => array(0x3B5),
-        0x400   => array(0x450),
-        0x401   => array(0x451),
-        0x402   => array(0x452),
-        0x403   => array(0x453),
-        0x404   => array(0x454),
-        0x405   => array(0x455),
-        0x406   => array(0x456),
-        0x407   => array(0x457),
-        0x408   => array(0x458),
-        0x409   => array(0x459),
-        0x40A   => array(0x45A),
-        0x40B   => array(0x45B),
-        0x40C   => array(0x45C),
-        0x40D   => array(0x45D),
-        0x40E   => array(0x45E),
-        0x40F   => array(0x45F),
-        0x410   => array(0x430),
-        0x411   => array(0x431),
-        0x412   => array(0x432),
-        0x413   => array(0x433),
-        0x414   => array(0x434),
-        0x415   => array(0x435),
-        0x416   => array(0x436),
-        0x417   => array(0x437),
-        0x418   => array(0x438),
-        0x419   => array(0x439),
-        0x41A   => array(0x43A),
-        0x41B   => array(0x43B),
-        0x41C   => array(0x43C),
-        0x41D   => array(0x43D),
-        0x41E   => array(0x43E),
-        0x41F   => array(0x43F),
-        0x420   => array(0x440),
-        0x421   => array(0x441),
-        0x422   => array(0x442),
-        0x423   => array(0x443),
-        0x424   => array(0x444),
-        0x425   => array(0x445),
-        0x426   => array(0x446),
-        0x427   => array(0x447),
-        0x428   => array(0x448),
-        0x429   => array(0x449),
-        0x42A   => array(0x44A),
-        0x42B   => array(0x44B),
-        0x42C   => array(0x44C),
-        0x42D   => array(0x44D),
-        0x42E   => array(0x44E),
-        0x42F   => array(0x44F),
-        0x460   => array(0x461),
-        0x462   => array(0x463),
-        0x464   => array(0x465),
-        0x466   => array(0x467),
-        0x468   => array(0x469),
-        0x46A   => array(0x46B),
-        0x46C   => array(0x46D),
-        0x46E   => array(0x46F),
-        0x470   => array(0x471),
-        0x472   => array(0x473),
-        0x474   => array(0x475),
-        0x476   => array(0x477),
-        0x478   => array(0x479),
-        0x47A   => array(0x47B),
-        0x47C   => array(0x47D),
-        0x47E   => array(0x47F),
-        0x480   => array(0x481),
-        0x48A   => array(0x48B),
-        0x48C   => array(0x48D),
-        0x48E   => array(0x48F),
-        0x490   => array(0x491),
-        0x492   => array(0x493),
-        0x494   => array(0x495),
-        0x496   => array(0x497),
-        0x498   => array(0x499),
-        0x49A   => array(0x49B),
-        0x49C   => array(0x49D),
-        0x49E   => array(0x49F),
-        0x4A0   => array(0x4A1),
-        0x4A2   => array(0x4A3),
-        0x4A4   => array(0x4A5),
-        0x4A6   => array(0x4A7),
-        0x4A8   => array(0x4A9),
-        0x4AA   => array(0x4AB),
-        0x4AC   => array(0x4AD),
-        0x4AE   => array(0x4AF),
-        0x4B0   => array(0x4B1),
-        0x4B2   => array(0x4B3),
-        0x4B4   => array(0x4B5),
-        0x4B6   => array(0x4B7),
-        0x4B8   => array(0x4B9),
-        0x4BA   => array(0x4BB),
-        0x4BC   => array(0x4BD),
-        0x4BE   => array(0x4BF),
-        0x4C1   => array(0x4C2),
-        0x4C3   => array(0x4C4),
-        0x4C5   => array(0x4C6),
-        0x4C7   => array(0x4C8),
-        0x4C9   => array(0x4CA),
-        0x4CB   => array(0x4CC),
-        0x4CD   => array(0x4CE),
-        0x4D0   => array(0x4D1),
-        0x4D2   => array(0x4D3),
-        0x4D4   => array(0x4D5),
-        0x4D6   => array(0x4D7),
-        0x4D8   => array(0x4D9),
-        0x4DA   => array(0x4DB),
-        0x4DC   => array(0x4DD),
-        0x4DE   => array(0x4DF),
-        0x4E0   => array(0x4E1),
-        0x4E2   => array(0x4E3),
-        0x4E4   => array(0x4E5),
-        0x4E6   => array(0x4E7),
-        0x4E8   => array(0x4E9),
-        0x4EA   => array(0x4EB),
-        0x4EC   => array(0x4ED),
-        0x4EE   => array(0x4EF),
-        0x4F0   => array(0x4F1),
-        0x4F2   => array(0x4F3),
-        0x4F4   => array(0x4F5),
-        0x4F8   => array(0x4F9),
-        0x500   => array(0x501),
-        0x502   => array(0x503),
-        0x504   => array(0x505),
-        0x506   => array(0x507),
-        0x508   => array(0x509),
-        0x50A   => array(0x50B),
-        0x50C   => array(0x50D),
-        0x50E   => array(0x50F),
-        0x531   => array(0x561),
-        0x532   => array(0x562),
-        0x533   => array(0x563),
-        0x534   => array(0x564),
-        0x535   => array(0x565),
-        0x536   => array(0x566),
-        0x537   => array(0x567),
-        0x538   => array(0x568),
-        0x539   => array(0x569),
-        0x53A   => array(0x56A),
-        0x53B   => array(0x56B),
-        0x53C   => array(0x56C),
-        0x53D   => array(0x56D),
-        0x53E   => array(0x56E),
-        0x53F   => array(0x56F),
-        0x540   => array(0x570),
-        0x541   => array(0x571),
-        0x542   => array(0x572),
-        0x543   => array(0x573),
-        0x544   => array(0x574),
-        0x545   => array(0x575),
-        0x546   => array(0x576),
-        0x547   => array(0x577),
-        0x548   => array(0x578),
-        0x549   => array(0x579),
-        0x54A   => array(0x57A),
-        0x54B   => array(0x57B),
-        0x54C   => array(0x57C),
-        0x54D   => array(0x57D),
-        0x54E   => array(0x57E),
-        0x54F   => array(0x57F),
-        0x550   => array(0x580),
-        0x551   => array(0x581),
-        0x552   => array(0x582),
-        0x553   => array(0x583),
-        0x554   => array(0x584),
-        0x555   => array(0x585),
-        0x556   => array(0x586),
-        0x587   => array(0x565, 0x582),
-        0x1E00  => array(0x1E01),
-        0x1E02  => array(0x1E03),
-        0x1E04  => array(0x1E05),
-        0x1E06  => array(0x1E07),
-        0x1E08  => array(0x1E09),
-        0x1E0A  => array(0x1E0B),
-        0x1E0C  => array(0x1E0D),
-        0x1E0E  => array(0x1E0F),
-        0x1E10  => array(0x1E11),
-        0x1E12  => array(0x1E13),
-        0x1E14  => array(0x1E15),
-        0x1E16  => array(0x1E17),
-        0x1E18  => array(0x1E19),
-        0x1E1A  => array(0x1E1B),
-        0x1E1C  => array(0x1E1D),
-        0x1E1E  => array(0x1E1F),
-        0x1E20  => array(0x1E21),
-        0x1E22  => array(0x1E23),
-        0x1E24  => array(0x1E25),
-        0x1E26  => array(0x1E27),
-        0x1E28  => array(0x1E29),
-        0x1E2A  => array(0x1E2B),
-        0x1E2C  => array(0x1E2D),
-        0x1E2E  => array(0x1E2F),
-        0x1E30  => array(0x1E31),
-        0x1E32  => array(0x1E33),
-        0x1E34  => array(0x1E35),
-        0x1E36  => array(0x1E37),
-        0x1E38  => array(0x1E39),
-        0x1E3A  => array(0x1E3B),
-        0x1E3C  => array(0x1E3D),
-        0x1E3E  => array(0x1E3F),
-        0x1E40  => array(0x1E41),
-        0x1E42  => array(0x1E43),
-        0x1E44  => array(0x1E45),
-        0x1E46  => array(0x1E47),
-        0x1E48  => array(0x1E49),
-        0x1E4A  => array(0x1E4B),
-        0x1E4C  => array(0x1E4D),
-        0x1E4E  => array(0x1E4F),
-        0x1E50  => array(0x1E51),
-        0x1E52  => array(0x1E53),
-        0x1E54  => array(0x1E55),
-        0x1E56  => array(0x1E57),
-        0x1E58  => array(0x1E59),
-        0x1E5A  => array(0x1E5B),
-        0x1E5C  => array(0x1E5D),
-        0x1E5E  => array(0x1E5F),
-        0x1E60  => array(0x1E61),
-        0x1E62  => array(0x1E63),
-        0x1E64  => array(0x1E65),
-        0x1E66  => array(0x1E67),
-        0x1E68  => array(0x1E69),
-        0x1E6A  => array(0x1E6B),
-        0x1E6C  => array(0x1E6D),
-        0x1E6E  => array(0x1E6F),
-        0x1E70  => array(0x1E71),
-        0x1E72  => array(0x1E73),
-        0x1E74  => array(0x1E75),
-        0x1E76  => array(0x1E77),
-        0x1E78  => array(0x1E79),
-        0x1E7A  => array(0x1E7B),
-        0x1E7C  => array(0x1E7D),
-        0x1E7E  => array(0x1E7F),
-        0x1E80  => array(0x1E81),
-        0x1E82  => array(0x1E83),
-        0x1E84  => array(0x1E85),
-        0x1E86  => array(0x1E87),
-        0x1E88  => array(0x1E89),
-        0x1E8A  => array(0x1E8B),
-        0x1E8C  => array(0x1E8D),
-        0x1E8E  => array(0x1E8F),
-        0x1E90  => array(0x1E91),
-        0x1E92  => array(0x1E93),
-        0x1E94  => array(0x1E95),
-        0x1E96  => array(0x68, 0x331),
-        0x1E97  => array(0x74, 0x308),
-        0x1E98  => array(0x77, 0x30A),
-        0x1E99  => array(0x79, 0x30A),
-        0x1E9A  => array(0x61, 0x2BE),
-        0x1E9B  => array(0x1E61),
-        0x1EA0  => array(0x1EA1),
-        0x1EA2  => array(0x1EA3),
-        0x1EA4  => array(0x1EA5),
-        0x1EA6  => array(0x1EA7),
-        0x1EA8  => array(0x1EA9),
-        0x1EAA  => array(0x1EAB),
-        0x1EAC  => array(0x1EAD),
-        0x1EAE  => array(0x1EAF),
-        0x1EB0  => array(0x1EB1),
-        0x1EB2  => array(0x1EB3),
-        0x1EB4  => array(0x1EB5),
-        0x1EB6  => array(0x1EB7),
-        0x1EB8  => array(0x1EB9),
-        0x1EBA  => array(0x1EBB),
-        0x1EBC  => array(0x1EBD),
-        0x1EBE  => array(0x1EBF),
-        0x1EC0  => array(0x1EC1),
-        0x1EC2  => array(0x1EC3),
-        0x1EC4  => array(0x1EC5),
-        0x1EC6  => array(0x1EC7),
-        0x1EC8  => array(0x1EC9),
-        0x1ECA  => array(0x1ECB),
-        0x1ECC  => array(0x1ECD),
-        0x1ECE  => array(0x1ECF),
-        0x1ED0  => array(0x1ED1),
-        0x1ED2  => array(0x1ED3),
-        0x1ED4  => array(0x1ED5),
-        0x1ED6  => array(0x1ED7),
-        0x1ED8  => array(0x1ED9),
-        0x1EDA  => array(0x1EDB),
-        0x1EDC  => array(0x1EDD),
-        0x1EDE  => array(0x1EDF),
-        0x1EE0  => array(0x1EE1),
-        0x1EE2  => array(0x1EE3),
-        0x1EE4  => array(0x1EE5),
-        0x1EE6  => array(0x1EE7),
-        0x1EE8  => array(0x1EE9),
-        0x1EEA  => array(0x1EEB),
-        0x1EEC  => array(0x1EED),
-        0x1EEE  => array(0x1EEF),
-        0x1EF0  => array(0x1EF1),
-        0x1EF2  => array(0x1EF3),
-        0x1EF4  => array(0x1EF5),
-        0x1EF6  => array(0x1EF7),
-        0x1EF8  => array(0x1EF9),
-        0x1F08  => array(0x1F00),
-        0x1F09  => array(0x1F01),
-        0x1F0A  => array(0x1F02),
-        0x1F0B  => array(0x1F03),
-        0x1F0C  => array(0x1F04),
-        0x1F0D  => array(0x1F05),
-        0x1F0E  => array(0x1F06),
-        0x1F0F  => array(0x1F07),
-        0x1F18  => array(0x1F10),
-        0x1F19  => array(0x1F11),
-        0x1F1A  => array(0x1F12),
-        0x1F1B  => array(0x1F13),
-        0x1F1C  => array(0x1F14),
-        0x1F1D  => array(0x1F15),
-        0x1F28  => array(0x1F20),
-        0x1F29  => array(0x1F21),
-        0x1F2A  => array(0x1F22),
-        0x1F2B  => array(0x1F23),
-        0x1F2C  => array(0x1F24),
-        0x1F2D  => array(0x1F25),
-        0x1F2E  => array(0x1F26),
-        0x1F2F  => array(0x1F27),
-        0x1F38  => array(0x1F30),
-        0x1F39  => array(0x1F31),
-        0x1F3A  => array(0x1F32),
-        0x1F3B  => array(0x1F33),
-        0x1F3C  => array(0x1F34),
-        0x1F3D  => array(0x1F35),
-        0x1F3E  => array(0x1F36),
-        0x1F3F  => array(0x1F37),
-        0x1F48  => array(0x1F40),
-        0x1F49  => array(0x1F41),
-        0x1F4A  => array(0x1F42),
-        0x1F4B  => array(0x1F43),
-        0x1F4C  => array(0x1F44),
-        0x1F4D  => array(0x1F45),
-        0x1F50  => array(0x3C5, 0x313),
-        0x1F52  => array(0x3C5, 0x313, 0x300),
-        0x1F54  => array(0x3C5, 0x313, 0x301),
-        0x1F56  => array(0x3C5, 0x313, 0x342),
-        0x1F59  => array(0x1F51),
-        0x1F5B  => array(0x1F53),
-        0x1F5D  => array(0x1F55),
-        0x1F5F  => array(0x1F57),
-        0x1F68  => array(0x1F60),
-        0x1F69  => array(0x1F61),
-        0x1F6A  => array(0x1F62),
-        0x1F6B  => array(0x1F63),
-        0x1F6C  => array(0x1F64),
-        0x1F6D  => array(0x1F65),
-        0x1F6E  => array(0x1F66),
-        0x1F6F  => array(0x1F67),
-        0x1F80  => array(0x1F00, 0x3B9),
-        0x1F81  => array(0x1F01, 0x3B9),
-        0x1F82  => array(0x1F02, 0x3B9),
-        0x1F83  => array(0x1F03, 0x3B9),
-        0x1F84  => array(0x1F04, 0x3B9),
-        0x1F85  => array(0x1F05, 0x3B9),
-        0x1F86  => array(0x1F06, 0x3B9),
-        0x1F87  => array(0x1F07, 0x3B9),
-        0x1F88  => array(0x1F00, 0x3B9),
-        0x1F89  => array(0x1F01, 0x3B9),
-        0x1F8A  => array(0x1F02, 0x3B9),
-        0x1F8B  => array(0x1F03, 0x3B9),
-        0x1F8C  => array(0x1F04, 0x3B9),
-        0x1F8D  => array(0x1F05, 0x3B9),
-        0x1F8E  => array(0x1F06, 0x3B9),
-        0x1F8F  => array(0x1F07, 0x3B9),
-        0x1F90  => array(0x1F20, 0x3B9),
-        0x1F91  => array(0x1F21, 0x3B9),
-        0x1F92  => array(0x1F22, 0x3B9),
-        0x1F93  => array(0x1F23, 0x3B9),
-        0x1F94  => array(0x1F24, 0x3B9),
-        0x1F95  => array(0x1F25, 0x3B9),
-        0x1F96  => array(0x1F26, 0x3B9),
-        0x1F97  => array(0x1F27, 0x3B9),
-        0x1F98  => array(0x1F20, 0x3B9),
-        0x1F99  => array(0x1F21, 0x3B9),
-        0x1F9A  => array(0x1F22, 0x3B9),
-        0x1F9B  => array(0x1F23, 0x3B9),
-        0x1F9C  => array(0x1F24, 0x3B9),
-        0x1F9D  => array(0x1F25, 0x3B9),
-        0x1F9E  => array(0x1F26, 0x3B9),
-        0x1F9F  => array(0x1F27, 0x3B9),
-        0x1FA0  => array(0x1F60, 0x3B9),
-        0x1FA1  => array(0x1F61, 0x3B9),
-        0x1FA2  => array(0x1F62, 0x3B9),
-        0x1FA3  => array(0x1F63, 0x3B9),
-        0x1FA4  => array(0x1F64, 0x3B9),
-        0x1FA5  => array(0x1F65, 0x3B9),
-        0x1FA6  => array(0x1F66, 0x3B9),
-        0x1FA7  => array(0x1F67, 0x3B9),
-        0x1FA8  => array(0x1F60, 0x3B9),
-        0x1FA9  => array(0x1F61, 0x3B9),
-        0x1FAA  => array(0x1F62, 0x3B9),
-        0x1FAB  => array(0x1F63, 0x3B9),
-        0x1FAC  => array(0x1F64, 0x3B9),
-        0x1FAD  => array(0x1F65, 0x3B9),
-        0x1FAE  => array(0x1F66, 0x3B9),
-        0x1FAF  => array(0x1F67, 0x3B9),
-        0x1FB2  => array(0x1F70, 0x3B9),
-        0x1FB3  => array(0x3B1, 0x3B9),
-        0x1FB4  => array(0x3AC, 0x3B9),
-        0x1FB6  => array(0x3B1, 0x342),
-        0x1FB7  => array(0x3B1, 0x342, 0x3B9),
-        0x1FB8  => array(0x1FB0),
-        0x1FB9  => array(0x1FB1),
-        0x1FBA  => array(0x1F70),
-        0x1FBB  => array(0x1F71),
-        0x1FBC  => array(0x3B1, 0x3B9),
-        0x1FBE  => array(0x3B9),
-        0x1FC2  => array(0x1F74, 0x3B9),
-        0x1FC3  => array(0x3B7, 0x3B9),
-        0x1FC4  => array(0x3AE, 0x3B9),
-        0x1FC6  => array(0x3B7, 0x342),
-        0x1FC7  => array(0x3B7, 0x342, 0x3B9),
-        0x1FC8  => array(0x1F72),
-        0x1FC9  => array(0x1F73),
-        0x1FCA  => array(0x1F74),
-        0x1FCB  => array(0x1F75),
-        0x1FCC  => array(0x3B7, 0x3B9),
-        0x1FD2  => array(0x3B9, 0x308, 0x300),
-        0x1FD3  => array(0x3B9, 0x308, 0x301),
-        0x1FD6  => array(0x3B9, 0x342),
-        0x1FD7  => array(0x3B9, 0x308, 0x342),
-        0x1FD8  => array(0x1FD0),
-        0x1FD9  => array(0x1FD1),
-        0x1FDA  => array(0x1F76),
-        0x1FDB  => array(0x1F77),
-        0x1FE2  => array(0x3C5, 0x308, 0x300),
-        0x1FE3  => array(0x3C5, 0x308, 0x301),
-        0x1FE4  => array(0x3C1, 0x313),
-        0x1FE6  => array(0x3C5, 0x342),
-        0x1FE7  => array(0x3C5, 0x308, 0x342),
-        0x1FE8  => array(0x1FE0),
-        0x1FE9  => array(0x1FE1),
-        0x1FEA  => array(0x1F7A),
-        0x1FEB  => array(0x1F7B),
-        0x1FEC  => array(0x1FE5),
-        0x1FF2  => array(0x1F7C, 0x3B9),
-        0x1FF3  => array(0x3C9, 0x3B9),
-        0x1FF4  => array(0x3CE, 0x3B9),
-        0x1FF6  => array(0x3C9, 0x342),
-        0x1FF7  => array(0x3C9, 0x342, 0x3B9),
-        0x1FF8  => array(0x1F78),
-        0x1FF9  => array(0x1F79),
-        0x1FFA  => array(0x1F7C),
-        0x1FFB  => array(0x1F7D),
-        0x1FFC  => array(0x3C9, 0x3B9),
-        0x20A8  => array(0x72, 0x73),
-        0x2102  => array(0x63),
-        0x2103  => array(0xB0, 0x63),
-        0x2107  => array(0x25B),
-        0x2109  => array(0xB0, 0x66),
-        0x210B  => array(0x68),
-        0x210C  => array(0x68),
-        0x210D  => array(0x68),
-        0x2110  => array(0x69),
-        0x2111  => array(0x69),
-        0x2112  => array(0x6C),
-        0x2115  => array(0x6E),
-        0x2116  => array(0x6E, 0x6F),
-        0x2119  => array(0x70),
-        0x211A  => array(0x71),
-        0x211B  => array(0x72),
-        0x211C  => array(0x72),
-        0x211D  => array(0x72),
-        0x2120  => array(0x73, 0x6D),
-        0x2121  => array(0x74, 0x65, 0x6C),
-        0x2122  => array(0x74, 0x6D),
-        0x2124  => array(0x7A),
-        0x2126  => array(0x3C9),
-        0x2128  => array(0x7A),
-        0x212A  => array(0x6B),
-        0x212B  => array(0xE5),
-        0x212C  => array(0x62),
-        0x212D  => array(0x63),
-        0x2130  => array(0x65),
-        0x2131  => array(0x66),
-        0x2133  => array(0x6D),
-        0x213E  => array(0x3B3),
-        0x213F  => array(0x3C0),
-        0x2145  => array(0x64),
-        0x2160  => array(0x2170),
-        0x2161  => array(0x2171),
-        0x2162  => array(0x2172),
-        0x2163  => array(0x2173),
-        0x2164  => array(0x2174),
-        0x2165  => array(0x2175),
-        0x2166  => array(0x2176),
-        0x2167  => array(0x2177),
-        0x2168  => array(0x2178),
-        0x2169  => array(0x2179),
-        0x216A  => array(0x217A),
-        0x216B  => array(0x217B),
-        0x216C  => array(0x217C),
-        0x216D  => array(0x217D),
-        0x216E  => array(0x217E),
-        0x216F  => array(0x217F),
-        0x24B6  => array(0x24D0),
-        0x24B7  => array(0x24D1),
-        0x24B8  => array(0x24D2),
-        0x24B9  => array(0x24D3),
-        0x24BA  => array(0x24D4),
-        0x24BB  => array(0x24D5),
-        0x24BC  => array(0x24D6),
-        0x24BD  => array(0x24D7),
-        0x24BE  => array(0x24D8),
-        0x24BF  => array(0x24D9),
-        0x24C0  => array(0x24DA),
-        0x24C1  => array(0x24DB),
-        0x24C2  => array(0x24DC),
-        0x24C3  => array(0x24DD),
-        0x24C4  => array(0x24DE),
-        0x24C5  => array(0x24DF),
-        0x24C6  => array(0x24E0),
-        0x24C7  => array(0x24E1),
-        0x24C8  => array(0x24E2),
-        0x24C9  => array(0x24E3),
-        0x24CA  => array(0x24E4),
-        0x24CB  => array(0x24E5),
-        0x24CC  => array(0x24E6),
-        0x24CD  => array(0x24E7),
-        0x24CE  => array(0x24E8),
-        0x24CF  => array(0x24E9),
-        0x3371  => array(0x68, 0x70, 0x61),
-        0x3373  => array(0x61, 0x75),
-        0x3375  => array(0x6F, 0x76),
-        0x3380  => array(0x70, 0x61),
-        0x3381  => array(0x6E, 0x61),
-        0x3382  => array(0x3BC, 0x61),
-        0x3383  => array(0x6D, 0x61),
-        0x3384  => array(0x6B, 0x61),
-        0x3385  => array(0x6B, 0x62),
-        0x3386  => array(0x6D, 0x62),
-        0x3387  => array(0x67, 0x62),
-        0x338A  => array(0x70, 0x66),
-        0x338B  => array(0x6E, 0x66),
-        0x338C  => array(0x3BC, 0x66),
-        0x3390  => array(0x68, 0x7A),
-        0x3391  => array(0x6B, 0x68, 0x7A),
-        0x3392  => array(0x6D, 0x68, 0x7A),
-        0x3393  => array(0x67, 0x68, 0x7A),
-        0x3394  => array(0x74, 0x68, 0x7A),
-        0x33A9  => array(0x70, 0x61),
-        0x33AA  => array(0x6B, 0x70, 0x61),
-        0x33AB  => array(0x6D, 0x70, 0x61),
-        0x33AC  => array(0x67, 0x70, 0x61),
-        0x33B4  => array(0x70, 0x76),
-        0x33B5  => array(0x6E, 0x76),
-        0x33B6  => array(0x3BC, 0x76),
-        0x33B7  => array(0x6D, 0x76),
-        0x33B8  => array(0x6B, 0x76),
-        0x33B9  => array(0x6D, 0x76),
-        0x33BA  => array(0x70, 0x77),
-        0x33BB  => array(0x6E, 0x77),
-        0x33BC  => array(0x3BC, 0x77),
-        0x33BD  => array(0x6D, 0x77),
-        0x33BE  => array(0x6B, 0x77),
-        0x33BF  => array(0x6D, 0x77),
-        0x33C0  => array(0x6B, 0x3C9),
-        0x33C1  => array(0x6D, 0x3C9),
-        /* 0x33C2  => array(0x61, 0x2E, 0x6D, 0x2E), */
-        0x33C3  => array(0x62, 0x71),
-        0x33C6  => array(0x63, 0x2215, 0x6B, 0x67),
-        0x33C7  => array(0x63, 0x6F, 0x2E),
-        0x33C8  => array(0x64, 0x62),
-        0x33C9  => array(0x67, 0x79),
-        0x33CB  => array(0x68, 0x70),
-        0x33CD  => array(0x6B, 0x6B),
-        0x33CE  => array(0x6B, 0x6D),
-        0x33D7  => array(0x70, 0x68),
-        0x33D9  => array(0x70, 0x70, 0x6D),
-        0x33DA  => array(0x70, 0x72),
-        0x33DC  => array(0x73, 0x76),
-        0x33DD  => array(0x77, 0x62),
-        0xFB00  => array(0x66, 0x66),
-        0xFB01  => array(0x66, 0x69),
-        0xFB02  => array(0x66, 0x6C),
-        0xFB03  => array(0x66, 0x66, 0x69),
-        0xFB04  => array(0x66, 0x66, 0x6C),
-        0xFB05  => array(0x73, 0x74),
-        0xFB06  => array(0x73, 0x74),
-        0xFB13  => array(0x574, 0x576),
-        0xFB14  => array(0x574, 0x565),
-        0xFB15  => array(0x574, 0x56B),
-        0xFB16  => array(0x57E, 0x576),
-        0xFB17  => array(0x574, 0x56D),
-        0xFF21  => array(0xFF41),
-        0xFF22  => array(0xFF42),
-        0xFF23  => array(0xFF43),
-        0xFF24  => array(0xFF44),
-        0xFF25  => array(0xFF45),
-        0xFF26  => array(0xFF46),
-        0xFF27  => array(0xFF47),
-        0xFF28  => array(0xFF48),
-        0xFF29  => array(0xFF49),
-        0xFF2A  => array(0xFF4A),
-        0xFF2B  => array(0xFF4B),
-        0xFF2C  => array(0xFF4C),
-        0xFF2D  => array(0xFF4D),
-        0xFF2E  => array(0xFF4E),
-        0xFF2F  => array(0xFF4F),
-        0xFF30  => array(0xFF50),
-        0xFF31  => array(0xFF51),
-        0xFF32  => array(0xFF52),
-        0xFF33  => array(0xFF53),
-        0xFF34  => array(0xFF54),
-        0xFF35  => array(0xFF55),
-        0xFF36  => array(0xFF56),
-        0xFF37  => array(0xFF57),
-        0xFF38  => array(0xFF58),
-        0xFF39  => array(0xFF59),
-        0xFF3A  => array(0xFF5A),
-        0x10400 => array(0x10428),
-        0x10401 => array(0x10429),
-        0x10402 => array(0x1042A),
-        0x10403 => array(0x1042B),
-        0x10404 => array(0x1042C),
-        0x10405 => array(0x1042D),
-        0x10406 => array(0x1042E),
-        0x10407 => array(0x1042F),
-        0x10408 => array(0x10430),
-        0x10409 => array(0x10431),
-        0x1040A => array(0x10432),
-        0x1040B => array(0x10433),
-        0x1040C => array(0x10434),
-        0x1040D => array(0x10435),
-        0x1040E => array(0x10436),
-        0x1040F => array(0x10437),
-        0x10410 => array(0x10438),
-        0x10411 => array(0x10439),
-        0x10412 => array(0x1043A),
-        0x10413 => array(0x1043B),
-        0x10414 => array(0x1043C),
-        0x10415 => array(0x1043D),
-        0x10416 => array(0x1043E),
-        0x10417 => array(0x1043F),
-        0x10418 => array(0x10440),
-        0x10419 => array(0x10441),
-        0x1041A => array(0x10442),
-        0x1041B => array(0x10443),
-        0x1041C => array(0x10444),
-        0x1041D => array(0x10445),
-        0x1041E => array(0x10446),
-        0x1041F => array(0x10447),
-        0x10420 => array(0x10448),
-        0x10421 => array(0x10449),
-        0x10422 => array(0x1044A),
-        0x10423 => array(0x1044B),
-        0x10424 => array(0x1044C),
-        0x10425 => array(0x1044D),
-        0x1D400 => array(0x61),
-        0x1D401 => array(0x62),
-        0x1D402 => array(0x63),
-        0x1D403 => array(0x64),
-        0x1D404 => array(0x65),
-        0x1D405 => array(0x66),
-        0x1D406 => array(0x67),
-        0x1D407 => array(0x68),
-        0x1D408 => array(0x69),
-        0x1D409 => array(0x6A),
-        0x1D40A => array(0x6B),
-        0x1D40B => array(0x6C),
-        0x1D40C => array(0x6D),
-        0x1D40D => array(0x6E),
-        0x1D40E => array(0x6F),
-        0x1D40F => array(0x70),
-        0x1D410 => array(0x71),
-        0x1D411 => array(0x72),
-        0x1D412 => array(0x73),
-        0x1D413 => array(0x74),
-        0x1D414 => array(0x75),
-        0x1D415 => array(0x76),
-        0x1D416 => array(0x77),
-        0x1D417 => array(0x78),
-        0x1D418 => array(0x79),
-        0x1D419 => array(0x7A),
-        0x1D434 => array(0x61),
-        0x1D435 => array(0x62),
-        0x1D436 => array(0x63),
-        0x1D437 => array(0x64),
-        0x1D438 => array(0x65),
-        0x1D439 => array(0x66),
-        0x1D43A => array(0x67),
-        0x1D43B => array(0x68),
-        0x1D43C => array(0x69),
-        0x1D43D => array(0x6A),
-        0x1D43E => array(0x6B),
-        0x1D43F => array(0x6C),
-        0x1D440 => array(0x6D),
-        0x1D441 => array(0x6E),
-        0x1D442 => array(0x6F),
-        0x1D443 => array(0x70),
-        0x1D444 => array(0x71),
-        0x1D445 => array(0x72),
-        0x1D446 => array(0x73),
-        0x1D447 => array(0x74),
-        0x1D448 => array(0x75),
-        0x1D449 => array(0x76),
-        0x1D44A => array(0x77),
-        0x1D44B => array(0x78),
-        0x1D44C => array(0x79),
-        0x1D44D => array(0x7A),
-        0x1D468 => array(0x61),
-        0x1D469 => array(0x62),
-        0x1D46A => array(0x63),
-        0x1D46B => array(0x64),
-        0x1D46C => array(0x65),
-        0x1D46D => array(0x66),
-        0x1D46E => array(0x67),
-        0x1D46F => array(0x68),
-        0x1D470 => array(0x69),
-        0x1D471 => array(0x6A),
-        0x1D472 => array(0x6B),
-        0x1D473 => array(0x6C),
-        0x1D474 => array(0x6D),
-        0x1D475 => array(0x6E),
-        0x1D476 => array(0x6F),
-        0x1D477 => array(0x70),
-        0x1D478 => array(0x71),
-        0x1D479 => array(0x72),
-        0x1D47A => array(0x73),
-        0x1D47B => array(0x74),
-        0x1D47C => array(0x75),
-        0x1D47D => array(0x76),
-        0x1D47E => array(0x77),
-        0x1D47F => array(0x78),
-        0x1D480 => array(0x79),
-        0x1D481 => array(0x7A),
-        0x1D49C => array(0x61),
-        0x1D49E => array(0x63),
-        0x1D49F => array(0x64),
-        0x1D4A2 => array(0x67),
-        0x1D4A5 => array(0x6A),
-        0x1D4A6 => array(0x6B),
-        0x1D4A9 => array(0x6E),
-        0x1D4AA => array(0x6F),
-        0x1D4AB => array(0x70),
-        0x1D4AC => array(0x71),
-        0x1D4AE => array(0x73),
-        0x1D4AF => array(0x74),
-        0x1D4B0 => array(0x75),
-        0x1D4B1 => array(0x76),
-        0x1D4B2 => array(0x77),
-        0x1D4B3 => array(0x78),
-        0x1D4B4 => array(0x79),
-        0x1D4B5 => array(0x7A),
-        0x1D4D0 => array(0x61),
-        0x1D4D1 => array(0x62),
-        0x1D4D2 => array(0x63),
-        0x1D4D3 => array(0x64),
-        0x1D4D4 => array(0x65),
-        0x1D4D5 => array(0x66),
-        0x1D4D6 => array(0x67),
-        0x1D4D7 => array(0x68),
-        0x1D4D8 => array(0x69),
-        0x1D4D9 => array(0x6A),
-        0x1D4DA => array(0x6B),
-        0x1D4DB => array(0x6C),
-        0x1D4DC => array(0x6D),
-        0x1D4DD => array(0x6E),
-        0x1D4DE => array(0x6F),
-        0x1D4DF => array(0x70),
-        0x1D4E0 => array(0x71),
-        0x1D4E1 => array(0x72),
-        0x1D4E2 => array(0x73),
-        0x1D4E3 => array(0x74),
-        0x1D4E4 => array(0x75),
-        0x1D4E5 => array(0x76),
-        0x1D4E6 => array(0x77),
-        0x1D4E7 => array(0x78),
-        0x1D4E8 => array(0x79),
-        0x1D4E9 => array(0x7A),
-        0x1D504 => array(0x61),
-        0x1D505 => array(0x62),
-        0x1D507 => array(0x64),
-        0x1D508 => array(0x65),
-        0x1D509 => array(0x66),
-        0x1D50A => array(0x67),
-        0x1D50D => array(0x6A),
-        0x1D50E => array(0x6B),
-        0x1D50F => array(0x6C),
-        0x1D510 => array(0x6D),
-        0x1D511 => array(0x6E),
-        0x1D512 => array(0x6F),
-        0x1D513 => array(0x70),
-        0x1D514 => array(0x71),
-        0x1D516 => array(0x73),
-        0x1D517 => array(0x74),
-        0x1D518 => array(0x75),
-        0x1D519 => array(0x76),
-        0x1D51A => array(0x77),
-        0x1D51B => array(0x78),
-        0x1D51C => array(0x79),
-        0x1D538 => array(0x61),
-        0x1D539 => array(0x62),
-        0x1D53B => array(0x64),
-        0x1D53C => array(0x65),
-        0x1D53D => array(0x66),
-        0x1D53E => array(0x67),
-        0x1D540 => array(0x69),
-        0x1D541 => array(0x6A),
-        0x1D542 => array(0x6B),
-        0x1D543 => array(0x6C),
-        0x1D544 => array(0x6D),
-        0x1D546 => array(0x6F),
-        0x1D54A => array(0x73),
-        0x1D54B => array(0x74),
-        0x1D54C => array(0x75),
-        0x1D54D => array(0x76),
-        0x1D54E => array(0x77),
-        0x1D54F => array(0x78),
-        0x1D550 => array(0x79),
-        0x1D56C => array(0x61),
-        0x1D56D => array(0x62),
-        0x1D56E => array(0x63),
-        0x1D56F => array(0x64),
-        0x1D570 => array(0x65),
-        0x1D571 => array(0x66),
-        0x1D572 => array(0x67),
-        0x1D573 => array(0x68),
-        0x1D574 => array(0x69),
-        0x1D575 => array(0x6A),
-        0x1D576 => array(0x6B),
-        0x1D577 => array(0x6C),
-        0x1D578 => array(0x6D),
-        0x1D579 => array(0x6E),
-        0x1D57A => array(0x6F),
-        0x1D57B => array(0x70),
-        0x1D57C => array(0x71),
-        0x1D57D => array(0x72),
-        0x1D57E => array(0x73),
-        0x1D57F => array(0x74),
-        0x1D580 => array(0x75),
-        0x1D581 => array(0x76),
-        0x1D582 => array(0x77),
-        0x1D583 => array(0x78),
-        0x1D584 => array(0x79),
-        0x1D585 => array(0x7A),
-        0x1D5A0 => array(0x61),
-        0x1D5A1 => array(0x62),
-        0x1D5A2 => array(0x63),
-        0x1D5A3 => array(0x64),
-        0x1D5A4 => array(0x65),
-        0x1D5A5 => array(0x66),
-        0x1D5A6 => array(0x67),
-        0x1D5A7 => array(0x68),
-        0x1D5A8 => array(0x69),
-        0x1D5A9 => array(0x6A),
-        0x1D5AA => array(0x6B),
-        0x1D5AB => array(0x6C),
-        0x1D5AC => array(0x6D),
-        0x1D5AD => array(0x6E),
-        0x1D5AE => array(0x6F),
-        0x1D5AF => array(0x70),
-        0x1D5B0 => array(0x71),
-        0x1D5B1 => array(0x72),
-        0x1D5B2 => array(0x73),
-        0x1D5B3 => array(0x74),
-        0x1D5B4 => array(0x75),
-        0x1D5B5 => array(0x76),
-        0x1D5B6 => array(0x77),
-        0x1D5B7 => array(0x78),
-        0x1D5B8 => array(0x79),
-        0x1D5B9 => array(0x7A),
-        0x1D5D4 => array(0x61),
-        0x1D5D5 => array(0x62),
-        0x1D5D6 => array(0x63),
-        0x1D5D7 => array(0x64),
-        0x1D5D8 => array(0x65),
-        0x1D5D9 => array(0x66),
-        0x1D5DA => array(0x67),
-        0x1D5DB => array(0x68),
-        0x1D5DC => array(0x69),
-        0x1D5DD => array(0x6A),
-        0x1D5DE => array(0x6B),
-        0x1D5DF => array(0x6C),
-        0x1D5E0 => array(0x6D),
-        0x1D5E1 => array(0x6E),
-        0x1D5E2 => array(0x6F),
-        0x1D5E3 => array(0x70),
-        0x1D5E4 => array(0x71),
-        0x1D5E5 => array(0x72),
-        0x1D5E6 => array(0x73),
-        0x1D5E7 => array(0x74),
-        0x1D5E8 => array(0x75),
-        0x1D5E9 => array(0x76),
-        0x1D5EA => array(0x77),
-        0x1D5EB => array(0x78),
-        0x1D5EC => array(0x79),
-        0x1D5ED => array(0x7A),
-        0x1D608 => array(0x61),
-        0x1D609 => array(0x62),
-        0x1D60A => array(0x63),
-        0x1D60B => array(0x64),
-        0x1D60C => array(0x65),
-        0x1D60D => array(0x66),
-        0x1D60E => array(0x67),
-        0x1D60F => array(0x68),
-        0x1D610 => array(0x69),
-        0x1D611 => array(0x6A),
-        0x1D612 => array(0x6B),
-        0x1D613 => array(0x6C),
-        0x1D614 => array(0x6D),
-        0x1D615 => array(0x6E),
-        0x1D616 => array(0x6F),
-        0x1D617 => array(0x70),
-        0x1D618 => array(0x71),
-        0x1D619 => array(0x72),
-        0x1D61A => array(0x73),
-        0x1D61B => array(0x74),
-        0x1D61C => array(0x75),
-        0x1D61D => array(0x76),
-        0x1D61E => array(0x77),
-        0x1D61F => array(0x78),
-        0x1D620 => array(0x79),
-        0x1D621 => array(0x7A),
-        0x1D63C => array(0x61),
-        0x1D63D => array(0x62),
-        0x1D63E => array(0x63),
-        0x1D63F => array(0x64),
-        0x1D640 => array(0x65),
-        0x1D641 => array(0x66),
-        0x1D642 => array(0x67),
-        0x1D643 => array(0x68),
-        0x1D644 => array(0x69),
-        0x1D645 => array(0x6A),
-        0x1D646 => array(0x6B),
-        0x1D647 => array(0x6C),
-        0x1D648 => array(0x6D),
-        0x1D649 => array(0x6E),
-        0x1D64A => array(0x6F),
-        0x1D64B => array(0x70),
-        0x1D64C => array(0x71),
-        0x1D64D => array(0x72),
-        0x1D64E => array(0x73),
-        0x1D64F => array(0x74),
-        0x1D650 => array(0x75),
-        0x1D651 => array(0x76),
-        0x1D652 => array(0x77),
-        0x1D653 => array(0x78),
-        0x1D654 => array(0x79),
-        0x1D655 => array(0x7A),
-        0x1D670 => array(0x61),
-        0x1D671 => array(0x62),
-        0x1D672 => array(0x63),
-        0x1D673 => array(0x64),
-        0x1D674 => array(0x65),
-        0x1D675 => array(0x66),
-        0x1D676 => array(0x67),
-        0x1D677 => array(0x68),
-        0x1D678 => array(0x69),
-        0x1D679 => array(0x6A),
-        0x1D67A => array(0x6B),
-        0x1D67B => array(0x6C),
-        0x1D67C => array(0x6D),
-        0x1D67D => array(0x6E),
-        0x1D67E => array(0x6F),
-        0x1D67F => array(0x70),
-        0x1D680 => array(0x71),
-        0x1D681 => array(0x72),
-        0x1D682 => array(0x73),
-        0x1D683 => array(0x74),
-        0x1D684 => array(0x75),
-        0x1D685 => array(0x76),
-        0x1D686 => array(0x77),
-        0x1D687 => array(0x78),
-        0x1D688 => array(0x79),
-        0x1D689 => array(0x7A),
-        0x1D6A8 => array(0x3B1),
-        0x1D6A9 => array(0x3B2),
-        0x1D6AA => array(0x3B3),
-        0x1D6AB => array(0x3B4),
-        0x1D6AC => array(0x3B5),
-        0x1D6AD => array(0x3B6),
-        0x1D6AE => array(0x3B7),
-        0x1D6AF => array(0x3B8),
-        0x1D6B0 => array(0x3B9),
-        0x1D6B1 => array(0x3BA),
-        0x1D6B2 => array(0x3BB),
-        0x1D6B3 => array(0x3BC),
-        0x1D6B4 => array(0x3BD),
-        0x1D6B5 => array(0x3BE),
-        0x1D6B6 => array(0x3BF),
-        0x1D6B7 => array(0x3C0),
-        0x1D6B8 => array(0x3C1),
-        0x1D6B9 => array(0x3B8),
-        0x1D6BA => array(0x3C3),
-        0x1D6BB => array(0x3C4),
-        0x1D6BC => array(0x3C5),
-        0x1D6BD => array(0x3C6),
-        0x1D6BE => array(0x3C7),
-        0x1D6BF => array(0x3C8),
-        0x1D6C0 => array(0x3C9),
-        0x1D6D3 => array(0x3C3),
-        0x1D6E2 => array(0x3B1),
-        0x1D6E3 => array(0x3B2),
-        0x1D6E4 => array(0x3B3),
-        0x1D6E5 => array(0x3B4),
-        0x1D6E6 => array(0x3B5),
-        0x1D6E7 => array(0x3B6),
-        0x1D6E8 => array(0x3B7),
-        0x1D6E9 => array(0x3B8),
-        0x1D6EA => array(0x3B9),
-        0x1D6EB => array(0x3BA),
-        0x1D6EC => array(0x3BB),
-        0x1D6ED => array(0x3BC),
-        0x1D6EE => array(0x3BD),
-        0x1D6EF => array(0x3BE),
-        0x1D6F0 => array(0x3BF),
-        0x1D6F1 => array(0x3C0),
-        0x1D6F2 => array(0x3C1),
-        0x1D6F3 => array(0x3B8),
-        0x1D6F4 => array(0x3C3),
-        0x1D6F5 => array(0x3C4),
-        0x1D6F6 => array(0x3C5),
-        0x1D6F7 => array(0x3C6),
-        0x1D6F8 => array(0x3C7),
-        0x1D6F9 => array(0x3C8),
-        0x1D6FA => array(0x3C9),
-        0x1D70D => array(0x3C3),
-        0x1D71C => array(0x3B1),
-        0x1D71D => array(0x3B2),
-        0x1D71E => array(0x3B3),
-        0x1D71F => array(0x3B4),
-        0x1D720 => array(0x3B5),
-        0x1D721 => array(0x3B6),
-        0x1D722 => array(0x3B7),
-        0x1D723 => array(0x3B8),
-        0x1D724 => array(0x3B9),
-        0x1D725 => array(0x3BA),
-        0x1D726 => array(0x3BB),
-        0x1D727 => array(0x3BC),
-        0x1D728 => array(0x3BD),
-        0x1D729 => array(0x3BE),
-        0x1D72A => array(0x3BF),
-        0x1D72B => array(0x3C0),
-        0x1D72C => array(0x3C1),
-        0x1D72D => array(0x3B8),
-        0x1D72E => array(0x3C3),
-        0x1D72F => array(0x3C4),
-        0x1D730 => array(0x3C5),
-        0x1D731 => array(0x3C6),
-        0x1D732 => array(0x3C7),
-        0x1D733 => array(0x3C8),
-        0x1D734 => array(0x3C9),
-        0x1D747 => array(0x3C3),
-        0x1D756 => array(0x3B1),
-        0x1D757 => array(0x3B2),
-        0x1D758 => array(0x3B3),
-        0x1D759 => array(0x3B4),
-        0x1D75A => array(0x3B5),
-        0x1D75B => array(0x3B6),
-        0x1D75C => array(0x3B7),
-        0x1D75D => array(0x3B8),
-        0x1D75E => array(0x3B9),
-        0x1D75F => array(0x3BA),
-        0x1D760 => array(0x3BB),
-        0x1D761 => array(0x3BC),
-        0x1D762 => array(0x3BD),
-        0x1D763 => array(0x3BE),
-        0x1D764 => array(0x3BF),
-        0x1D765 => array(0x3C0),
-        0x1D766 => array(0x3C1),
-        0x1D767 => array(0x3B8),
-        0x1D768 => array(0x3C3),
-        0x1D769 => array(0x3C4),
-        0x1D76A => array(0x3C5),
-        0x1D76B => array(0x3C6),
-        0x1D76C => array(0x3C7),
-        0x1D76D => array(0x3C8),
-        0x1D76E => array(0x3C9),
-        0x1D781 => array(0x3C3),
-        0x1D790 => array(0x3B1),
-        0x1D791 => array(0x3B2),
-        0x1D792 => array(0x3B3),
-        0x1D793 => array(0x3B4),
-        0x1D794 => array(0x3B5),
-        0x1D795 => array(0x3B6),
-        0x1D796 => array(0x3B7),
-        0x1D797 => array(0x3B8),
-        0x1D798 => array(0x3B9),
-        0x1D799 => array(0x3BA),
-        0x1D79A => array(0x3BB),
-        0x1D79B => array(0x3BC),
-        0x1D79C => array(0x3BD),
-        0x1D79D => array(0x3BE),
-        0x1D79E => array(0x3BF),
-        0x1D79F => array(0x3C0),
-        0x1D7A0 => array(0x3C1),
-        0x1D7A1 => array(0x3B8),
-        0x1D7A2 => array(0x3C3),
-        0x1D7A3 => array(0x3C4),
-        0x1D7A4 => array(0x3C5),
-        0x1D7A5 => array(0x3C6),
-        0x1D7A6 => array(0x3C7),
-        0x1D7A7 => array(0x3C8),
-        0x1D7A8 => array(0x3C9),
-        0x1D7BB => array(0x3C3),
-        0x3F9   => array(0x3C3),
-        0x1D2C  => array(0x61),
-        0x1D2D  => array(0xE6),
-        0x1D2E  => array(0x62),
-        0x1D30  => array(0x64),
-        0x1D31  => array(0x65),
-        0x1D32  => array(0x1DD),
-        0x1D33  => array(0x67),
-        0x1D34  => array(0x68),
-        0x1D35  => array(0x69),
-        0x1D36  => array(0x6A),
-        0x1D37  => array(0x6B),
-        0x1D38  => array(0x6C),
-        0x1D39  => array(0x6D),
-        0x1D3A  => array(0x6E),
-        0x1D3C  => array(0x6F),
-        0x1D3D  => array(0x223),
-        0x1D3E  => array(0x70),
-        0x1D3F  => array(0x72),
-        0x1D40  => array(0x74),
-        0x1D41  => array(0x75),
-        0x1D42  => array(0x77),
-        0x213B  => array(0x66, 0x61, 0x78),
-        0x3250  => array(0x70, 0x74, 0x65),
-        0x32CC  => array(0x68, 0x67),
-        0x32CE  => array(0x65, 0x76),
-        0x32CF  => array(0x6C, 0x74, 0x64),
-        0x337A  => array(0x69, 0x75),
-        0x33DE  => array(0x76, 0x2215, 0x6D),
-        0x33DF  => array(0x61, 0x2215, 0x6D)
-    );
-
-    /**
-     * Normalization Combining Classes; Code Points not listed
-     * got Combining Class 0.
-     *
-     * @static
-     * @var array
-     * @access private
-     */
-    private static $_np_norm_combcls = array(
-        0x334   => 1,
-        0x335   => 1,
-        0x336   => 1,
-        0x337   => 1,
-        0x338   => 1,
-        0x93C   => 7,
-        0x9BC   => 7,
-        0xA3C   => 7,
-        0xABC   => 7,
-        0xB3C   => 7,
-        0xCBC   => 7,
-        0x1037  => 7,
-        0x3099  => 8,
-        0x309A  => 8,
-        0x94D   => 9,
-        0x9CD   => 9,
-        0xA4D   => 9,
-        0xACD   => 9,
-        0xB4D   => 9,
-        0xBCD   => 9,
-        0xC4D   => 9,
-        0xCCD   => 9,
-        0xD4D   => 9,
-        0xDCA   => 9,
-        0xE3A   => 9,
-        0xF84   => 9,
-        0x1039  => 9,
-        0x1714  => 9,
-        0x1734  => 9,
-        0x17D2  => 9,
-        0x5B0   => 10,
-        0x5B1   => 11,
-        0x5B2   => 12,
-        0x5B3   => 13,
-        0x5B4   => 14,
-        0x5B5   => 15,
-        0x5B6   => 16,
-        0x5B7   => 17,
-        0x5B8   => 18,
-        0x5B9   => 19,
-        0x5BB   => 20,
-        0x5Bc   => 21,
-        0x5BD   => 22,
-        0x5BF   => 23,
-        0x5C1   => 24,
-        0x5C2   => 25,
-        0xFB1E  => 26,
-        0x64B   => 27,
-        0x64C   => 28,
-        0x64D   => 29,
-        0x64E   => 30,
-        0x64F   => 31,
-        0x650   => 32,
-        0x651   => 33,
-        0x652   => 34,
-        0x670   => 35,
-        0x711   => 36,
-        0xC55   => 84,
-        0xC56   => 91,
-        0xE38   => 103,
-        0xE39   => 103,
-        0xE48   => 107,
-        0xE49   => 107,
-        0xE4A   => 107,
-        0xE4B   => 107,
-        0xEB8   => 118,
-        0xEB9   => 118,
-        0xEC8   => 122,
-        0xEC9   => 122,
-        0xECA   => 122,
-        0xECB   => 122,
-        0xF71   => 129,
-        0xF72   => 130,
-        0xF7A   => 130,
-        0xF7B   => 130,
-        0xF7C   => 130,
-        0xF7D   => 130,
-        0xF80   => 130,
-        0xF74   => 132,
-        0x321   => 202,
-        0x322   => 202,
-        0x327   => 202,
-        0x328   => 202,
-        0x31B   => 216,
-        0xF39   => 216,
-        0x1D165 => 216,
-        0x1D166 => 216,
-        0x1D16E => 216,
-        0x1D16F => 216,
-        0x1D170 => 216,
-        0x1D171 => 216,
-        0x1D172 => 216,
-        0x302A  => 218,
-        0x316   => 220,
-        0x317   => 220,
-        0x318   => 220,
-        0x319   => 220,
-        0x31C   => 220,
-        0x31D   => 220,
-        0x31E   => 220,
-        0x31F   => 220,
-        0x320   => 220,
-        0x323   => 220,
-        0x324   => 220,
-        0x325   => 220,
-        0x326   => 220,
-        0x329   => 220,
-        0x32A   => 220,
-        0x32B   => 220,
-        0x32C   => 220,
-        0x32D   => 220,
-        0x32E   => 220,
-        0x32F   => 220,
-        0x330   => 220,
-        0x331   => 220,
-        0x332   => 220,
-        0x333   => 220,
-        0x339   => 220,
-        0x33A   => 220,
-        0x33B   => 220,
-        0x33C   => 220,
-        0x347   => 220,
-        0x348   => 220,
-        0x349   => 220,
-        0x34D   => 220,
-        0x34E   => 220,
-        0x353   => 220,
-        0x354   => 220,
-        0x355   => 220,
-        0x356   => 220,
-        0x591   => 220,
-        0x596   => 220,
-        0x59B   => 220,
-        0x5A3   => 220,
-        0x5A4   => 220,
-        0x5A5   => 220,
-        0x5A6   => 220,
-        0x5A7   => 220,
-        0x5AA   => 220,
-        0x655   => 220,
-        0x656   => 220,
-        0x6E3   => 220,
-        0x6EA   => 220,
-        0x6ED   => 220,
-        0x731   => 220,
-        0x734   => 220,
-        0x737   => 220,
-        0x738   => 220,
-        0x739   => 220,
-        0x73B   => 220,
-        0x73C   => 220,
-        0x73E   => 220,
-        0x742   => 220,
-        0x744   => 220,
-        0x746   => 220,
-        0x748   => 220,
-        0x952   => 220,
-        0xF18   => 220,
-        0xF19   => 220,
-        0xF35   => 220,
-        0xF37   => 220,
-        0xFC6   => 220,
-        0x193B  => 220,
-        0x20E8  => 220,
-        0x1D17B => 220,
-        0x1D17C => 220,
-        0x1D17D => 220,
-        0x1D17E => 220,
-        0x1D17F => 220,
-        0x1D180 => 220,
-        0x1D181 => 220,
-        0x1D182 => 220,
-        0x1D18A => 220,
-        0x1D18B => 220,
-        0x59A   => 222,
-        0x5AD   => 222,
-        0x1929  => 222,
-        0x302D  => 222,
-        0x302E  => 224,
-        0x302F  => 224,
-        0x1D16D => 226,
-        0x5AE   => 228,
-        0x18A9  => 228,
-        0x302B  => 228,
-        0x300   => 230,
-        0x301   => 230,
-        0x302   => 230,
-        0x303   => 230,
-        0x304   => 230,
-        0x305   => 230,
-        0x306   => 230,
-        0x307   => 230,
-        0x308   => 230,
-        0x309   => 230,
-        0x30A   => 230,
-        0x30B   => 230,
-        0x30C   => 230,
-        0x30D   => 230,
-        0x30E   => 230,
-        0x30F   => 230,
-        0x310   => 230,
-        0x311   => 230,
-        0x312   => 230,
-        0x313   => 230,
-        0x314   => 230,
-        0x33D   => 230,
-        0x33E   => 230,
-        0x33F   => 230,
-        0x340   => 230,
-        0x341   => 230,
-        0x342   => 230,
-        0x343   => 230,
-        0x344   => 230,
-        0x346   => 230,
-        0x34A   => 230,
-        0x34B   => 230,
-        0x34C   => 230,
-        0x350   => 230,
-        0x351   => 230,
-        0x352   => 230,
-        0x357   => 230,
-        0x363   => 230,
-        0x364   => 230,
-        0x365   => 230,
-        0x366   => 230,
-        0x367   => 230,
-        0x368   => 230,
-        0x369   => 230,
-        0x36A   => 230,
-        0x36B   => 230,
-        0x36C   => 230,
-        0x36D   => 230,
-        0x36E   => 230,
-        0x36F   => 230,
-        0x483   => 230,
-        0x484   => 230,
-        0x485   => 230,
-        0x486   => 230,
-        0x592   => 230,
-        0x593   => 230,
-        0x594   => 230,
-        0x595   => 230,
-        0x597   => 230,
-        0x598   => 230,
-        0x599   => 230,
-        0x59C   => 230,
-        0x59D   => 230,
-        0x59E   => 230,
-        0x59F   => 230,
-        0x5A0   => 230,
-        0x5A1   => 230,
-        0x5A8   => 230,
-        0x5A9   => 230,
-        0x5AB   => 230,
-        0x5AC   => 230,
-        0x5AF   => 230,
-        0x5C4   => 230,
-        0x610   => 230,
-        0x611   => 230,
-        0x612   => 230,
-        0x613   => 230,
-        0x614   => 230,
-        0x615   => 230,
-        0x653   => 230,
-        0x654   => 230,
-        0x657   => 230,
-        0x658   => 230,
-        0x6D6   => 230,
-        0x6D7   => 230,
-        0x6D8   => 230,
-        0x6D9   => 230,
-        0x6DA   => 230,
-        0x6DB   => 230,
-        0x6DC   => 230,
-        0x6DF   => 230,
-        0x6E0   => 230,
-        0x6E1   => 230,
-        0x6E2   => 230,
-        0x6E4   => 230,
-        0x6E7   => 230,
-        0x6E8   => 230,
-        0x6EB   => 230,
-        0x6EC   => 230,
-        0x730   => 230,
-        0x732   => 230,
-        0x733   => 230,
-        0x735   => 230,
-        0x736   => 230,
-        0x73A   => 230,
-        0x73D   => 230,
-        0x73F   => 230,
-        0x740   => 230,
-        0x741   => 230,
-        0x743   => 230,
-        0x745   => 230,
-        0x747   => 230,
-        0x749   => 230,
-        0x74A   => 230,
-        0x951   => 230,
-        0x953   => 230,
-        0x954   => 230,
-        0xF82   => 230,
-        0xF83   => 230,
-        0xF86   => 230,
-        0xF87   => 230,
-        0x170D  => 230,
-        0x193A  => 230,
-        0x20D0  => 230,
-        0x20D1  => 230,
-        0x20D4  => 230,
-        0x20D5  => 230,
-        0x20D6  => 230,
-        0x20D7  => 230,
-        0x20DB  => 230,
-        0x20DC  => 230,
-        0x20E1  => 230,
-        0x20E7  => 230,
-        0x20E9  => 230,
-        0xFE20  => 230,
-        0xFE21  => 230,
-        0xFE22  => 230,
-        0xFE23  => 230,
-        0x1D185 => 230,
-        0x1D186 => 230,
-        0x1D187 => 230,
-        0x1D189 => 230,
-        0x1D188 => 230,
-        0x1D1AA => 230,
-        0x1D1AB => 230,
-        0x1D1AC => 230,
-        0x1D1AD => 230,
-        0x315   => 232,
-        0x31A   => 232,
-        0x302C  => 232,
-        0x35F   => 233,
-        0x362   => 233,
-        0x35D   => 234,
-        0x35E   => 234,
-        0x360   => 234,
-        0x361   => 234,
-        0x345   => 240
-    );
-    // }}}
-
-    // {{{ properties
-    /**
-     * @var string
-     * @access private
-     */
-    private $_punycode_prefix = 'xn--';
-
-    /**
-     * @access private
-     */
-    private $_invalid_ucs = 0x80000000;
-
-    /**
-     * @access private
-     */
-    private $_max_ucs = 0x10FFFF;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_base = 36;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_tmin = 1;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_tmax = 26;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_skew = 38;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_damp = 700;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_initial_bias = 72;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_initial_n = 0x80;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_slast;
-
-    /**
-     * @access private
-     */
-    private $_sbase = 0xAC00;
-
-    /**
-     * @access private
-     */
-    private $_lbase = 0x1100;
-
-    /**
-     * @access private
-     */
-    private $_vbase = 0x1161;
-
-    /**
-     * @access private
-     */
-    private $_tbase = 0x11a7;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_lcount = 19;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_vcount = 21;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_tcount = 28;
-
-    /**
-     * vcount * tcount
-     *
-     * @var int
-     * @access private
-     */
-    private $_ncount = 588;
-
-    /**
-     * lcount * tcount * vcount
-     *
-     * @var int
-     * @access private
-     */
-    private $_scount = 11172;
-
-    /**
-     * Default encoding for encode()'s input and decode()'s output is UTF-8;
-     * Other possible encodings are ucs4_string and ucs4_array
-     * See {@link setParams()} for how to select these
-     *
-     * @var bool
-     * @access private
-     */
-    private $_api_encoding = 'utf8';
-
-    /**
-     * Overlong UTF-8 encodings are forbidden
-     *
-     * @var bool
-     * @access private
-     */
-    private $_allow_overlong = false;
-
-    /**
-     * Behave strict or not
-     *
-     * @var bool
-     * @access private
-     */
-    private $_strict_mode = false;
-
-    /**
-     * IDNA-version to use
-     *
-     * Values are "2003" and "2008".
-     * Defaults to "2003", since that was the original version and for
-     * compatibility with previous versions of this library.
-     * If you need to encode "new" characters like the German "Eszett",
-     * please switch to 2008 first before encoding.
-     *
-     * @var bool
-     * @access private
-     */
-    private $_version = '2003';
-
-    /**
-     * Cached value indicating whether or not mbstring function overloading is
-     * on for strlen
-     *
-     * This is cached for optimal performance.
-     *
-     * @var boolean
-     * @see Net_IDNA2::_byteLength()
-     */
-    private static $_mb_string_overload = null;
-    // }}}
-
-
-    // {{{ constructor
-    /**
-     * Constructor
-     *
-     * @param array $options Options to initialise the object with
-     *
-     * @access public
-     * @see    setParams()
-     */
-    public function __construct($options = null)
-    {
-        $this->_slast = $this->_sbase + $this->_lcount * $this->_vcount * $this->_tcount;
-
-        if (is_array($options)) {
-            $this->setParams($options);
-        }
-
-        // populate mbstring overloading cache if not set
-        if (self::$_mb_string_overload === null) {
-            self::$_mb_string_overload = (extension_loaded('mbstring')
-                && (ini_get('mbstring.func_overload') & 0x02) === 0x02);
-        }
-    }
-    // }}}
-
-
-    /**
-     * Sets a new option value. Available options and values:
-     *
-     * [utf8 -     Use either UTF-8 or ISO-8859-1 as input (true for UTF-8, false
-     *             otherwise); The output is always UTF-8]
-     * [overlong - Unicode does not allow unnecessarily long encodings of chars,
-     *             to allow this, set this parameter to true, else to false;
-     *             default is false.]
-     * [strict -   true: strict mode, good for registration purposes - Causes errors
-     *             on failures; false: loose mode, ideal for "wildlife" applications
-     *             by silently ignoring errors and returning the original input instead]
-     *
-     * @param mixed  $option Parameter to set (string: single parameter; array of Parameter => Value pairs)
-     * @param string $value  Value to use (if parameter 1 is a string)
-     *
-     * @return boolean       true on success, false otherwise
-     * @access public
-     */
-    public function setParams($option, $value = false)
-    {
-        if (!is_array($option)) {
-            $option = array($option => $value);
-        }
-
-        foreach ($option as $k => $v) {
-            switch ($k) {
-            case 'encoding':
-                switch ($v) {
-                case 'utf8':
-                case 'ucs4_string':
-                case 'ucs4_array':
-                    $this->_api_encoding = $v;
-                    break;
-
-                default:
-                    throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k);
-                }
-
-                break;
-
-            case 'overlong':
-                $this->_allow_overlong = ($v) ? true : false;
-                break;
-
-            case 'strict':
-                $this->_strict_mode = ($v) ? true : false;
-                break;
-
-            case 'version':
-                if (in_array($v, array('2003', '2008'))) {
-                    $this->_version = $v;
-                } else {
-                    throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k);
-                }
-                break;
-
-            default:
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Encode a given UTF-8 domain name.
-     *
-     * @param string $decoded           Domain name (UTF-8 or UCS-4)
-     * @param string $one_time_encoding Desired input encoding, see {@link set_parameter}
-     *                                  If not given will use default-encoding
-     *
-     * @return string Encoded Domain name (ACE string)
-     * @return mixed  processed string
-     * @throws Exception
-     * @access public
-     */
-    public function encode($decoded, $one_time_encoding = false)
-    {
-        // Forcing conversion of input to UCS4 array
-        // If one time encoding is given, use this, else the objects property
-        switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            $decoded = $this->_utf8_to_ucs4($decoded);
-            break;
-        case 'ucs4_string':
-            $decoded = $this->_ucs4_string_to_ucs4($decoded);
-        case 'ucs4_array': // No break; before this line. Catch case, but do nothing
-            break;
-        default:
-            throw new InvalidArgumentException('Unsupported input format');
-        }
-
-        // No input, no output, what else did you expect?
-        if (empty($decoded)) return '';
-
-        // Anchors for iteration
-        $last_begin = 0;
-        // Output string
-        $output = '';
-
-        foreach ($decoded as $k => $v) {
-            // Make sure to use just the plain dot
-            switch($v) {
-            case 0x3002:
-            case 0xFF0E:
-            case 0xFF61:
-                $decoded[$k] = 0x2E;
-                // It's right, no break here
-                // The codepoints above have to be converted to dots anyway
-
-            // Stumbling across an anchoring character
-            case 0x2E:
-            case 0x2F:
-            case 0x3A:
-            case 0x3F:
-            case 0x40:
-                // Neither email addresses nor URLs allowed in strict mode
-                if ($this->_strict_mode) {
-                    throw new InvalidArgumentException('Neither email addresses nor URLs are allowed in strict mode.');
-                }
-                // Skip first char
-                if ($k) {
-                    $encoded = '';
-                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
-                    if ($encoded) {
-                        $output .= $encoded;
-                    } else {
-                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
-                    }
-                    $output .= chr($decoded[$k]);
-                }
-                $last_begin = $k + 1;
-            }
-        }
-        // Catch the rest of the string
-        if ($last_begin) {
-            $inp_len = sizeof($decoded);
-            $encoded = '';
-            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
-            if ($encoded) {
-                $output .= $encoded;
-            } else {
-                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
-            }
-            return $output;
-        }
-
-        if ($output = $this->_encode($decoded)) {
-            return $output;
-        }
-
-        return $this->_ucs4_to_utf8($decoded);
-    }
-
-    /**
-     * Decode a given ACE domain name.
-     *
-     * @param string $input             Domain name (ACE string)
-     * @param string $one_time_encoding Desired output encoding, see {@link set_parameter}
-     *
-     * @return string                   Decoded Domain name (UTF-8 or UCS-4)
-     * @throws Exception
-     * @access public
-     */
-    public function decode($input, $one_time_encoding = false)
-    {
-        // Optionally set
-        if ($one_time_encoding) {
-            switch ($one_time_encoding) {
-            case 'utf8':
-            case 'ucs4_string':
-            case 'ucs4_array':
-                break;
-            default:
-                throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding);
-            }
-        }
-        // Make sure to drop any newline characters around
-        $input = trim($input);
-
-        // Negotiate input and try to determine, wether it is a plain string,
-        // an email address or something like a complete URL
-        if (strpos($input, '@')) { // Maybe it is an email address
-            // No no in strict mode
-            if ($this->_strict_mode) {
-                throw new InvalidArgumentException('Only simple domain name parts can be handled in strict mode');
-            }
-            list($email_pref, $input) = explode('@', $input, 2);
-            $arr = explode('.', $input);
-            foreach ($arr as $k => $v) {
-                $conv = $this->_decode($v);
-                if ($conv) $arr[$k] = $conv;
-            }
-            $return = $email_pref . '@' . join('.', $arr);
-        } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
-            // No no in strict mode
-            if ($this->_strict_mode) {
-                throw new InvalidArgumentException('Only simple domain name parts can be handled in strict mode');
-            }
-
-            $parsed = parse_url($input);
-            if (isset($parsed['host'])) {
-                $arr = explode('.', $parsed['host']);
-                foreach ($arr as $k => $v) {
-                    $conv = $this->_decode($v);
-                    if ($conv) $arr[$k] = $conv;
-                }
-                $parsed['host'] = join('.', $arr);
-                if (isset($parsed['scheme'])) {
-                    $parsed['scheme'] .= (strtolower($parsed['scheme']) == 'mailto') ? ':' : '://';
-                }
-                $return = $this->_unparse_url($parsed);
-            } else { // parse_url seems to have failed, try without it
-                $arr = explode('.', $input);
-                foreach ($arr as $k => $v) {
-                    $conv = $this->_decode($v);
-                    if ($conv) $arr[$k] = $conv;
-                }
-                $return = join('.', $arr);
-            }
-        } else { // Otherwise we consider it being a pure domain name string
-            $return = $this->_decode($input);
-        }
-        // The output is UTF-8 by default, other output formats need conversion here
-        // If one time encoding is given, use this, else the objects property
-        switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            return $return;
-            break;
-        case 'ucs4_string':
-            return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
-            break;
-        case 'ucs4_array':
-            return $this->_utf8_to_ucs4($return);
-            break;
-        default:
-            throw new InvalidArgumentException('Unsupported output format');
-        }
-    }
-
-
-    // {{{ private
-    /**
-     * Opposite function to parse_url()
-     *
-     * Inspired by code from comments of php.net-documentation for parse_url()
-     *
-     * @param array $parts_arr parts (strings) as returned by parse_url()
-     *
-     * @return string
-     * @access private
-     */
-    private function _unparse_url($parts_arr)
-    {
-        if (!empty($parts_arr['scheme'])) {
-            $ret_url = $parts_arr['scheme'];
-        }
-        if (!empty($parts_arr['user'])) {
-            $ret_url .= $parts_arr['user'];
-            if (!empty($parts_arr['pass'])) {
-                $ret_url .= ':' . $parts_arr['pass'];
-            }
-            $ret_url .= '@';
-        }
-        $ret_url .= $parts_arr['host'];
-        if (!empty($parts_arr['port'])) {
-            $ret_url .= ':' . $parts_arr['port'];
-        }
-        $ret_url .= $parts_arr['path'];
-        if (!empty($parts_arr['query'])) {
-            $ret_url .= '?' . $parts_arr['query'];
-        }
-        if (!empty($parts_arr['fragment'])) {
-            $ret_url .= '#' . $parts_arr['fragment'];
-        }
-        return $ret_url;
-    }
-
-    /**
-     * The actual encoding algorithm.
-     *
-     * @param string $decoded Decoded string which should be encoded
-     *
-     * @return string         Encoded string
-     * @throws Exception
-     * @access private
-     */
-    private function _encode($decoded)
-    {
-        // We cannot encode a domain name containing the Punycode prefix
-        $extract = self::_byteLength($this->_punycode_prefix);
-        $check_pref = $this->_utf8_to_ucs4($this->_punycode_prefix);
-        $check_deco = array_slice($decoded, 0, $extract);
-
-        if ($check_pref == $check_deco) {
-            throw new InvalidArgumentException('This is already a punycode string');
-        }
-
-        // We will not try to encode strings consisting of basic code points only
-        $encodable = false;
-        foreach ($decoded as $k => $v) {
-            if ($v > 0x7a) {
-                $encodable = true;
-                break;
-            }
-        }
-        if (!$encodable) {
-            if ($this->_strict_mode) {
-                throw new InvalidArgumentException('The given string does not contain encodable chars');
-            }
-
-            return false;
-        }
-
-        // Do NAMEPREP
-        $decoded = $this->_nameprep($decoded);
-
-        $deco_len = count($decoded);
-
-        // Empty array
-        if (!$deco_len) {
-            return false;
-        }
-
-        // How many chars have been consumed
-        $codecount = 0;
-
-        // Start with the prefix; copy it to output
-        $encoded = $this->_punycode_prefix;
-
-        $encoded = '';
-        // Copy all basic code points to output
-        for ($i = 0; $i < $deco_len; ++$i) {
-            $test = $decoded[$i];
-            // Will match [0-9a-zA-Z-]
-            if ((0x2F < $test && $test < 0x40)
-                || (0x40 < $test && $test < 0x5B)
-                || (0x60 < $test && $test <= 0x7B)
-                || (0x2D == $test)
-            ) {
-                $encoded .= chr($decoded[$i]);
-                $codecount++;
-            }
-        }
-
-        // All codepoints were basic ones
-        if ($codecount == $deco_len) {
-            return $encoded;
-        }
-
-        // Start with the prefix; copy it to output
-        $encoded = $this->_punycode_prefix . $encoded;
-
-        // If we have basic code points in output, add an hyphen to the end
-        if ($codecount) {
-            $encoded .= '-';
-        }
-
-        // Now find and encode all non-basic code points
-        $is_first  = true;
-        $cur_code  = $this->_initial_n;
-        $bias      = $this->_initial_bias;
-        $delta     = 0;
-
-        while ($codecount < $deco_len) {
-            // Find the smallest code point >= the current code point and
-            // remember the last ouccrence of it in the input
-            for ($i = 0, $next_code = $this->_max_ucs; $i < $deco_len; $i++) {
-                if ($decoded[$i] >= $cur_code && $decoded[$i] <= $next_code) {
-                    $next_code = $decoded[$i];
-                }
-            }
-
-            $delta += ($next_code - $cur_code) * ($codecount + 1);
-            $cur_code = $next_code;
-
-            // Scan input again and encode all characters whose code point is $cur_code
-            for ($i = 0; $i < $deco_len; $i++) {
-                if ($decoded[$i] < $cur_code) {
-                    $delta++;
-                } else if ($decoded[$i] == $cur_code) {
-                    for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) {
-                        $t = ($k <= $bias)?
-                            $this->_tmin :
-                            (($k >= $bias + $this->_tmax)? $this->_tmax : $k - $bias);
-
-                        if ($q < $t) {
-                            break;
-                        }
-
-                        $encoded .= $this->_encodeDigit(ceil($t + (($q - $t) % ($this->_base - $t))));
-                        $q = ($q - $t) / ($this->_base - $t);
-                    }
-
-                    $encoded .= $this->_encodeDigit($q);
-                    $bias = $this->_adapt($delta, $codecount + 1, $is_first);
-                    $codecount++;
-                    $delta = 0;
-                    $is_first = false;
-                }
-            }
-
-            $delta++;
-            $cur_code++;
-        }
-
-        return $encoded;
-    }
-
-    /**
-     * The actual decoding algorithm.
-     *
-     * @param string $encoded Encoded string which should be decoded
-     *
-     * @return string         Decoded string
-     * @throws Exception
-     * @access private
-     */
-    private function _decode($encoded)
-    {
-        // We do need to find the Punycode prefix
-        if (!preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $encoded)) {
-            return false;
-        }
-
-        $encode_test = preg_replace('!^' . preg_quote($this->_punycode_prefix, '!') . '!', '', $encoded);
-
-        // If nothing left after removing the prefix, it is hopeless
-        if (!$encode_test) {
-            return false;
-        }
-
-        // Find last occurence of the delimiter
-        $delim_pos = strrpos($encoded, '-');
-
-        if ($delim_pos > self::_byteLength($this->_punycode_prefix)) {
-            for ($k = self::_byteLength($this->_punycode_prefix); $k < $delim_pos; ++$k) {
-                $decoded[] = ord($encoded{$k});
-            }
-        } else {
-            $decoded = array();
-        }
-
-        $deco_len = count($decoded);
-        $enco_len = self::_byteLength($encoded);
-
-        // Wandering through the strings; init
-        $is_first = true;
-        $bias     = $this->_initial_bias;
-        $idx      = 0;
-        $char     = $this->_initial_n;
-
-        for ($enco_idx = ($delim_pos)? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
-            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
-                $digit = $this->_decodeDigit($encoded{$enco_idx++});
-                $idx += $digit * $w;
-
-                $t = ($k <= $bias) ?
-                    $this->_tmin :
-                    (($k >= $bias + $this->_tmax)? $this->_tmax : ($k - $bias));
-
-                if ($digit < $t) {
-                    break;
-                }
-
-                $w = (int)($w * ($this->_base - $t));
-            }
-
-            $bias      = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
-            $is_first  = false;
-            $char     += (int) ($idx / ($deco_len + 1));
-            $idx      %= ($deco_len + 1);
-
-            if ($deco_len > 0) {
-                // Make room for the decoded char
-                for ($i = $deco_len; $i > $idx; $i--) {
-                    $decoded[$i] = $decoded[($i - 1)];
-                }
-            }
-
-            $decoded[$idx++] = $char;
-        }
-
-        return $this->_ucs4_to_utf8($decoded);
-    }
-
-    /**
-     * Adapt the bias according to the current code point and position.
-     *
-     * @param int     $delta    ...
-     * @param int     $npoints  ...
-     * @param boolean $is_first ...
-     *
-     * @return int
-     * @access private
-     */
-    private function _adapt($delta, $npoints, $is_first)
-    {
-        $delta = (int) ($is_first ? ($delta / $this->_damp) : ($delta / 2));
-        $delta += (int) ($delta / $npoints);
-
-        for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
-            $delta = (int) ($delta / ($this->_base - $this->_tmin));
-        }
-
-        return (int) ($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
-    }
-
-    /**
-     * Encoding a certain digit.
-     *
-     * @param int $d One digit to encode
-     *
-     * @return char  Encoded digit
-     * @access private
-     */
-    private function _encodeDigit($d)
-    {
-        return chr($d + 22 + 75 * ($d < 26));
-    }
-
-    /**
-     * Decode a certain digit.
-     *
-     * @param char $cp One digit (character) to decode
-     *
-     * @return int     Decoded digit
-     * @access private
-     */
-    private function _decodeDigit($cp)
-    {
-        $cp = ord($cp);
-        return ($cp - 48 < 10)? $cp - 22 : (($cp - 65 < 26)? $cp - 65 : (($cp - 97 < 26)? $cp - 97 : $this->_base));
-    }
-
-    /**
-     * Do Nameprep according to RFC3491 and RFC3454.
-     *
-     * @param array $input Unicode Characters
-     *
-     * @return string      Unicode Characters, Nameprep'd
-     * @throws Exception
-     * @access private
-     */
-    private function _nameprep($input)
-    {
-        $output = array();
-
-        // Walking through the input array, performing the required steps on each of
-        // the input chars and putting the result into the output array
-        // While mapping required chars we apply the cannonical ordering
-
-        foreach ($input as $v) {
-            // Map to nothing == skip that code point
-            if (in_array($v, self::$_np_map_nothing)) {
-                continue;
-            }
-
-            // Try to find prohibited input
-            if (in_array($v, self::$_np_prohibit) || in_array($v, self::$_general_prohibited)) {
-                throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+' . sprintf('%08X', $v));
-            }
-
-            foreach (self::$_np_prohibit_ranges as $range) {
-                if ($range[0] <= $v && $v <= $range[1]) {
-                    throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+' . sprintf('%08X', $v));
-                }
-            }
-
-            // Hangul syllable decomposition
-            if (0xAC00 <= $v && $v <= 0xD7AF) {
-                foreach ($this->_hangulDecompose($v) as $out) {
-                    $output[] = $out;
-                }
-            } else if (($this->_version == '2003') && isset(self::$_np_replacemaps[$v])) {
-                // There's a decomposition mapping for that code point
-                // Decompositions only in version 2003 (original) of IDNA
-                foreach ($this->_applyCannonicalOrdering(self::$_np_replacemaps[$v]) as $out) {
-                    $output[] = $out;
-                }
-            } else {
-                $output[] = $v;
-            }
-        }
-
-        // Combine code points
-
-        $last_class   = 0;
-        $last_starter = 0;
-        $out_len      = count($output);
-
-        for ($i = 0; $i < $out_len; ++$i) {
-            $class = $this->_getCombiningClass($output[$i]);
-
-            if ((!$last_class || $last_class != $class) && $class) {
-                // Try to match
-                $seq_len = $i - $last_starter;
-                $out = $this->_combine(array_slice($output, $last_starter, $seq_len));
-
-                // On match: Replace the last starter with the composed character and remove
-                // the now redundant non-starter(s)
-                if ($out) {
-                    $output[$last_starter] = $out;
-
-                    if (count($out) != $seq_len) {
-                        for ($j = $i + 1; $j < $out_len; ++$j) {
-                            $output[$j - 1] = $output[$j];
-                        }
-
-                        unset($output[$out_len]);
-                    }
-
-                    // Rewind the for loop by one, since there can be more possible compositions
-                    $i--;
-                    $out_len--;
-                    $last_class = ($i == $last_starter)? 0 : $this->_getCombiningClass($output[$i - 1]);
-
-                    continue;
-                }
-            }
-
-            // The current class is 0
-            if (!$class) {
-                $last_starter = $i;
-            }
-
-            $last_class = $class;
-        }
-
-        return $output;
-    }
-
-    /**
-     * Decomposes a Hangul syllable
-     * (see http://www.unicode.org/unicode/reports/tr15/#Hangul).
-     *
-     * @param integer $char 32bit UCS4 code point
-     *
-     * @return array        Either Hangul Syllable decomposed or original 32bit
-     *                      value as one value array
-     * @access private
-     */
-    private function _hangulDecompose($char)
-    {
-        $sindex = $char - $this->_sbase;
-
-        if ($sindex < 0 || $sindex >= $this->_scount) {
-            return array($char);
-        }
-
-        $result   = array();
-        $T        = $this->_tbase + $sindex % $this->_tcount;
-        $result[] = (int)($this->_lbase +  $sindex / $this->_ncount);
-        $result[] = (int)($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
-
-        if ($T != $this->_tbase) {
-            $result[] = $T;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Ccomposes a Hangul syllable
-     * (see http://www.unicode.org/unicode/reports/tr15/#Hangul).
-     *
-     * @param array $input Decomposed UCS4 sequence
-     *
-     * @return array       UCS4 sequence with syllables composed
-     * @access private
-     */
-    private function _hangulCompose($input)
-    {
-        $inp_len = count($input);
-
-        if (!$inp_len) {
-            return array();
-        }
-
-        $result   = array();
-        $last     = $input[0];
-        $result[] = $last; // copy first char from input to output
-
-        for ($i = 1; $i < $inp_len; ++$i) {
-            $char = $input[$i];
-
-            // Find out, wether two current characters from L and V
-            $lindex = $last - $this->_lbase;
-
-            if (0 <= $lindex && $lindex < $this->_lcount) {
-                $vindex = $char - $this->_vbase;
-
-                if (0 <= $vindex && $vindex < $this->_vcount) {
-                    // create syllable of form LV
-                    $last    = ($this->_sbase + ($lindex * $this->_vcount + $vindex) * $this->_tcount);
-                    $out_off = count($result) - 1;
-                    $result[$out_off] = $last; // reset last
-
-                    // discard char
-                    continue;
-                }
-            }
-
-            // Find out, wether two current characters are LV and T
-            $sindex = $last - $this->_sbase;
-
-            if (0 <= $sindex && $sindex < $this->_scount && ($sindex % $this->_tcount) == 0) {
-                $tindex = $char - $this->_tbase;
-
-                if (0 <= $tindex && $tindex <= $this->_tcount) {
-                    // create syllable of form LVT
-                    $last += $tindex;
-                    $out_off = count($result) - 1;
-                    $result[$out_off] = $last; // reset last
-
-                    // discard char
-                    continue;
-                }
-            }
-
-            // if neither case was true, just add the character
-            $last = $char;
-            $result[] = $char;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the combining class of a certain wide char.
-     *
-     * @param integer $char Wide char to check (32bit integer)
-     *
-     * @return integer      Combining class if found, else 0
-     * @access private
-     */
-    private function _getCombiningClass($char)
-    {
-        return isset(self::$_np_norm_combcls[$char])? self::$_np_norm_combcls[$char] : 0;
-    }
-
-    /**
-     * Apllies the cannonical ordering of a decomposed UCS4 sequence.
-     *
-     * @param array $input Decomposed UCS4 sequence
-     *
-     * @return array       Ordered USC4 sequence
-     * @access private
-     */
-    private function _applyCannonicalOrdering($input)
-    {
-        $swap = true;
-        $size = count($input);
-
-        while ($swap) {
-            $swap = false;
-            $last = $this->_getCombiningClass($input[0]);
-
-            for ($i = 0; $i < $size - 1; ++$i) {
-                $next = $this->_getCombiningClass($input[$i + 1]);
-
-                if ($next != 0 && $last > $next) {
-                    // Move item leftward until it fits
-                    for ($j = $i + 1; $j > 0; --$j) {
-                        if ($this->_getCombiningClass($input[$j - 1]) <= $next) {
-                            break;
-                        }
-
-                        $t = $input[$j];
-                        $input[$j] = $input[$j - 1];
-                        $input[$j - 1] = $t;
-                        $swap = 1;
-                    }
-
-                    // Reentering the loop looking at the old character again
-                    $next = $last;
-                }
-
-                $last = $next;
-            }
-        }
-
-        return $input;
-    }
-
-    /**
-     * Do composition of a sequence of starter and non-starter.
-     *
-     * @param array $input UCS4 Decomposed sequence
-     *
-     * @return array       Ordered USC4 sequence
-     * @access private
-     */
-    private function _combine($input)
-    {
-        $inp_len = count($input);
-
-        // Is it a Hangul syllable?
-        if (1 != $inp_len) {
-            $hangul = $this->_hangulCompose($input);
-
-            // This place is probably wrong
-            if (count($hangul) != $inp_len) {
-                return $hangul;
-            }
-        }
-
-        foreach (self::$_np_replacemaps as $np_src => $np_target) {
-            if ($np_target[0] != $input[0]) {
-                continue;
-            }
-
-            if (count($np_target) != $inp_len) {
-                continue;
-            }
-
-            $hit = false;
-
-            foreach ($input as $k2 => $v2) {
-                if ($v2 == $np_target[$k2]) {
-                    $hit = true;
-                } else {
-                    $hit = false;
-                    break;
-                }
-            }
-
-            if ($hit) {
-                return $np_src;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * This converts an UTF-8 encoded string to its UCS-4 (array) representation
-     * By talking about UCS-4 we mean arrays of 32bit integers representing
-     * each of the "chars". This is due to PHP not being able to handle strings with
-     * bit depth different from 8. This applies to the reverse method _ucs4_to_utf8(), too.
-     * The following UTF-8 encodings are supported:
-     *
-     * bytes bits  representation
-     * 1        7  0xxxxxxx
-     * 2       11  110xxxxx 10xxxxxx
-     * 3       16  1110xxxx 10xxxxxx 10xxxxxx
-     * 4       21  11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-     * 5       26  111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-     * 6       31  1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-     *
-     * Each x represents a bit that can be used to store character data.
-     *
-     * @param string $input utf8-encoded string
-     *
-     * @return array        ucs4-encoded array
-     * @throws Exception
-     * @access private
-     */
-    private function _utf8_to_ucs4($input)
-    {
-        $output = array();
-        $out_len = 0;
-        $inp_len = self::_byteLength($input, '8bit');
-        $mode = 'next';
-        $test = 'none';
-        for ($k = 0; $k < $inp_len; ++$k) {
-            $v = ord($input{$k}); // Extract byte from input string
-
-            if ($v < 128) { // We found an ASCII char - put into stirng as is
-                $output[$out_len] = $v;
-                ++$out_len;
-                if ('add' == $mode) {
-                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
-                }
-                continue;
-            }
-            if ('next' == $mode) { // Try to find the next start byte; determine the width of the Unicode char
-                $start_byte = $v;
-                $mode = 'add';
-                $test = 'range';
-                if ($v >> 5 == 6) { // &110xxxxx 10xxxxx
-                    $next_byte = 0; // Tells, how many times subsequent bitmasks must rotate 6bits to the left
-                    $v = ($v - 192) << 6;
-                } elseif ($v >> 4 == 14) { // &1110xxxx 10xxxxxx 10xxxxxx
-                    $next_byte = 1;
-                    $v = ($v - 224) << 12;
-                } elseif ($v >> 3 == 30) { // &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-                    $next_byte = 2;
-                    $v = ($v - 240) << 18;
-                } elseif ($v >> 2 == 62) { // &111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-                    $next_byte = 3;
-                    $v = ($v - 248) << 24;
-                } elseif ($v >> 1 == 126) { // &1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-                    $next_byte = 4;
-                    $v = ($v - 252) << 30;
-                } else {
-                    throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte '.$k);
-                }
-                if ('add' == $mode) {
-                    $output[$out_len] = (int) $v;
-                    ++$out_len;
-                    continue;
-                }
-            }
-            if ('add' == $mode) {
-                if (!$this->_allow_overlong && $test == 'range') {
-                    $test = 'none';
-                    if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
-                        throw new OutOfRangeException('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
-                    }
-                }
-                if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
-                    $v = ($v - 128) << ($next_byte * 6);
-                    $output[($out_len - 1)] += $v;
-                    --$next_byte;
-                } else {
-                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
-                }
-                if ($next_byte < 0) {
-                    $mode = 'next';
-                }
-            }
-        } // for
-        return $output;
-    }
-
-    /**
-     * Convert UCS-4 array into UTF-8 string
-     *
-     * @param array $input ucs4-encoded array
-     *
-     * @return string      utf8-encoded string
-     * @throws Exception
-     * @access private
-     */
-    private function _ucs4_to_utf8($input)
-    {
-        $output = '';
-
-        foreach ($input as $v) {
-            // $v = ord($v);
-
-            if ($v < 128) {
-                // 7bit are transferred literally
-                $output .= chr($v);
-            } else if ($v < 1 << 11) {
-                // 2 bytes
-                $output .= chr(192 + ($v >> 6))
-                    . chr(128 + ($v & 63));
-            } else if ($v < 1 << 16) {
-                // 3 bytes
-                $output .= chr(224 + ($v >> 12))
-                    . chr(128 + (($v >> 6) & 63))
-                    . chr(128 + ($v & 63));
-            } else if ($v < 1 << 21) {
-                // 4 bytes
-                $output .= chr(240 + ($v >> 18))
-                    . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
-                    . chr(128 + ($v & 63));
-            } else if ($v < 1 << 26) {
-                // 5 bytes
-                $output .= chr(248 + ($v >> 24))
-                    . chr(128 + (($v >> 18) & 63))
-                    . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
-                    . chr(128 + ($v & 63));
-            } else if ($v < 1 << 31) {
-                // 6 bytes
-                $output .= chr(252 + ($v >> 30))
-                    . chr(128 + (($v >> 24) & 63))
-                    . chr(128 + (($v >> 18) & 63))
-                    . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
-                    . chr(128 + ($v & 63));
-            } else {
-                throw new UnexpectedValueException('Conversion from UCS-4 to UTF-8 failed: malformed input');
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * Convert UCS-4 array into UCS-4 string
-     *
-     * @param array $input ucs4-encoded array
-     *
-     * @return string      ucs4-encoded string
-     * @throws Exception
-     * @access private
-     */
-    private function _ucs4_to_ucs4_string($input)
-    {
-        $output = '';
-        // Take array values and split output to 4 bytes per value
-        // The bit mask is 255, which reads &11111111
-        foreach ($input as $v) {
-            $output .= ($v & (255 << 24) >> 24) . ($v & (255 << 16) >> 16) . ($v & (255 << 8) >> 8) . ($v & 255);
-        }
-        return $output;
-    }
-
-    /**
-     * Convert UCS-4 string into UCS-4 array
-     *
-     * @param string $input ucs4-encoded string
-     *
-     * @return array        ucs4-encoded array
-     * @throws InvalidArgumentException
-     * @access private
-     */
-    private function _ucs4_string_to_ucs4($input)
-    {
-        $output = array();
-
-        $inp_len = self::_byteLength($input);
-        // Input length must be dividable by 4
-        if ($inp_len % 4) {
-            throw new InvalidArgumentException('Input UCS4 string is broken');
-        }
-
-        // Empty input - return empty output
-        if (!$inp_len) {
-            return $output;
-        }
-
-        for ($i = 0, $out_len = -1; $i < $inp_len; ++$i) {
-            // Increment output position every 4 input bytes
-            if (!$i % 4) {
-                $out_len++;
-                $output[$out_len] = 0;
-            }
-            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
-        }
-        return $output;
-    }
-
-    /**
-     * Echo hex representation of UCS4 sequence.
-     *
-     * @param array   $input       UCS4 sequence
-     * @param boolean $include_bit Include bitmask in output
-     *
-     * @return void
-     * @static
-     * @access private
-     */
-    private static function _showHex($input, $include_bit = false)
-    {
-        foreach ($input as $k => $v) {
-            echo '[', $k, '] => ', sprintf('%X', $v);
-
-            if ($include_bit) {
-                echo ' (', Net_IDNA2::_showBitmask($v), ')';
-            }
-
-            echo "\n";
-        }
-    }
-
-    /**
-     * Gives you a bit representation of given Byte (8 bits), Word (16 bits) or DWord (32 bits)
-     * Output width is automagically determined
-     *
-     * @param int $octet ...
-     *
-     * @return string    Bitmask-representation
-     * @static
-     * @access private
-     */
-    private static function _showBitmask($octet)
-    {
-        if ($octet >= (1 << 16)) {
-            $w = 31;
-        } else if ($octet >= (1 << 8)) {
-            $w = 15;
-        } else {
-            $w = 7;
-        }
-
-        $return = '';
-
-        for ($i = $w; $i > -1; $i--) {
-            $return .= ($octet & (1 << $i))? '1' : '0';
-        }
-
-        return $return;
-    }
-
-    /**
-     * Gets the length of a string in bytes even if mbstring function
-     * overloading is turned on
-     *
-     * @param string $string the string for which to get the length.
-     *
-     * @return integer the length of the string in bytes.
-     *
-     * @see Net_IDNA2::$_mb_string_overload
-     */
-    private static function _byteLength($string)
-    {
-        if (self::$_mb_string_overload) {
-            return mb_strlen($string, '8bit');
-        }
-        return strlen((binary)$string);
-    }
-
-    // }}}}
-
-    // {{{ factory
-    /**
-     * Attempts to return a concrete IDNA instance for either php4 or php5.
-     *
-     * @param array $params Set of paramaters
-     *
-     * @return Net_IDNA2
-     * @access public
-     */
-    function getInstance($params = array())
-    {
-        return new Net_IDNA2($params);
-    }
-    // }}}
-
-    // {{{ singleton
-    /**
-     * Attempts to return a concrete IDNA instance for either php4 or php5,
-     * only creating a new instance if no IDNA instance with the same
-     * parameters currently exists.
-     *
-     * @param array $params Set of paramaters
-     *
-     * @return object Net_IDNA2
-     * @access public
-     */
-    function singleton($params = array())
-    {
-        static $instances;
-        if (!isset($instances)) {
-            $instances = array();
-        }
-
-        $signature = serialize($params);
-        if (!isset($instances[$signature])) {
-            $instances[$signature] = Net_IDNA2::getInstance($params);
-        }
-
-        return $instances[$signature];
-    }
-    // }}}
-}
-
-?>
diff --git a/lib/ext/Net/IDNA2/Exception.php b/lib/ext/Net/IDNA2/Exception.php
deleted file mode 100644
index 72cb1ae..0000000
--- a/lib/ext/Net/IDNA2/Exception.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-class Net_IDNA2_Exception extends Exception
-{
-}
diff --git a/lib/ext/Net/IDNA2/Exception/Nameprep.php b/lib/ext/Net/IDNA2/Exception/Nameprep.php
deleted file mode 100644
index 44cbd6b..0000000
--- a/lib/ext/Net/IDNA2/Exception/Nameprep.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-require_once 'Net/IDNA2/Exception.php';
-
-class Net_IDNA2_Exception_Nameprep extends Net_IDNA2_Exception
-{
-}
diff --git a/lib/ext/Net/SMTP.php b/lib/ext/Net/SMTP.php
deleted file mode 100644
index 4e04f91..0000000
--- a/lib/ext/Net/SMTP.php
+++ /dev/null
@@ -1,1342 +0,0 @@
-<?php
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Chuck Hagenbuch <chuck@horde.org>                           |
-// |          Jon Parise <jon@php.net>                                    |
-// |          Damian Alejandro Fernandez Sosa <damlists@cnba.uba.ar>      |
-// +----------------------------------------------------------------------+
-//
-// $Id$
-
-require_once 'PEAR.php';
-require_once 'Net/Socket.php';
-
-/**
- * Provides an implementation of the SMTP protocol using PEAR's
- * Net_Socket:: class.
- *
- * @package Net_SMTP
- * @author  Chuck Hagenbuch <chuck@horde.org>
- * @author  Jon Parise <jon@php.net>
- * @author  Damian Alejandro Fernandez Sosa <damlists@cnba.uba.ar>
- *
- * @example basic.php   A basic implementation of the Net_SMTP package.
- */
-class Net_SMTP
-{
-    /**
-     * The server to connect to.
-     * @var string
-     * @access public
-     */
-    var $host = 'localhost';
-
-    /**
-     * The port to connect to.
-     * @var int
-     * @access public
-     */
-    var $port = 25;
-
-    /**
-     * The value to give when sending EHLO or HELO.
-     * @var string
-     * @access public
-     */
-    var $localhost = 'localhost';
-
-    /**
-     * List of supported authentication methods, in preferential order.
-     * @var array
-     * @access public
-     */
-    var $auth_methods = array();
-
-    /**
-     * Use SMTP command pipelining (specified in RFC 2920) if the SMTP
-     * server supports it.
-     *
-     * When pipeling is enabled, rcptTo(), mailFrom(), sendFrom(),
-     * somlFrom() and samlFrom() do not wait for a response from the
-     * SMTP server but return immediately.
-     *
-     * @var bool
-     * @access public
-     */
-    var $pipelining = false;
-
-    /**
-     * Number of pipelined commands.
-     * @var int
-     * @access private
-     */
-    var $_pipelined_commands = 0;
-
-    /**
-     * Should debugging output be enabled?
-     * @var boolean
-     * @access private
-     */
-    var $_debug = false;
-
-    /**
-     * Debug output handler.
-     * @var callback
-     * @access private
-     */
-    var $_debug_handler = null;
-
-    /**
-     * The socket resource being used to connect to the SMTP server.
-     * @var resource
-     * @access private
-     */
-    var $_socket = null;
-
-    /**
-     * Array of socket options that will be passed to Net_Socket::connect().
-     * @see stream_context_create()
-     * @var array
-     * @access private
-     */
-    var $_socket_options = null;
-
-    /**
-     * The socket I/O timeout value in seconds.
-     * @var int
-     * @access private
-     */
-    var $_timeout = 0;
-
-    /**
-     * The most recent server response code.
-     * @var int
-     * @access private
-     */
-    var $_code = -1;
-
-    /**
-     * The most recent server response arguments.
-     * @var array
-     * @access private
-     */
-    var $_arguments = array();
-
-    /**
-     * Stores the SMTP server's greeting string.
-     * @var string
-     * @access private
-     */
-    var $_greeting = null;
-
-    /**
-     * Stores detected features of the SMTP server.
-     * @var array
-     * @access private
-     */
-    var $_esmtp = array();
-
-    /**
-     * Instantiates a new Net_SMTP object, overriding any defaults
-     * with parameters that are passed in.
-     *
-     * If you have SSL support in PHP, you can connect to a server
-     * over SSL using an 'ssl://' prefix:
-     *
-     *   // 465 is a common smtps port.
-     *   $smtp = new Net_SMTP('ssl://mail.host.com', 465);
-     *   $smtp->connect();
-     *
-     * @param string  $host       The server to connect to.
-     * @param integer $port       The port to connect to.
-     * @param string  $localhost  The value to give when sending EHLO or HELO.
-     * @param boolean $pipeling   Use SMTP command pipelining
-     * @param integer $timeout    Socket I/O timeout in seconds.
-     * @param array   $socket_options Socket stream_context_create() options.
-     *
-     * @access  public
-     * @since   1.0
-     */
-    function Net_SMTP($host = null, $port = null, $localhost = null,
-        $pipelining = false, $timeout = 0, $socket_options = null)
-    {
-        if (isset($host)) {
-            $this->host = $host;
-        }
-        if (isset($port)) {
-            $this->port = $port;
-        }
-        if (isset($localhost)) {
-            $this->localhost = $localhost;
-        }
-        $this->pipelining = $pipelining;
-
-        $this->_socket = new Net_Socket();
-        $this->_socket_options = $socket_options;
-        $this->_timeout = $timeout;
-
-        /* Include the Auth_SASL package.  If the package is available, we 
-         * enable the authentication methods that depend upon it. */
-        if ((@include_once 'Auth/SASL.php') === true) {
-            $this->setAuthMethod('CRAM-MD5', array($this, '_authCram_MD5'));
-            $this->setAuthMethod('DIGEST-MD5', array($this, '_authDigest_MD5'));
-        }
-
-        /* These standard authentication methods are always available. */
-        $this->setAuthMethod('LOGIN', array($this, '_authLogin'), false);
-        $this->setAuthMethod('PLAIN', array($this, '_authPlain'), false);
-    }
-
-    /**
-     * Set the socket I/O timeout value in seconds plus microseconds.
-     *
-     * @param   integer $seconds        Timeout value in seconds.
-     * @param   integer $microseconds   Additional value in microseconds.
-     *
-     * @access  public
-     * @since   1.5.0
-     */
-    function setTimeout($seconds, $microseconds = 0) {
-        return $this->_socket->setTimeout($seconds, $microseconds);
-    }
-
-    /**
-     * Set the value of the debugging flag.
-     *
-     * @param   boolean $debug      New value for the debugging flag.
-     *
-     * @access  public
-     * @since   1.1.0
-     */
-    function setDebug($debug, $handler = null)
-    {
-        $this->_debug = $debug;
-        $this->_debug_handler = $handler;
-    }
-
-    /**
-     * Write the given debug text to the current debug output handler.
-     *
-     * @param   string  $message    Debug mesage text.
-     *
-     * @access  private
-     * @since   1.3.3
-     */
-    function _debug($message)
-    {
-        if ($this->_debug) {
-            if ($this->_debug_handler) {
-                call_user_func_array($this->_debug_handler,
-                                     array(&$this, $message));
-            } else {
-                echo "DEBUG: $message\n";
-            }
-        }
-    }
-
-    /**
-     * Send the given string of data to the server.
-     *
-     * @param   string  $data       The string of data to send.
-     *
-     * @return  mixed   The number of bytes that were actually written,
-     *                  or a PEAR_Error object on failure.
-     *
-     * @access  private
-     * @since   1.1.0
-     */
-    function _send($data)
-    {
-        $this->_debug("Send: $data");
-
-        $result = $this->_socket->write($data);
-        if (!$result || PEAR::isError($result)) {
-            $msg = ($result) ? $result->getMessage() : "unknown error";
-            return PEAR::raiseError("Failed to write to socket: $msg",
-                                    null, PEAR_ERROR_RETURN);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Send a command to the server with an optional string of
-     * arguments.  A carriage return / linefeed (CRLF) sequence will
-     * be appended to each command string before it is sent to the
-     * SMTP server - an error will be thrown if the command string
-     * already contains any newline characters. Use _send() for
-     * commands that must contain newlines.
-     *
-     * @param   string  $command    The SMTP command to send to the server.
-     * @param   string  $args       A string of optional arguments to append
-     *                              to the command.
-     *
-     * @return  mixed   The result of the _send() call.
-     *
-     * @access  private
-     * @since   1.1.0
-     */
-    function _put($command, $args = '')
-    {
-        if (!empty($args)) {
-            $command .= ' ' . $args;
-        }
-
-        if (strcspn($command, "\r\n") !== strlen($command)) {
-            return PEAR::raiseError('Commands cannot contain newlines',
-                                    null, PEAR_ERROR_RETURN);
-        }
-
-        return $this->_send($command . "\r\n");
-    }
-
-    /**
-     * Read a reply from the SMTP server.  The reply consists of a response
-     * code and a response message.
-     *
-     * @param   mixed   $valid      The set of valid response codes.  These
-     *                              may be specified as an array of integer
-     *                              values or as a single integer value.
-     * @param   bool    $later      Do not parse the response now, but wait
-     *                              until the last command in the pipelined
-     *                              command group
-     *
-     * @return  mixed   True if the server returned a valid response code or
-     *                  a PEAR_Error object is an error condition is reached.
-     *
-     * @access  private
-     * @since   1.1.0
-     *
-     * @see     getResponse
-     */
-    function _parseResponse($valid, $later = false)
-    {
-        $this->_code = -1;
-        $this->_arguments = array();
-
-        if ($later) {
-            $this->_pipelined_commands++;
-            return true;
-        }
-
-        for ($i = 0; $i <= $this->_pipelined_commands; $i++) {
-            while ($line = $this->_socket->readLine()) {
-                $this->_debug("Recv: $line");
-
-                /* If we receive an empty line, the connection was closed. */
-                if (empty($line)) {
-                    $this->disconnect();
-                    return PEAR::raiseError('Connection was closed',
-                                            null, PEAR_ERROR_RETURN);
-                }
-
-                /* Read the code and store the rest in the arguments array. */
-                $code = substr($line, 0, 3);
-                $this->_arguments[] = trim(substr($line, 4));
-
-                /* Check the syntax of the response code. */
-                if (is_numeric($code)) {
-                    $this->_code = (int)$code;
-                } else {
-                    $this->_code = -1;
-                    break;
-                }
-
-                /* If this is not a multiline response, we're done. */
-                if (substr($line, 3, 1) != '-') {
-                    break;
-                }
-            }
-        }
-
-        $this->_pipelined_commands = 0;
-
-        /* Compare the server's response code with the valid code/codes. */
-        if (is_int($valid) && ($this->_code === $valid)) {
-            return true;
-        } elseif (is_array($valid) && in_array($this->_code, $valid, true)) {
-            return true;
-        }
-
-        return PEAR::raiseError('Invalid response code received from server',
-                                $this->_code, PEAR_ERROR_RETURN);
-    }
-
-    /**
-     * Issue an SMTP command and verify its response.
-     *
-     * @param   string  $command    The SMTP command string or data.
-     * @param   mixed   $valid      The set of valid response codes.  These
-     *                              may be specified as an array of integer
-     *                              values or as a single integer value.
-     *
-     * @return  mixed   True on success or a PEAR_Error object on failure.
-     *
-     * @access  public
-     * @since   1.6.0
-     */
-    function command($command, $valid)
-    {
-        if (PEAR::isError($error = $this->_put($command))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse($valid))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Return a 2-tuple containing the last response from the SMTP server.
-     *
-     * @return  array   A two-element array: the first element contains the
-     *                  response code as an integer and the second element
-     *                  contains the response's arguments as a string.
-     *
-     * @access  public
-     * @since   1.1.0
-     */
-    function getResponse()
-    {
-        return array($this->_code, join("\n", $this->_arguments));
-    }
-
-    /**
-     * Return the SMTP server's greeting string.
-     *
-     * @return  string  A string containing the greeting string, or null if a 
-     *                  greeting has not been received.
-     *
-     * @access  public
-     * @since   1.3.3
-     */
-    function getGreeting()
-    {
-        return $this->_greeting;
-    }
-
-    /**
-     * Attempt to connect to the SMTP server.
-     *
-     * @param   int     $timeout    The timeout value (in seconds) for the
-     *                              socket connection attempt.
-     * @param   bool    $persistent Should a persistent socket connection
-     *                              be used?
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function connect($timeout = null, $persistent = false)
-    {
-        $this->_greeting = null;
-        $result = $this->_socket->connect($this->host, $this->port,
-                                          $persistent, $timeout,
-                                          $this->_socket_options);
-        if (PEAR::isError($result)) {
-            return PEAR::raiseError('Failed to connect socket: ' .
-                                    $result->getMessage());
-        }
-
-        /*
-         * Now that we're connected, reset the socket's timeout value for 
-         * future I/O operations.  This allows us to have different socket 
-         * timeout values for the initial connection (our $timeout parameter) 
-         * and all other socket operations.
-         */
-        if ($this->_timeout > 0) {
-            if (PEAR::isError($error = $this->setTimeout($this->_timeout))) {
-                return $error;
-            }
-        }
-
-        if (PEAR::isError($error = $this->_parseResponse(220))) {
-            return $error;
-        }
-
-        /* Extract and store a copy of the server's greeting string. */
-        list(, $this->_greeting) = $this->getResponse();
-
-        if (PEAR::isError($error = $this->_negotiate())) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Attempt to disconnect from the SMTP server.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function disconnect()
-    {
-        if (PEAR::isError($error = $this->_put('QUIT'))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(221))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_socket->disconnect())) {
-            return PEAR::raiseError('Failed to disconnect socket: ' .
-                                    $error->getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * Attempt to send the EHLO command and obtain a list of ESMTP
-     * extensions available, and failing that just send HELO.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     *
-     * @access private
-     * @since  1.1.0
-     */
-    function _negotiate()
-    {
-        if (PEAR::isError($error = $this->_put('EHLO', $this->localhost))) {
-            return $error;
-        }
-
-        if (PEAR::isError($this->_parseResponse(250))) {
-            /* If we receive a 503 response, we're already authenticated. */
-            if ($this->_code === 503) {
-                return true;
-            }
-
-            /* If the EHLO failed, try the simpler HELO command. */
-            if (PEAR::isError($error = $this->_put('HELO', $this->localhost))) {
-                return $error;
-            }
-            if (PEAR::isError($this->_parseResponse(250))) {
-                return PEAR::raiseError('HELO was not accepted: ', $this->_code,
-                                        PEAR_ERROR_RETURN);
-            }
-
-            return true;
-        }
-
-        foreach ($this->_arguments as $argument) {
-            $verb = strtok($argument, ' ');
-            $arguments = substr($argument, strlen($verb) + 1,
-                                strlen($argument) - strlen($verb) - 1);
-            $this->_esmtp[$verb] = $arguments;
-        }
-
-        if (!isset($this->_esmtp['PIPELINING'])) {
-            $this->pipelining = false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the name of the best authentication method that the server
-     * has advertised.
-     *
-     * @return mixed    Returns a string containing the name of the best
-     *                  supported authentication method or a PEAR_Error object
-     *                  if a failure condition is encountered.
-     * @access private
-     * @since  1.1.0
-     */
-    function _getBestAuthMethod()
-    {
-        $available_methods = explode(' ', $this->_esmtp['AUTH']);
-
-        foreach ($this->auth_methods as $method => $callback) {
-            if (in_array($method, $available_methods)) {
-                return $method;
-            }
-        }
-
-        return PEAR::raiseError('No supported authentication methods',
-                                null, PEAR_ERROR_RETURN);
-    }
-
-    /**
-     * Attempt to do SMTP authentication.
-     *
-     * @param string The userid to authenticate as.
-     * @param string The password to authenticate with.
-     * @param string The requested authentication method.  If none is
-     *               specified, the best supported method will be used.
-     * @param bool   Flag indicating whether or not TLS should be attempted.
-     * @param string An optional authorization identifier.  If specified, this
-     *               identifier will be used as the authorization proxy.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function auth($uid, $pwd , $method = '', $tls = true, $authz = '')
-    {
-        /* We can only attempt a TLS connection if one has been requested,
-         * we're running PHP 5.1.0 or later, have access to the OpenSSL 
-         * extension, are connected to an SMTP server which supports the 
-         * STARTTLS extension, and aren't already connected over a secure 
-         * (SSL) socket connection. */
-        if ($tls && version_compare(PHP_VERSION, '5.1.0', '>=') &&
-            extension_loaded('openssl') && isset($this->_esmtp['STARTTLS']) &&
-            strncasecmp($this->host, 'ssl://', 6) !== 0) {
-            /* Start the TLS connection attempt. */
-            if (PEAR::isError($result = $this->_put('STARTTLS'))) {
-                return $result;
-            }
-            if (PEAR::isError($result = $this->_parseResponse(220))) {
-                return $result;
-            }
-            if (PEAR::isError($result = $this->_socket->enableCrypto(true, STREAM_CRYPTO_METHOD_TLS_CLIENT))) {
-                return $result;
-            } elseif ($result !== true) {
-                return PEAR::raiseError('STARTTLS failed');
-            }
-
-            /* Send EHLO again to recieve the AUTH string from the
-             * SMTP server. */
-            $this->_negotiate();
-        }
-
-        if (empty($this->_esmtp['AUTH'])) {
-            return PEAR::raiseError('SMTP server does not support authentication');
-        }
-
-        /* If no method has been specified, get the name of the best
-         * supported method advertised by the SMTP server. */
-        if (empty($method)) {
-            if (PEAR::isError($method = $this->_getBestAuthMethod())) {
-                /* Return the PEAR_Error object from _getBestAuthMethod(). */
-                return $method;
-            }
-        } else {
-            $method = strtoupper($method);
-            if (!array_key_exists($method, $this->auth_methods)) {
-                return PEAR::raiseError("$method is not a supported authentication method");
-            }
-        }
-
-        if (!isset($this->auth_methods[$method])) {
-            return PEAR::raiseError("$method is not a supported authentication method");
-        }
-
-        if (!is_callable($this->auth_methods[$method], false)) {
-            return PEAR::raiseError("$method authentication method cannot be called");
-        }
-
-        if (is_array($this->auth_methods[$method])) {
-            list($object, $method) = $this->auth_methods[$method];
-            $result = $object->{$method}($uid, $pwd, $authz, $this);
-        } else {
-            $func =  $this->auth_methods[$method];
-            $result = $func($uid, $pwd, $authz, $this);
-         }
-
-        /* If an error was encountered, return the PEAR_Error object. */
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        return true;
-    }
-
-    /**
-     * Add a new authentication method.
-     *
-     * @param string    The authentication method name (e.g. 'PLAIN')
-     * @param mixed     The authentication callback (given as the name of a 
-     *                  function or as an (object, method name) array).
-     * @param bool      Should the new method be prepended to the list of 
-     *                  available methods?  This is the default behavior, 
-     *                  giving the new method the highest priority.
-     *
-     * @return  mixed   True on success or a PEAR_Error object on failure.
-     *
-     * @access public
-     * @since  1.6.0
-     */
-    function setAuthMethod($name, $callback, $prepend = true)
-    {
-        if (!is_string($name)) {
-            return PEAR::raiseError('Method name is not a string');
-        }
-
-        if (!is_string($callback) && !is_array($callback)) {
-            return PEAR::raiseError('Method callback must be string or array');
-        }
-
-        if (is_array($callback)) {
-            if (!is_object($callback[0]) || !is_string($callback[1]))
-                return PEAR::raiseError('Bad mMethod callback array');
-        }
-
-        if ($prepend) {
-            $this->auth_methods = array_merge(array($name => $callback),
-                                              $this->auth_methods);
-        } else {
-            $this->auth_methods[$name] = $callback;
-        }
-
-        return true;
-    }
-
-    /**
-     * Authenticates the user using the DIGEST-MD5 method.
-     *
-     * @param string The userid to authenticate as.
-     * @param string The password to authenticate with.
-     * @param string The optional authorization proxy identifier.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access private
-     * @since  1.1.0
-     */
-    function _authDigest_MD5($uid, $pwd, $authz = '')
-    {
-        if (PEAR::isError($error = $this->_put('AUTH', 'DIGEST-MD5'))) {
-            return $error;
-        }
-        /* 334: Continue authentication request */
-        if (PEAR::isError($error = $this->_parseResponse(334))) {
-            /* 503: Error: already authenticated */
-            if ($this->_code === 503) {
-                return true;
-            }
-            return $error;
-        }
-
-        $challenge = base64_decode($this->_arguments[0]);
-        $digest = &Auth_SASL::factory('digestmd5');
-        $auth_str = base64_encode($digest->getResponse($uid, $pwd, $challenge,
-                                                       $this->host, "smtp",
-                                                       $authz));
-
-        if (PEAR::isError($error = $this->_put($auth_str))) {
-            return $error;
-        }
-        /* 334: Continue authentication request */
-        if (PEAR::isError($error = $this->_parseResponse(334))) {
-            return $error;
-        }
-
-        /* We don't use the protocol's third step because SMTP doesn't
-         * allow subsequent authentication, so we just silently ignore
-         * it. */
-        if (PEAR::isError($error = $this->_put(''))) {
-            return $error;
-        }
-        /* 235: Authentication successful */
-        if (PEAR::isError($error = $this->_parseResponse(235))) {
-            return $error;
-        }
-    }
-
-    /**
-     * Authenticates the user using the CRAM-MD5 method.
-     *
-     * @param string The userid to authenticate as.
-     * @param string The password to authenticate with.
-     * @param string The optional authorization proxy identifier.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access private
-     * @since  1.1.0
-     */
-    function _authCRAM_MD5($uid, $pwd, $authz = '')
-    {
-        if (PEAR::isError($error = $this->_put('AUTH', 'CRAM-MD5'))) {
-            return $error;
-        }
-        /* 334: Continue authentication request */
-        if (PEAR::isError($error = $this->_parseResponse(334))) {
-            /* 503: Error: already authenticated */
-            if ($this->_code === 503) {
-                return true;
-            }
-            return $error;
-        }
-
-        $challenge = base64_decode($this->_arguments[0]);
-        $cram = &Auth_SASL::factory('crammd5');
-        $auth_str = base64_encode($cram->getResponse($uid, $pwd, $challenge));
-
-        if (PEAR::isError($error = $this->_put($auth_str))) {
-            return $error;
-        }
-
-        /* 235: Authentication successful */
-        if (PEAR::isError($error = $this->_parseResponse(235))) {
-            return $error;
-        }
-    }
-
-    /**
-     * Authenticates the user using the LOGIN method.
-     *
-     * @param string The userid to authenticate as.
-     * @param string The password to authenticate with.
-     * @param string The optional authorization proxy identifier.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access private
-     * @since  1.1.0
-     */
-    function _authLogin($uid, $pwd, $authz = '')
-    {
-        if (PEAR::isError($error = $this->_put('AUTH', 'LOGIN'))) {
-            return $error;
-        }
-        /* 334: Continue authentication request */
-        if (PEAR::isError($error = $this->_parseResponse(334))) {
-            /* 503: Error: already authenticated */
-            if ($this->_code === 503) {
-                return true;
-            }
-            return $error;
-        }
-
-        if (PEAR::isError($error = $this->_put(base64_encode($uid)))) {
-            return $error;
-        }
-        /* 334: Continue authentication request */
-        if (PEAR::isError($error = $this->_parseResponse(334))) {
-            return $error;
-        }
-
-        if (PEAR::isError($error = $this->_put(base64_encode($pwd)))) {
-            return $error;
-        }
-
-        /* 235: Authentication successful */
-        if (PEAR::isError($error = $this->_parseResponse(235))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Authenticates the user using the PLAIN method.
-     *
-     * @param string The userid to authenticate as.
-     * @param string The password to authenticate with.
-     * @param string The optional authorization proxy identifier.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access private
-     * @since  1.1.0
-     */
-    function _authPlain($uid, $pwd, $authz = '')
-    {
-        if (PEAR::isError($error = $this->_put('AUTH', 'PLAIN'))) {
-            return $error;
-        }
-        /* 334: Continue authentication request */
-        if (PEAR::isError($error = $this->_parseResponse(334))) {
-            /* 503: Error: already authenticated */
-            if ($this->_code === 503) {
-                return true;
-            }
-            return $error;
-        }
-
-        $auth_str = base64_encode($authz . chr(0) . $uid . chr(0) . $pwd);
-
-        if (PEAR::isError($error = $this->_put($auth_str))) {
-            return $error;
-        }
-
-        /* 235: Authentication successful */
-        if (PEAR::isError($error = $this->_parseResponse(235))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Send the HELO command.
-     *
-     * @param string The domain name to say we are.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function helo($domain)
-    {
-        if (PEAR::isError($error = $this->_put('HELO', $domain))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Return the list of SMTP service extensions advertised by the server.
-     *
-     * @return array The list of SMTP service extensions.
-     * @access public
-     * @since 1.3
-     */
-    function getServiceExtensions()
-    {
-        return $this->_esmtp;
-    }
-
-    /**
-     * Send the MAIL FROM: command.
-     *
-     * @param string $sender    The sender (reverse path) to set.
-     * @param string $params    String containing additional MAIL parameters,
-     *                          such as the NOTIFY flags defined by RFC 1891
-     *                          or the VERP protocol.
-     *
-     *                          If $params is an array, only the 'verp' option
-     *                          is supported.  If 'verp' is true, the XVERP
-     *                          parameter is appended to the MAIL command.  If
-     *                          the 'verp' value is a string, the full
-     *                          XVERP=value parameter is appended.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function mailFrom($sender, $params = null)
-    {
-        $args = "FROM:<$sender>";
-
-        /* Support the deprecated array form of $params. */
-        if (is_array($params) && isset($params['verp'])) {
-            /* XVERP */
-            if ($params['verp'] === true) {
-                $args .= ' XVERP';
-
-            /* XVERP=something */
-            } elseif (trim($params['verp'])) {
-                $args .= ' XVERP=' . $params['verp'];
-            }
-        } elseif (is_string($params) && !empty($params)) {
-            $args .= ' ' . $params;
-        }
-
-        if (PEAR::isError($error = $this->_put('MAIL', $args))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Send the RCPT TO: command.
-     *
-     * @param string $recipient The recipient (forward path) to add.
-     * @param string $params    String containing additional RCPT parameters,
-     *                          such as the NOTIFY flags defined by RFC 1891.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     *
-     * @access public
-     * @since  1.0
-     */
-    function rcptTo($recipient, $params = null)
-    {
-        $args = "TO:<$recipient>";
-        if (is_string($params)) {
-            $args .= ' ' . $params;
-        }
-
-        if (PEAR::isError($error = $this->_put('RCPT', $args))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(array(250, 251), $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Quote the data so that it meets SMTP standards.
-     *
-     * This is provided as a separate public function to facilitate
-     * easier overloading for the cases where it is desirable to
-     * customize the quoting behavior.
-     *
-     * @param string $data  The message text to quote. The string must be passed
-     *                      by reference, and the text will be modified in place.
-     *
-     * @access public
-     * @since  1.2
-     */
-    function quotedata(&$data)
-    {
-        /* Change Unix (\n) and Mac (\r) linefeeds into
-         * Internet-standard CRLF (\r\n) linefeeds. */
-        $data = preg_replace(array('/(?<!\r)\n/','/\r(?!\n)/'), "\r\n", $data);
-
-        /* Because a single leading period (.) signifies an end to the
-         * data, legitimate leading periods need to be "doubled"
-         * (e.g. '..'). */
-        $data = str_replace("\n.", "\n..", $data);
-    }
-
-    /**
-     * Send the DATA command.
-     *
-     * @param mixed $data     The message data, either as a string or an open
-     *                        file resource.
-     * @param string $headers The message headers.  If $headers is provided,
-     *                        $data is assumed to contain only body data.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function data($data, $headers = null)
-    {
-        /* Verify that $data is a supported type. */
-        if (!is_string($data) && !is_resource($data)) {
-            return PEAR::raiseError('Expected a string or file resource');
-        }
-
-        /* Start by considering the size of the optional headers string.  We
-         * also account for the addition 4 character "\r\n\r\n" separator
-         * sequence. */
-        $size = (is_null($headers)) ? 0 : strlen($headers) + 4;
-
-        if (is_resource($data)) {
-            $stat = fstat($data);
-            if ($stat === false) {
-                return PEAR::raiseError('Failed to get file size');
-            }
-            $size += $stat['size'];
-        } else {
-            $size += strlen($data);
-        }
-
-        /* RFC 1870, section 3, subsection 3 states "a value of zero indicates
-         * that no fixed maximum message size is in force".  Furthermore, it
-         * says that if "the parameter is omitted no information is conveyed
-         * about the server's fixed maximum message size". */
-        $limit = (isset($this->_esmtp['SIZE'])) ? $this->_esmtp['SIZE'] : 0;
-        if ($limit > 0 && $size >= $limit) {
-            $this->disconnect();
-            return PEAR::raiseError('Message size exceeds server limit');
-        }
-
-        /* Initiate the DATA command. */
-        if (PEAR::isError($error = $this->_put('DATA'))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(354))) {
-            return $error;
-        }
-
-        /* If we have a separate headers string, send it first. */
-        if (!is_null($headers)) {
-            $this->quotedata($headers);
-            if (PEAR::isError($result = $this->_send($headers . "\r\n\r\n"))) {
-                return $result;
-            }
-        }
-
-        /* Now we can send the message body data. */
-        if (is_resource($data)) {
-            /* Stream the contents of the file resource out over our socket 
-             * connection, line by line.  Each line must be run through the 
-             * quoting routine. */
-            while (strlen($line = fread($data, 8192)) > 0) {
-                /* If the last character is an newline, we need to grab the
-                 * next character to check to see if it is a period. */
-                while (!feof($data)) {
-                    $char = fread($data, 1);
-                    $line .= $char;
-                    if ($char != "\n") {
-                        break;
-                    }
-                }
-                $this->quotedata($line);
-                if (PEAR::isError($result = $this->_send($line))) {
-                    return $result;
-                }
-            }
-        } else {
-            /*
-             * Break up the data by sending one chunk (up to 512k) at a time.  
-             * This approach reduces our peak memory usage.
-             */
-            for ($offset = 0; $offset < $size;) {
-                $end = $offset + 512000;
-
-                /*
-                 * Ensure we don't read beyond our data size or span multiple 
-                 * lines.  quotedata() can't properly handle character data 
-                 * that's split across two line break boundaries.
-                 */
-                if ($end >= $size) {
-                    $end = $size;
-                } else {
-                    for (; $end < $size; $end++) {
-                        if ($data[$end] != "\n") {
-                            break;
-                        }
-                    }
-                }
-
-                /* Extract our chunk and run it through the quoting routine. */
-                $chunk = substr($data, $offset, $end - $offset);
-                $this->quotedata($chunk);
-
-                /* If we run into a problem along the way, abort. */
-                if (PEAR::isError($result = $this->_send($chunk))) {
-                    return $result;
-                }
-
-                /* Advance the offset to the end of this chunk. */
-                $offset = $end;
-            }
-        }
-
-        /* Finally, send the DATA terminator sequence. */
-        if (PEAR::isError($result = $this->_send("\r\n.\r\n"))) {
-            return $result;
-        }
-
-        /* Verify that the data was successfully received by the server. */
-        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Send the SEND FROM: command.
-     *
-     * @param string The reverse path to send.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.2.6
-     */
-    function sendFrom($path)
-    {
-        if (PEAR::isError($error = $this->_put('SEND', "FROM:<$path>"))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Backwards-compatibility wrapper for sendFrom().
-     *
-     * @param string The reverse path to send.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     *
-     * @access      public
-     * @since       1.0
-     * @deprecated  1.2.6
-     */
-    function send_from($path)
-    {
-        return sendFrom($path);
-    }
-
-    /**
-     * Send the SOML FROM: command.
-     *
-     * @param string The reverse path to send.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.2.6
-     */
-    function somlFrom($path)
-    {
-        if (PEAR::isError($error = $this->_put('SOML', "FROM:<$path>"))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Backwards-compatibility wrapper for somlFrom().
-     *
-     * @param string The reverse path to send.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     *
-     * @access      public
-     * @since       1.0
-     * @deprecated  1.2.6
-     */
-    function soml_from($path)
-    {
-        return somlFrom($path);
-    }
-
-    /**
-     * Send the SAML FROM: command.
-     *
-     * @param string The reverse path to send.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.2.6
-     */
-    function samlFrom($path)
-    {
-        if (PEAR::isError($error = $this->_put('SAML', "FROM:<$path>"))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Backwards-compatibility wrapper for samlFrom().
-     *
-     * @param string The reverse path to send.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     *
-     * @access      public
-     * @since       1.0
-     * @deprecated  1.2.6
-     */
-    function saml_from($path)
-    {
-        return samlFrom($path);
-    }
-
-    /**
-     * Send the RSET command.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function rset()
-    {
-        if (PEAR::isError($error = $this->_put('RSET'))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Send the VRFY command.
-     *
-     * @param string The string to verify
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function vrfy($string)
-    {
-        /* Note: 251 is also a valid response code */
-        if (PEAR::isError($error = $this->_put('VRFY', $string))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(array(250, 252)))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Send the NOOP command.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function noop()
-    {
-        if (PEAR::isError($error = $this->_put('NOOP'))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Backwards-compatibility method.  identifySender()'s functionality is
-     * now handled internally.
-     *
-     * @return  boolean     This method always return true.
-     *
-     * @access  public
-     * @since   1.0
-     */
-    function identifySender()
-    {
-        return true;
-    }
-
-}
diff --git a/lib/ext/Net/Socket.php b/lib/ext/Net/Socket.php
deleted file mode 100644
index dd1047c..0000000
--- a/lib/ext/Net/Socket.php
+++ /dev/null
@@ -1,653 +0,0 @@
-<?php
-/**
- * Net_Socket
- *
- * PHP Version 4
- *
- * Copyright (c) 1997-2003 The PHP Group
- *
- * This source file is subject to version 2.0 of the PHP license,
- * that is bundled with this package in the file LICENSE, and is
- * available at through the world-wide-web at
- * http://www.php.net/license/2_02.txt.
- * If you did not receive a copy of the PHP license and are unable to
- * obtain it through the world-wide-web, please send a note to
- * license@php.net so we can mail you a copy immediately.
- *
- * Authors: Stig Bakken <ssb@php.net>
- *          Chuck Hagenbuch <chuck@horde.org>
- *
- * @category  Net
- * @package   Net_Socket
- * @author    Stig Bakken <ssb@php.net>
- * @author    Chuck Hagenbuch <chuck@horde.org>
- * @copyright 1997-2003 The PHP Group
- * @license   http://www.php.net/license/2_02.txt PHP 2.02
- * @version   CVS: $Id$
- * @link      http://pear.php.net/packages/Net_Socket
- */
-
-require_once 'PEAR.php';
-
-define('NET_SOCKET_READ', 1);
-define('NET_SOCKET_WRITE', 2);
-define('NET_SOCKET_ERROR', 4);
-
-/**
- * Generalized Socket class.
- *
- * @category  Net
- * @package   Net_Socket
- * @author    Stig Bakken <ssb@php.net>
- * @author    Chuck Hagenbuch <chuck@horde.org>
- * @copyright 1997-2003 The PHP Group
- * @license   http://www.php.net/license/2_02.txt PHP 2.02
- * @link      http://pear.php.net/packages/Net_Socket
- */
-class Net_Socket extends PEAR
-{
-    /**
-     * Socket file pointer.
-     * @var resource $fp
-     */
-    var $fp = null;
-
-    /**
-     * Whether the socket is blocking. Defaults to true.
-     * @var boolean $blocking
-     */
-    var $blocking = true;
-
-    /**
-     * Whether the socket is persistent. Defaults to false.
-     * @var boolean $persistent
-     */
-    var $persistent = false;
-
-    /**
-     * The IP address to connect to.
-     * @var string $addr
-     */
-    var $addr = '';
-
-    /**
-     * The port number to connect to.
-     * @var integer $port
-     */
-    var $port = 0;
-
-    /**
-     * Number of seconds to wait on socket connections before assuming
-     * there's no more data. Defaults to no timeout.
-     * @var integer $timeout
-     */
-    var $timeout = false;
-
-    /**
-     * Number of bytes to read at a time in readLine() and
-     * readAll(). Defaults to 2048.
-     * @var integer $lineLength
-     */
-    var $lineLength = 2048;
-
-    /**
-     * The string to use as a newline terminator. Usually "\r\n" or "\n".
-     * @var string $newline
-     */
-    var $newline = "\r\n";
-
-    /**
-     * Connect to the specified port. If called when the socket is
-     * already connected, it disconnects and connects again.
-     *
-     * @param string  $addr       IP address or host name.
-     * @param integer $port       TCP port number.
-     * @param boolean $persistent (optional) Whether the connection is
-     *                            persistent (kept open between requests
-     *                            by the web server).
-     * @param integer $timeout    (optional) How long to wait for data.
-     * @param array   $options    See options for stream_context_create.
-     *
-     * @access public
-     *
-     * @return boolean | PEAR_Error  True on success or a PEAR_Error on failure.
-     */
-    function connect($addr, $port = 0, $persistent = null,
-                     $timeout = null, $options = null)
-    {
-        if (is_resource($this->fp)) {
-            @fclose($this->fp);
-            $this->fp = null;
-        }
-
-        if (!$addr) {
-            return $this->raiseError('$addr cannot be empty');
-        } elseif (strspn($addr, '.0123456789') == strlen($addr) ||
-                  strstr($addr, '/') !== false) {
-            $this->addr = $addr;
-        } else {
-            $this->addr = @gethostbyname($addr);
-        }
-
-        $this->port = $port % 65536;
-
-        if ($persistent !== null) {
-            $this->persistent = $persistent;
-        }
-
-        if ($timeout !== null) {
-            $this->timeout = $timeout;
-        }
-
-        $openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
-        $errno    = 0;
-        $errstr   = '';
-
-        $old_track_errors = @ini_set('track_errors', 1);
-
-        if ($options && function_exists('stream_context_create')) {
-            if ($this->timeout) {
-                $timeout = $this->timeout;
-            } else {
-                $timeout = 0;
-            }
-            $context = stream_context_create($options);
-
-            // Since PHP 5 fsockopen doesn't allow context specification
-            if (function_exists('stream_socket_client')) {
-                $flags = STREAM_CLIENT_CONNECT;
-
-                if ($this->persistent) {
-                    $flags = STREAM_CLIENT_PERSISTENT;
-                }
-
-                $addr = $this->addr . ':' . $this->port;
-                $fp   = stream_socket_client($addr, $errno, $errstr,
-                                             $timeout, $flags, $context);
-            } else {
-                $fp = @$openfunc($this->addr, $this->port, $errno,
-                                 $errstr, $timeout, $context);
-            }
-        } else {
-            if ($this->timeout) {
-                $fp = @$openfunc($this->addr, $this->port, $errno,
-                                 $errstr, $this->timeout);
-            } else {
-                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr);
-            }
-        }
-
-        if (!$fp) {
-            if ($errno == 0 && !strlen($errstr) && isset($php_errormsg)) {
-                $errstr = $php_errormsg;
-            }
-            @ini_set('track_errors', $old_track_errors);
-            return $this->raiseError($errstr, $errno);
-        }
-
-        @ini_set('track_errors', $old_track_errors);
-        $this->fp = $fp;
-
-        return $this->setBlocking($this->blocking);
-    }
-
-    /**
-     * Disconnects from the peer, closes the socket.
-     *
-     * @access public
-     * @return mixed true on success or a PEAR_Error instance otherwise
-     */
-    function disconnect()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        @fclose($this->fp);
-        $this->fp = null;
-        return true;
-    }
-
-    /**
-     * Set the newline character/sequence to use.
-     *
-     * @param string $newline  Newline character(s)
-     * @return boolean True
-     */
-    function setNewline($newline)
-    {
-        $this->newline = $newline;
-        return true;
-    }
-
-    /**
-     * Find out if the socket is in blocking mode.
-     *
-     * @access public
-     * @return boolean  The current blocking mode.
-     */
-    function isBlocking()
-    {
-        return $this->blocking;
-    }
-
-    /**
-     * Sets whether the socket connection should be blocking or
-     * not. A read call to a non-blocking socket will return immediately
-     * if there is no data available, whereas it will block until there
-     * is data for blocking sockets.
-     *
-     * @param boolean $mode True for blocking sockets, false for nonblocking.
-     *
-     * @access public
-     * @return mixed true on success or a PEAR_Error instance otherwise
-     */
-    function setBlocking($mode)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $this->blocking = $mode;
-        stream_set_blocking($this->fp, (int)$this->blocking);
-        return true;
-    }
-
-    /**
-     * Sets the timeout value on socket descriptor,
-     * expressed in the sum of seconds and microseconds
-     *
-     * @param integer $seconds      Seconds.
-     * @param integer $microseconds Microseconds.
-     *
-     * @access public
-     * @return mixed true on success or a PEAR_Error instance otherwise
-     */
-    function setTimeout($seconds, $microseconds)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return socket_set_timeout($this->fp, $seconds, $microseconds);
-    }
-
-    /**
-     * Sets the file buffering size on the stream.
-     * See php's stream_set_write_buffer for more information.
-     *
-     * @param integer $size Write buffer size.
-     *
-     * @access public
-     * @return mixed on success or an PEAR_Error object otherwise
-     */
-    function setWriteBuffer($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $returned = stream_set_write_buffer($this->fp, $size);
-        if ($returned == 0) {
-            return true;
-        }
-        return $this->raiseError('Cannot set write buffer.');
-    }
-
-    /**
-     * Returns information about an existing socket resource.
-     * Currently returns four entries in the result array:
-     *
-     * <p>
-     * timed_out (bool) - The socket timed out waiting for data<br>
-     * blocked (bool) - The socket was blocked<br>
-     * eof (bool) - Indicates EOF event<br>
-     * unread_bytes (int) - Number of bytes left in the socket buffer<br>
-     * </p>
-     *
-     * @access public
-     * @return mixed Array containing information about existing socket
-     *               resource or a PEAR_Error instance otherwise
-     */
-    function getStatus()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return socket_get_status($this->fp);
-    }
-
-    /**
-     * Get a specified line of data
-     *
-     * @param int $size ??
-     *
-     * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function gets($size = null)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        if (is_null($size)) {
-            return @fgets($this->fp);
-        } else {
-            return @fgets($this->fp, $size);
-        }
-    }
-
-    /**
-     * Read a specified amount of data. This is guaranteed to return,
-     * and has the added benefit of getting everything in one fread()
-     * chunk; if you know the size of the data you're getting
-     * beforehand, this is definitely the way to go.
-     *
-     * @param integer $size The number of bytes to read from the socket.
-     *
-     * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function read($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return @fread($this->fp, $size);
-    }
-
-    /**
-     * Write a specified amount of data.
-     *
-     * @param string  $data      Data to write.
-     * @param integer $blocksize Amount of data to write at once.
-     *                           NULL means all at once.
-     *
-     * @access public
-     * @return mixed If the socket is not connected, returns an instance of
-     *               PEAR_Error
-     *               If the write succeeds, returns the number of bytes written
-     *               If the write fails, returns false.
-     */
-    function write($data, $blocksize = null)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        if (is_null($blocksize) && !OS_WINDOWS) {
-            return @fwrite($this->fp, $data);
-        } else {
-            if (is_null($blocksize)) {
-                $blocksize = 1024;
-            }
-
-            $pos  = 0;
-            $size = strlen($data);
-            while ($pos < $size) {
-                $written = @fwrite($this->fp, substr($data, $pos, $blocksize));
-                if (!$written) {
-                    return $written;
-                }
-                $pos += $written;
-            }
-
-            return $pos;
-        }
-    }
-
-    /**
-     * Write a line of data to the socket, followed by a trailing newline.
-     *
-     * @param string $data Data to write
-     *
-     * @access public
-     * @return mixed fputs result, or an error
-     */
-    function writeLine($data)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return fwrite($this->fp, $data . $this->newline);
-    }
-
-    /**
-     * Tests for end-of-file on a socket descriptor.
-     *
-     * Also returns true if the socket is disconnected.
-     *
-     * @access public
-     * @return bool
-     */
-    function eof()
-    {
-        return (!is_resource($this->fp) || feof($this->fp));
-    }
-
-    /**
-     * Reads a byte of data
-     *
-     * @access public
-     * @return 1 byte of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readByte()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return ord(@fread($this->fp, 1));
-    }
-
-    /**
-     * Reads a word of data
-     *
-     * @access public
-     * @return 1 word of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readWord()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 2);
-        return (ord($buf[0]) + (ord($buf[1]) << 8));
-    }
-
-    /**
-     * Reads an int of data
-     *
-     * @access public
-     * @return integer  1 int of data from the socket, or a PEAR_Error if
-     *                  not connected.
-     */
-    function readInt()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 4);
-        return (ord($buf[0]) + (ord($buf[1]) << 8) +
-                (ord($buf[2]) << 16) + (ord($buf[3]) << 24));
-    }
-
-    /**
-     * Reads a zero-terminated string of data
-     *
-     * @access public
-     * @return string, or a PEAR_Error if
-     *         not connected.
-     */
-    function readString()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $string = '';
-        while (($char = @fread($this->fp, 1)) != "\x00") {
-            $string .= $char;
-        }
-        return $string;
-    }
-
-    /**
-     * Reads an IP Address and returns it in a dot formatted string
-     *
-     * @access public
-     * @return Dot formatted string, or a PEAR_Error if
-     *         not connected.
-     */
-    function readIPAddress()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 4);
-        return sprintf('%d.%d.%d.%d', ord($buf[0]), ord($buf[1]),
-                       ord($buf[2]), ord($buf[3]));
-    }
-
-    /**
-     * Read until either the end of the socket or a newline, whichever
-     * comes first. Strips the trailing newline from the returned data.
-     *
-     * @access public
-     * @return All available data up to a newline, without that
-     *         newline, or until the end of the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readLine()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $line = '';
-
-        $timeout = time() + $this->timeout;
-
-        while (!feof($this->fp) && (!$this->timeout || time() < $timeout)) {
-            $line .= @fgets($this->fp, $this->lineLength);
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, $this->newline);
-            }
-        }
-        return $line;
-    }
-
-    /**
-     * Read until the socket closes, or until there is no more data in
-     * the inner PHP buffer. If the inner buffer is empty, in blocking
-     * mode we wait for at least 1 byte of data. Therefore, in
-     * blocking mode, if there is no data at all to be read, this
-     * function will never exit (unless the socket is closed on the
-     * remote end).
-     *
-     * @access public
-     *
-     * @return string  All data until the socket closes, or a PEAR_Error if
-     *                 not connected.
-     */
-    function readAll()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $data = '';
-        while (!feof($this->fp)) {
-            $data .= @fread($this->fp, $this->lineLength);
-        }
-        return $data;
-    }
-
-    /**
-     * Runs the equivalent of the select() system call on the socket
-     * with a timeout specified by tv_sec and tv_usec.
-     *
-     * @param integer $state   Which of read/write/error to check for.
-     * @param integer $tv_sec  Number of seconds for timeout.
-     * @param integer $tv_usec Number of microseconds for timeout.
-     *
-     * @access public
-     * @return False if select fails, integer describing which of read/write/error
-     *         are ready, or PEAR_Error if not connected.
-     */
-    function select($state, $tv_sec, $tv_usec = 0)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $read   = null;
-        $write  = null;
-        $except = null;
-        if ($state & NET_SOCKET_READ) {
-            $read[] = $this->fp;
-        }
-        if ($state & NET_SOCKET_WRITE) {
-            $write[] = $this->fp;
-        }
-        if ($state & NET_SOCKET_ERROR) {
-            $except[] = $this->fp;
-        }
-        if (false === ($sr = stream_select($read, $write, $except,
-                                          $tv_sec, $tv_usec))) {
-            return false;
-        }
-
-        $result = 0;
-        if (count($read)) {
-            $result |= NET_SOCKET_READ;
-        }
-        if (count($write)) {
-            $result |= NET_SOCKET_WRITE;
-        }
-        if (count($except)) {
-            $result |= NET_SOCKET_ERROR;
-        }
-        return $result;
-    }
-
-    /**
-     * Turns encryption on/off on a connected socket.
-     *
-     * @param bool    $enabled Set this parameter to true to enable encryption
-     *                         and false to disable encryption.
-     * @param integer $type    Type of encryption. See stream_socket_enable_crypto()
-     *                         for values.
-     *
-     * @see    http://se.php.net/manual/en/function.stream-socket-enable-crypto.php
-     * @access public
-     * @return false on error, true on success and 0 if there isn't enough data
-     *         and the user should try again (non-blocking sockets only).
-     *         A PEAR_Error object is returned if the socket is not
-     *         connected
-     */
-    function enableCrypto($enabled, $type)
-    {
-        if (version_compare(phpversion(), "5.1.0", ">=")) {
-            if (!is_resource($this->fp)) {
-                return $this->raiseError('not connected');
-            }
-            return @stream_socket_enable_crypto($this->fp, $enabled, $type);
-        } else {
-            $msg = 'Net_Socket::enableCrypto() requires php version >= 5.1.0';
-            return $this->raiseError($msg);
-        }
-    }
-
-}
diff --git a/lib/ext/Net/URL2.php b/lib/ext/Net/URL2.php
deleted file mode 100644
index 9989404..0000000
--- a/lib/ext/Net/URL2.php
+++ /dev/null
@@ -1,942 +0,0 @@
-<?php
-/**
- * Net_URL2, a class representing a URL as per RFC 3986.
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2007-2009, Peytz & Co. A/S
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the distribution.
- *   * Neither the name of the Net_URL2 nor the names of its contributors may
- *     be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Networking
- * @package   Net_URL2
- * @author    Christian Schmidt <schmidt@php.net>
- * @copyright 2007-2009 Peytz & Co. A/S
- * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
- * @version   CVS: $Id: URL2.php 309223 2011-03-14 14:26:32Z till $
- * @link      http://www.rfc-editor.org/rfc/rfc3986.txt
- */
-
-/**
- * Represents a URL as per RFC 3986.
- *
- * @category  Networking
- * @package   Net_URL2
- * @author    Christian Schmidt <schmidt@php.net>
- * @copyright 2007-2009 Peytz & Co. A/S
- * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/Net_URL2
- */
-class Net_URL2
-{
-    /**
-     * Do strict parsing in resolve() (see RFC 3986, section 5.2.2). Default
-     * is true.
-     */
-    const OPTION_STRICT = 'strict';
-
-    /**
-     * Represent arrays in query using PHP's [] notation. Default is true.
-     */
-    const OPTION_USE_BRACKETS = 'use_brackets';
-
-    /**
-     * URL-encode query variable keys. Default is true.
-     */
-    const OPTION_ENCODE_KEYS = 'encode_keys';
-
-    /**
-     * Query variable separators when parsing the query string. Every character
-     * is considered a separator. Default is "&".
-     */
-    const OPTION_SEPARATOR_INPUT = 'input_separator';
-
-    /**
-     * Query variable separator used when generating the query string. Default
-     * is "&".
-     */
-    const OPTION_SEPARATOR_OUTPUT = 'output_separator';
-
-    /**
-     * Default options corresponds to how PHP handles $_GET.
-     */
-    private $_options = array(
-        self::OPTION_STRICT           => true,
-        self::OPTION_USE_BRACKETS     => true,
-        self::OPTION_ENCODE_KEYS      => true,
-        self::OPTION_SEPARATOR_INPUT  => '&',
-        self::OPTION_SEPARATOR_OUTPUT => '&',
-        );
-
-    /**
-     * @var  string|bool
-     */
-    private $_scheme = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_userinfo = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_host = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_port = false;
-
-    /**
-     * @var  string
-     */
-    private $_path = '';
-
-    /**
-     * @var  string|bool
-     */
-    private $_query = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_fragment = false;
-
-    /**
-     * Constructor.
-     *
-     * @param string $url     an absolute or relative URL
-     * @param array  $options an array of OPTION_xxx constants
-     *
-     * @return $this
-     * @uses   self::parseUrl()
-     */
-    public function __construct($url, array $options = array())
-    {
-        foreach ($options as $optionName => $value) {
-            if (array_key_exists($optionName, $this->_options)) {
-                $this->_options[$optionName] = $value;
-            }
-        }
-
-        $this->parseUrl($url);
-    }
-
-    /**
-     * Magic Setter.
-     *
-     * This method will magically set the value of a private variable ($var)
-     * with the value passed as the args
-     *
-     * @param  string $var      The private variable to set.
-     * @param  mixed  $arg      An argument of any type.
-     * @return void
-     */
-    public function __set($var, $arg)
-    {
-        $method = 'set' . $var;
-        if (method_exists($this, $method)) {
-            $this->$method($arg);
-        }
-    }
-
-    /**
-     * Magic Getter.
-     *
-     * This is the magic get method to retrieve the private variable
-     * that was set by either __set() or it's setter...
-     *
-     * @param  string $var         The property name to retrieve.
-     * @return mixed  $this->$var  Either a boolean false if the
-     *                             property is not set or the value
-     *                             of the private property.
-     */
-    public function __get($var)
-    {
-        $method = 'get' . $var;
-        if (method_exists($this, $method)) {
-            return $this->$method();
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the scheme, e.g. "http" or "urn", or false if there is no
-     * scheme specified, i.e. if this is a relative URL.
-     *
-     * @return  string|bool
-     */
-    public function getScheme()
-    {
-        return $this->_scheme;
-    }
-
-    /**
-     * Sets the scheme, e.g. "http" or "urn". Specify false if there is no
-     * scheme specified, i.e. if this is a relative URL.
-     *
-     * @param string|bool $scheme e.g. "http" or "urn", or false if there is no
-     *                            scheme specified, i.e. if this is a relative
-     *                            URL
-     *
-     * @return $this
-     * @see    getScheme()
-     */
-    public function setScheme($scheme)
-    {
-        $this->_scheme = $scheme;
-        return $this;
-    }
-
-    /**
-     * Returns the user part of the userinfo part (the part preceding the first
-     *  ":"), or false if there is no userinfo part.
-     *
-     * @return  string|bool
-     */
-    public function getUser()
-    {
-        return $this->_userinfo !== false
-            ? preg_replace('@:.*$@', '', $this->_userinfo)
-            : false;
-    }
-
-    /**
-     * Returns the password part of the userinfo part (the part after the first
-     *  ":"), or false if there is no userinfo part (i.e. the URL does not
-     * contain "@" in front of the hostname) or the userinfo part does not
-     * contain ":".
-     *
-     * @return  string|bool
-     */
-    public function getPassword()
-    {
-        return $this->_userinfo !== false
-            ? substr(strstr($this->_userinfo, ':'), 1)
-            : false;
-    }
-
-    /**
-     * Returns the userinfo part, or false if there is none, i.e. if the
-     * authority part does not contain "@".
-     *
-     * @return  string|bool
-     */
-    public function getUserinfo()
-    {
-        return $this->_userinfo;
-    }
-
-    /**
-     * Sets the userinfo part. If two arguments are passed, they are combined
-     * in the userinfo part as username ":" password.
-     *
-     * @param string|bool $userinfo userinfo or username
-     * @param string|bool $password optional password, or false
-     *
-     * @return $this
-     */
-    public function setUserinfo($userinfo, $password = false)
-    {
-        $this->_userinfo = $userinfo;
-        if ($password !== false) {
-            $this->_userinfo .= ':' . $password;
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the host part, or false if there is no authority part, e.g.
-     * relative URLs.
-     *
-     * @return  string|bool a hostname, an IP address, or false
-     */
-    public function getHost()
-    {
-        return $this->_host;
-    }
-
-    /**
-     * Sets the host part. Specify false if there is no authority part, e.g.
-     * relative URLs.
-     *
-     * @param string|bool $host a hostname, an IP address, or false
-     *
-     * @return $this
-     */
-    public function setHost($host)
-    {
-        $this->_host = $host;
-        return $this;
-    }
-
-    /**
-     * Returns the port number, or false if there is no port number specified,
-     * i.e. if the default port is to be used.
-     *
-     * @return  string|bool
-     */
-    public function getPort()
-    {
-        return $this->_port;
-    }
-
-    /**
-     * Sets the port number. Specify false if there is no port number specified,
-     * i.e. if the default port is to be used.
-     *
-     * @param string|bool $port a port number, or false
-     *
-     * @return $this
-     */
-    public function setPort($port)
-    {
-        $this->_port = $port;
-        return $this;
-    }
-
-    /**
-     * Returns the authority part, i.e. [ userinfo "@" ] host [ ":" port ], or
-     * false if there is no authority.
-     *
-     * @return string|bool
-     */
-    public function getAuthority()
-    {
-        if (!$this->_host) {
-            return false;
-        }
-
-        $authority = '';
-
-        if ($this->_userinfo !== false) {
-            $authority .= $this->_userinfo . '@';
-        }
-
-        $authority .= $this->_host;
-
-        if ($this->_port !== false) {
-            $authority .= ':' . $this->_port;
-        }
-
-        return $authority;
-    }
-
-    /**
-     * Sets the authority part, i.e. [ userinfo "@" ] host [ ":" port ]. Specify
-     * false if there is no authority.
-     *
-     * @param string|false $authority a hostname or an IP addresse, possibly
-     *                                with userinfo prefixed and port number
-     *                                appended, e.g. "foo:bar@example.org:81".
-     *
-     * @return $this
-     */
-    public function setAuthority($authority)
-    {
-        $this->_userinfo = false;
-        $this->_host     = false;
-        $this->_port     = false;
-        if (preg_match('@^(([^\@]*)\@)?([^:]+)(:(\d*))?$@', $authority, $reg)) {
-            if ($reg[1]) {
-                $this->_userinfo = $reg[2];
-            }
-
-            $this->_host = $reg[3];
-            if (isset($reg[5])) {
-                $this->_port = $reg[5];
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the path part (possibly an empty string).
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->_path;
-    }
-
-    /**
-     * Sets the path part (possibly an empty string).
-     *
-     * @param string $path a path
-     *
-     * @return $this
-     */
-    public function setPath($path)
-    {
-        $this->_path = $path;
-        return $this;
-    }
-
-    /**
-     * Returns the query string (excluding the leading "?"), or false if "?"
-     * is not present in the URL.
-     *
-     * @return  string|bool
-     * @see     self::getQueryVariables()
-     */
-    public function getQuery()
-    {
-        return $this->_query;
-    }
-
-    /**
-     * Sets the query string (excluding the leading "?"). Specify false if "?"
-     * is not present in the URL.
-     *
-     * @param string|bool $query a query string, e.g. "foo=1&bar=2"
-     *
-     * @return $this
-     * @see    self::setQueryVariables()
-     */
-    public function setQuery($query)
-    {
-        $this->_query = $query;
-        return $this;
-    }
-
-    /**
-     * Returns the fragment name, or false if "#" is not present in the URL.
-     *
-     * @return  string|bool
-     */
-    public function getFragment()
-    {
-        return $this->_fragment;
-    }
-
-    /**
-     * Sets the fragment name. Specify false if "#" is not present in the URL.
-     *
-     * @param string|bool $fragment a fragment excluding the leading "#", or
-     *                              false
-     *
-     * @return $this
-     */
-    public function setFragment($fragment)
-    {
-        $this->_fragment = $fragment;
-        return $this;
-    }
-
-    /**
-     * Returns the query string like an array as the variables would appear in
-     * $_GET in a PHP script. If the URL does not contain a "?", an empty array
-     * is returned.
-     *
-     * @return  array
-     */
-    public function getQueryVariables()
-    {
-        $pattern = '/[' .
-                   preg_quote($this->getOption(self::OPTION_SEPARATOR_INPUT), '/') .
-                   ']/';
-        $parts   = preg_split($pattern, $this->_query, -1, PREG_SPLIT_NO_EMPTY);
-        $return  = array();
-
-        foreach ($parts as $part) {
-            if (strpos($part, '=') !== false) {
-                list($key, $value) = explode('=', $part, 2);
-            } else {
-                $key   = $part;
-                $value = null;
-            }
-
-            if ($this->getOption(self::OPTION_ENCODE_KEYS)) {
-                $key = rawurldecode($key);
-            }
-            $value = rawurldecode($value);
-
-            if ($this->getOption(self::OPTION_USE_BRACKETS) &&
-                preg_match('#^(.*)\[([0-9a-z_-]*)\]#i', $key, $matches)) {
-
-                $key = $matches[1];
-                $idx = $matches[2];
-
-                // Ensure is an array
-                if (empty($return[$key]) || !is_array($return[$key])) {
-                    $return[$key] = array();
-                }
-
-                // Add data
-                if ($idx === '') {
-                    $return[$key][] = $value;
-                } else {
-                    $return[$key][$idx] = $value;
-                }
-            } elseif (!$this->getOption(self::OPTION_USE_BRACKETS)
-                      && !empty($return[$key])
-            ) {
-                $return[$key]   = (array) $return[$key];
-                $return[$key][] = $value;
-            } else {
-                $return[$key] = $value;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Sets the query string to the specified variable in the query string.
-     *
-     * @param array $array (name => value) array
-     *
-     * @return $this
-     */
-    public function setQueryVariables(array $array)
-    {
-        if (!$array) {
-            $this->_query = false;
-        } else {
-            $this->_query = $this->buildQuery(
-                $array,
-                $this->getOption(self::OPTION_SEPARATOR_OUTPUT)
-            );
-        }
-        return $this;
-    }
-
-    /**
-     * Sets the specified variable in the query string.
-     *
-     * @param string $name  variable name
-     * @param mixed  $value variable value
-     *
-     * @return $this
-     */
-    public function setQueryVariable($name, $value)
-    {
-        $array = $this->getQueryVariables();
-        $array[$name] = $value;
-        $this->setQueryVariables($array);
-        return $this;
-    }
-
-    /**
-     * Removes the specifed variable from the query string.
-     *
-     * @param string $name a query string variable, e.g. "foo" in "?foo=1"
-     *
-     * @return void
-     */
-    public function unsetQueryVariable($name)
-    {
-        $array = $this->getQueryVariables();
-        unset($array[$name]);
-        $this->setQueryVariables($array);
-    }
-
-    /**
-     * Returns a string representation of this URL.
-     *
-     * @return  string
-     */
-    public function getURL()
-    {
-        // See RFC 3986, section 5.3
-        $url = "";
-
-        if ($this->_scheme !== false) {
-            $url .= $this->_scheme . ':';
-        }
-
-        $authority = $this->getAuthority();
-        if ($authority !== false) {
-            $url .= '//' . $authority;
-        }
-        $url .= $this->_path;
-
-        if ($this->_query !== false) {
-            $url .= '?' . $this->_query;
-        }
-
-        if ($this->_fragment !== false) {
-            $url .= '#' . $this->_fragment;
-        }
-    
-        return $url;
-    }
-
-    /**
-     * Returns a string representation of this URL.
-     *
-     * @return  string
-     * @see toString()
-     */
-    public function __toString()
-    {
-        return $this->getURL();
-    }
-
-    /** 
-     * Returns a normalized string representation of this URL. This is useful
-     * for comparison of URLs.
-     *
-     * @return  string
-     */
-    public function getNormalizedURL()
-    {
-        $url = clone $this;
-        $url->normalize();
-        return $url->getUrl();
-    }
-
-    /** 
-     * Returns a normalized Net_URL2 instance.
-     *
-     * @return  Net_URL2
-     */
-    public function normalize()
-    {
-        // See RFC 3886, section 6
-
-        // Schemes are case-insensitive
-        if ($this->_scheme) {
-            $this->_scheme = strtolower($this->_scheme);
-        }
-
-        // Hostnames are case-insensitive
-        if ($this->_host) {
-            $this->_host = strtolower($this->_host);
-        }
-
-        // Remove default port number for known schemes (RFC 3986, section 6.2.3)
-        if ($this->_port &&
-            $this->_scheme &&
-            $this->_port == getservbyname($this->_scheme, 'tcp')) {
-
-            $this->_port = false;
-        }
-
-        // Normalize case of %XX percentage-encodings (RFC 3986, section 6.2.2.1)
-        foreach (array('_userinfo', '_host', '_path') as $part) {
-            if ($this->$part) {
-                $this->$part = preg_replace('/%[0-9a-f]{2}/ie',
-                                            'strtoupper("\0")',
-                                            $this->$part);
-            }
-        }
-
-        // Path segment normalization (RFC 3986, section 6.2.2.3)
-        $this->_path = self::removeDotSegments($this->_path);
-
-        // Scheme based normalization (RFC 3986, section 6.2.3)
-        if ($this->_host && !$this->_path) {
-            $this->_path = '/';
-        }
-    }
-
-    /**
-     * Returns whether this instance represents an absolute URL.
-     *
-     * @return  bool
-     */
-    public function isAbsolute()
-    {
-        return (bool) $this->_scheme;
-    }
-
-    /**
-     * Returns an Net_URL2 instance representing an absolute URL relative to
-     * this URL.
-     *
-     * @param Net_URL2|string $reference relative URL
-     *
-     * @return Net_URL2
-     */
-    public function resolve($reference)
-    {
-        if (!$reference instanceof Net_URL2) {
-            $reference = new self($reference);
-        }
-        if (!$this->isAbsolute()) {
-            throw new Exception('Base-URL must be absolute');
-        }
-
-        // A non-strict parser may ignore a scheme in the reference if it is
-        // identical to the base URI's scheme.
-        if (!$this->getOption(self::OPTION_STRICT) && $reference->_scheme == $this->_scheme) {
-            $reference->_scheme = false;
-        }
-
-        $target = new self('');
-        if ($reference->_scheme !== false) {
-            $target->_scheme = $reference->_scheme;
-            $target->setAuthority($reference->getAuthority());
-            $target->_path  = self::removeDotSegments($reference->_path);
-            $target->_query = $reference->_query;
-        } else {
-            $authority = $reference->getAuthority();
-            if ($authority !== false) {
-                $target->setAuthority($authority);
-                $target->_path  = self::removeDotSegments($reference->_path);
-                $target->_query = $reference->_query;
-            } else {
-                if ($reference->_path == '') {
-                    $target->_path = $this->_path;
-                    if ($reference->_query !== false) {
-                        $target->_query = $reference->_query;
-                    } else {
-                        $target->_query = $this->_query;
-                    }
-                } else {
-                    if (substr($reference->_path, 0, 1) == '/') {
-                        $target->_path = self::removeDotSegments($reference->_path);
-                    } else {
-                        // Merge paths (RFC 3986, section 5.2.3)
-                        if ($this->_host !== false && $this->_path == '') {
-                            $target->_path = '/' . $this->_path;
-                        } else {
-                            $i = strrpos($this->_path, '/');
-                            if ($i !== false) {
-                                $target->_path = substr($this->_path, 0, $i + 1);
-                            }
-                            $target->_path .= $reference->_path;
-                        }
-                        $target->_path = self::removeDotSegments($target->_path);
-                    }
-                    $target->_query = $reference->_query;
-                }
-                $target->setAuthority($this->getAuthority());
-            }
-            $target->_scheme = $this->_scheme;
-        }
-
-        $target->_fragment = $reference->_fragment;
-
-        return $target;
-    }
-
-    /**
-     * Removes dots as described in RFC 3986, section 5.2.4, e.g.
-     * "/foo/../bar/baz" => "/bar/baz"
-     *
-     * @param string $path a path
-     *
-     * @return string a path
-     */
-    public static function removeDotSegments($path)
-    {
-        $output = '';
-
-        // Make sure not to be trapped in an infinite loop due to a bug in this
-        // method
-        $j = 0;
-        while ($path && $j++ < 100) {
-            if (substr($path, 0, 2) == './') {
-                // Step 2.A
-                $path = substr($path, 2);
-            } elseif (substr($path, 0, 3) == '../') {
-                // Step 2.A
-                $path = substr($path, 3);
-            } elseif (substr($path, 0, 3) == '/./' || $path == '/.') {
-                // Step 2.B
-                $path = '/' . substr($path, 3);
-            } elseif (substr($path, 0, 4) == '/../' || $path == '/..') {
-                // Step 2.C
-                $path   = '/' . substr($path, 4);
-                $i      = strrpos($output, '/');
-                $output = $i === false ? '' : substr($output, 0, $i);
-            } elseif ($path == '.' || $path == '..') {
-                // Step 2.D
-                $path = '';
-            } else {
-                // Step 2.E
-                $i = strpos($path, '/');
-                if ($i === 0) {
-                    $i = strpos($path, '/', 1);
-                }
-                if ($i === false) {
-                    $i = strlen($path);
-                }
-                $output .= substr($path, 0, $i);
-                $path = substr($path, $i);
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * Percent-encodes all non-alphanumeric characters except these: _ . - ~
-     * Similar to PHP's rawurlencode(), except that it also encodes ~ in PHP
-     * 5.2.x and earlier.
-     *
-     * @param  $raw the string to encode
-     * @return string
-     */
-    public static function urlencode($string)
-    {
-    	$encoded = rawurlencode($string);
-
-        // This is only necessary in PHP < 5.3.
-        $encoded = str_replace('%7E', '~', $encoded);
-        return $encoded;
-    }
-
-    /**
-     * Returns a Net_URL2 instance representing the canonical URL of the
-     * currently executing PHP script.
-     *
-     * @return  string
-     */
-    public static function getCanonical()
-    {
-        if (!isset($_SERVER['REQUEST_METHOD'])) {
-            // ALERT - no current URL
-            throw new Exception('Script was not called through a webserver');
-        }
-
-        // Begin with a relative URL
-        $url = new self($_SERVER['PHP_SELF']);
-        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
-        $url->_host   = $_SERVER['SERVER_NAME'];
-        $port = $_SERVER['SERVER_PORT'];
-        if ($url->_scheme == 'http' && $port != 80 ||
-            $url->_scheme == 'https' && $port != 443) {
-
-            $url->_port = $port;
-        }
-        return $url;
-    }
-
-    /**
-     * Returns the URL used to retrieve the current request.
-     *
-     * @return  string
-     */
-    public static function getRequestedURL()
-    {
-        return self::getRequested()->getUrl();
-    }
-
-    /**
-     * Returns a Net_URL2 instance representing the URL used to retrieve the
-     * current request.
-     *
-     * @return  Net_URL2
-     */
-    public static function getRequested()
-    {
-        if (!isset($_SERVER['REQUEST_METHOD'])) {
-            // ALERT - no current URL
-            throw new Exception('Script was not called through a webserver');
-        }
-
-        // Begin with a relative URL
-        $url = new self($_SERVER['REQUEST_URI']);
-        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
-        // Set host and possibly port
-        $url->setAuthority($_SERVER['HTTP_HOST']);
-        return $url;
-    }
-
-    /**
-     * Returns the value of the specified option.
-     *
-     * @param string $optionName The name of the option to retrieve
-     *
-     * @return  mixed
-     */
-    public function getOption($optionName)
-    {
-        return isset($this->_options[$optionName])
-            ? $this->_options[$optionName] : false;
-    }
-
-    /**
-     * A simple version of http_build_query in userland. The encoded string is
-     * percentage encoded according to RFC 3986.
-     *
-     * @param array  $data      An array, which has to be converted into
-     *                          QUERY_STRING. Anything is possible.
-     * @param string $seperator See {@link self::OPTION_SEPARATOR_OUTPUT}
-     * @param string $key       For stacked values (arrays in an array).
-     *
-     * @return string
-     */
-    protected function buildQuery(array $data, $separator, $key = null)
-    {
-        $query = array();
-        foreach ($data as $name => $value) {
-            if ($this->getOption(self::OPTION_ENCODE_KEYS) === true) {
-                $name = rawurlencode($name);
-            }
-            if ($key !== null) {
-                if ($this->getOption(self::OPTION_USE_BRACKETS) === true) {
-                    $name = $key . '[' . $name . ']';
-                } else {
-                    $name = $key;
-                }
-            }
-            if (is_array($value)) {
-                $query[] = $this->buildQuery($value, $separator, $name);
-            } else {
-                $query[] = $name . '=' . rawurlencode($value);
-            }
-        }
-        return implode($separator, $query);
-    }
-
-    /**
-     * This method uses a funky regex to parse the url into the designated parts.
-     *
-     * @param string $url
-     *
-     * @return void
-     * @uses   self::$_scheme, self::setAuthority(), self::$_path, self::$_query,
-     *         self::$_fragment
-     * @see    self::__construct()
-     */
-    protected function parseUrl($url)
-    {
-        // The regular expression is copied verbatim from RFC 3986, appendix B.
-        // The expression does not validate the URL but matches any string.
-        preg_match('!^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?!',
-                   $url,
-                   $matches);
-
-        // "path" is always present (possibly as an empty string); the rest
-        // are optional.
-        $this->_scheme   = !empty($matches[1]) ? $matches[2] : false;
-        $this->setAuthority(!empty($matches[3]) ? $matches[4] : false);
-        $this->_path     = $matches[5];
-        $this->_query    = !empty($matches[6]) ? $matches[7] : false;
-        $this->_fragment = !empty($matches[8]) ? $matches[9] : false;
-    }
-}
diff --git a/lib/ext/PEAR.php b/lib/ext/PEAR.php
deleted file mode 100644
index f4dfd96..0000000
--- a/lib/ext/PEAR.php
+++ /dev/null
@@ -1,1137 +0,0 @@
-<?php
-/**
- * PEAR, the PHP Extension and Application Repository
- *
- * PEAR class and PEAR_Error class
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**#@+
- * ERROR constants
- */
-define('PEAR_ERROR_RETURN',     1);
-define('PEAR_ERROR_PRINT',      2);
-define('PEAR_ERROR_TRIGGER',    4);
-define('PEAR_ERROR_DIE',        8);
-define('PEAR_ERROR_CALLBACK',  16);
-/**
- * WARNING: obsolete
- * @deprecated
- */
-define('PEAR_ERROR_EXCEPTION', 32);
-/**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
-
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
-} else {
-    define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
-}
-
-$GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
-$GLOBALS['_PEAR_default_error_options']  = E_USER_NOTICE;
-$GLOBALS['_PEAR_destructor_object_list'] = array();
-$GLOBALS['_PEAR_shutdown_funcs']         = array();
-$GLOBALS['_PEAR_error_handler_stack']    = array();
-
-@ini_set('track_errors', true);
-
-/**
- * Base class for other PEAR classes.  Provides rudimentary
- * emulation of destructors.
- *
- * If you want a destructor in your class, inherit PEAR and make a
- * destructor method called _yourclassname (same name as the
- * constructor, but with a "_" prefix).  Also, in your constructor you
- * have to call the PEAR constructor: $this->PEAR();.
- * The destructor method will be called without parameters.  Note that
- * at in some SAPI implementations (such as Apache), any output during
- * the request shutdown (in which destructors are called) seems to be
- * discarded.  If you need to get any debug information from your
- * destructor, use error_log(), syslog() or something similar.
- *
- * IMPORTANT! To use the emulated destructors you need to create the
- * objects by reference: $obj =& new PEAR_child;
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
- * @link       http://pear.php.net/package/PEAR
- * @see        PEAR_Error
- * @since      Class available since PHP 4.0.2
- * @link        http://pear.php.net/manual/en/core.pear.php#core.pear.pear
- */
-class PEAR
-{
-    // {{{ properties
-
-    /**
-     * Whether to enable internal debug messages.
-     *
-     * @var     bool
-     * @access  private
-     */
-    var $_debug = false;
-
-    /**
-     * Default error mode for this object.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_mode = null;
-
-    /**
-     * Default error options used for this object when error mode
-     * is PEAR_ERROR_TRIGGER.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_options = null;
-
-    /**
-     * Default error handler (callback) for this object, if error mode is
-     * PEAR_ERROR_CALLBACK.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_default_error_handler = '';
-
-    /**
-     * Which class to use for error objects.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_error_class = 'PEAR_Error';
-
-    /**
-     * An array of expected errors.
-     *
-     * @var     array
-     * @access  private
-     */
-    var $_expected_errors = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * Constructor.  Registers this object in
-     * $_PEAR_destructor_object_list for destructor emulation if a
-     * destructor object exists.
-     *
-     * @param string $error_class  (optional) which class to use for
-     *        error objects, defaults to PEAR_Error.
-     * @access public
-     * @return void
-     */
-    function PEAR($error_class = null)
-    {
-        $classname = strtolower(get_class($this));
-        if ($this->_debug) {
-            print "PEAR constructor called, class=$classname\n";
-        }
-        if ($error_class !== null) {
-            $this->_error_class = $error_class;
-        }
-        while ($classname && strcasecmp($classname, "pear")) {
-            $destructor = "_$classname";
-            if (method_exists($this, $destructor)) {
-                global $_PEAR_destructor_object_list;
-                $_PEAR_destructor_object_list[] = &$this;
-                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-                    register_shutdown_function("_PEAR_call_destructors");
-                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-                }
-                break;
-            } else {
-                $classname = get_parent_class($classname);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ destructor
-
-    /**
-     * Destructor (the emulated type of...).  Does nothing right now,
-     * but is included for forward compatibility, so subclass
-     * destructors should always call it.
-     *
-     * See the note in the class desciption about output from
-     * destructors.
-     *
-     * @access public
-     * @return void
-     */
-    function _PEAR() {
-        if ($this->_debug) {
-            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
-        }
-    }
-
-    // }}}
-    // {{{ getStaticProperty()
-
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-
-        return $properties[$class][$var];
-    }
-
-    // }}}
-    // {{{ registerShutdownFunc()
-
-    /**
-    * Use this function to register a shutdown method for static
-    * classes.
-    *
-    * @access public
-    * @param  mixed $func  The function name (or array of class/method) to call
-    * @param  mixed $args  The arguments to pass to the function
-    * @return void
-    */
-    function registerShutdownFunc($func, $args = array())
-    {
-        // if we are called statically, there is a potential
-        // that no shutdown func is registered.  Bug #6445
-        if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-            register_shutdown_function("_PEAR_call_destructors");
-            $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-        }
-        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
-    }
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Tell whether a value is a PEAR error.
-     *
-     * @param   mixed $data   the value to test
-     * @param   int   $code   if $data is an error object, return true
-     *                        only if $code is a string and
-     *                        $obj->getMessage() == $code or
-     *                        $code is an integer and $obj->getCode() == $code
-     * @access  public
-     * @return  bool    true if parameter is an error
-     */
-    static function isError($data, $code = null)
-    {
-        if (!is_object($data) || !is_a($data, 'PEAR_Error')) {
-            return false;
-        }
-
-        if (is_null($code)) {
-            return true;
-        } elseif (is_string($code)) {
-            return $data->getMessage() == $code;
-        }
-
-        return $data->getCode() == $code;
-    }
-
-    // }}}
-    // {{{ setErrorHandling()
-
-    /**
-     * Sets how errors generated by this object should be handled.
-     * Can be invoked both in objects and statically.  If called
-     * statically, setErrorHandling sets the default behaviour for all
-     * PEAR objects.  If called in an object, setErrorHandling sets
-     * the default behaviour for that object.
-     *
-     * @param int $mode
-     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options
-     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
-     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *
-     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
-     *        to be the callback function or method.  A callback
-     *        function is a string with the name of the function, a
-     *        callback method is an array of two elements: the element
-     *        at index 0 is the object, and the element at index 1 is
-     *        the name of the method to call in the object.
-     *
-     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
-     *        a printf format string used when printing the error
-     *        message.
-     *
-     * @access public
-     * @return void
-     * @see PEAR_ERROR_RETURN
-     * @see PEAR_ERROR_PRINT
-     * @see PEAR_ERROR_TRIGGER
-     * @see PEAR_ERROR_DIE
-     * @see PEAR_ERROR_CALLBACK
-     * @see PEAR_ERROR_EXCEPTION
-     *
-     * @since PHP 4.0.5
-     */
-
-    function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $setmode     = &$this->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
-        } else {
-            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        }
-
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-    }
-
-    // }}}
-    // {{{ expectError()
-
-    /**
-     * This method is used to tell which errors you expect to get.
-     * Expected errors are always returned with error mode
-     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
-     * and this method pushes a new element onto it.  The list of
-     * expected errors are in effect until they are popped off the
-     * stack with the popExpect() method.
-     *
-     * Note that this method can not be called statically
-     *
-     * @param mixed $code a single error code or an array of error codes to expect
-     *
-     * @return int     the new depth of the "expected errors" stack
-     * @access public
-     */
-    function expectError($code = '*')
-    {
-        if (is_array($code)) {
-            array_push($this->_expected_errors, $code);
-        } else {
-            array_push($this->_expected_errors, array($code));
-        }
-        return sizeof($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ popExpect()
-
-    /**
-     * This method pops one element off the expected error codes
-     * stack.
-     *
-     * @return array   the list of error codes that were popped
-     */
-    function popExpect()
-    {
-        return array_pop($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ _checkDelExpect()
-
-    /**
-     * This method checks unsets an error code if available
-     *
-     * @param mixed error code
-     * @return bool true if the error code was unset, false otherwise
-     * @access private
-     * @since PHP 4.3.0
-     */
-    function _checkDelExpect($error_code)
-    {
-        $deleted = false;
-
-        foreach ($this->_expected_errors AS $key => $error_array) {
-            if (in_array($error_code, $error_array)) {
-                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
-                $deleted = true;
-            }
-
-            // clean up empty arrays
-            if (0 == count($this->_expected_errors[$key])) {
-                unset($this->_expected_errors[$key]);
-            }
-        }
-        return $deleted;
-    }
-
-    // }}}
-    // {{{ delExpect()
-
-    /**
-     * This method deletes all occurences of the specified element from
-     * the expected error codes stack.
-     *
-     * @param  mixed $error_code error code that should be deleted
-     * @return mixed list of error codes that were deleted or error
-     * @access public
-     * @since PHP 4.3.0
-     */
-    function delExpect($error_code)
-    {
-        $deleted = false;
-        if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here;
-            // we walk through it trying to unset all
-            // values
-            foreach($error_code as $key => $error) {
-                if ($this->_checkDelExpect($error)) {
-                    $deleted =  true;
-                } else {
-                    $deleted = false;
-                }
-            }
-            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        } elseif (!empty($error_code)) {
-            // $error_code comes alone, trying to unset it
-            if ($this->_checkDelExpect($error_code)) {
-                return true;
-            } else {
-                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-            }
-        }
-
-        // $error_code is empty
-        return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * This method is a wrapper that returns an instance of the
-     * configured error class with this object's default error
-     * handling applied.  If the $mode and $options parameters are not
-     * specified, the object's defaults are used.
-     *
-     * @param mixed $message a text error message or a PEAR error object
-     *
-     * @param int $code      a numeric error code (it is up to your class
-     *                  to define these if you want to use codes)
-     *
-     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
-     *                  specifies the PHP-internal error level (one of
-     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *                  If $mode is PEAR_ERROR_CALLBACK, this
-     *                  parameter specifies the callback function or
-     *                  method.  In other error modes this parameter
-     *                  is ignored.
-     *
-     * @param string $userinfo If you need to pass along for example debug
-     *                  information, this parameter is meant for that.
-     *
-     * @param string $error_class The returned error object will be
-     *                  instantiated from this class, if specified.
-     *
-     * @param bool $skipmsg If true, raiseError will only pass error codes,
-     *                  the error message parameter will be dropped.
-     *
-     * @access public
-     * @return object   a PEAR error object
-     * @see PEAR::setErrorHandling
-     * @since PHP 4.0.5
-     */
-    function &raiseError($message = null,
-                         $code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $error_class = null,
-                         $skipmsg = false)
-    {
-        // The error is yet a PEAR error object
-        if (is_object($message)) {
-            $code        = $message->getCode();
-            $userinfo    = $message->getUserInfo();
-            $error_class = $message->getType();
-            $message->error_message_prefix = '';
-            $message     = $message->getMessage();
-        }
-
-        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
-            if ($exp[0] == "*" ||
-                (is_int(reset($exp)) && in_array($code, $exp)) ||
-                (is_string(reset($exp)) && in_array($message, $exp))) {
-                $mode = PEAR_ERROR_RETURN;
-            }
-        }
-
-        // No mode given, try global ones
-        if ($mode === null) {
-            // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            // Global error handler
-            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
-                $mode    = $GLOBALS['_PEAR_default_error_mode'];
-                $options = $GLOBALS['_PEAR_default_error_options'];
-            }
-        }
-
-        if ($error_class !== null) {
-            $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
-        } else {
-            $ec = 'PEAR_Error';
-        }
-
-        if (intval(PHP_VERSION) < 5) {
-            // little non-eval hack to fix bug #12147
-            include 'PEAR/FixPHP5PEARWarnings.php';
-            return $a;
-        }
-
-        if ($skipmsg) {
-            $a = new $ec($code, $mode, $options, $userinfo);
-        } else {
-            $a = new $ec($message, $code, $mode, $options, $userinfo);
-        }
-
-        return $a;
-    }
-
-    // }}}
-    // {{{ throwError()
-
-    /**
-     * Simpler form of raiseError with fewer options.  In most cases
-     * message, code and userinfo are enough.
-     *
-     * @param string $message
-     *
-     */
-    function &throwError($message = null,
-                         $code = null,
-                         $userinfo = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $a = &$this->raiseError($message, $code, null, null, $userinfo);
-            return $a;
-        }
-
-        $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
-        return $a;
-    }
-
-    // }}}
-    function staticPushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-        $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        $stack[] = array($def_mode, $def_options);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $def_mode = $mode;
-                $def_options = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $def_mode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $def_options = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    function staticPopErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        return true;
-    }
-
-    // {{{ pushErrorHandling()
-
-    /**
-     * Push a new error handler on top of the error handler options stack. With this
-     * you can easily override the actual error handler for some code and restore
-     * it later with popErrorHandling.
-     *
-     * @param mixed $mode (same as setErrorHandling)
-     * @param mixed $options (same as setErrorHandling)
-     *
-     * @return bool Always true
-     *
-     * @see PEAR::setErrorHandling
-     */
-    function pushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
-        } else {
-            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-            $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        }
-        $stack[] = array($def_mode, $def_options);
-
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    // }}}
-    // {{{ popErrorHandling()
-
-    /**
-    * Pop the last error handler used
-    *
-    * @return bool Always true
-    *
-    * @see PEAR::pushErrorHandling
-    */
-    function popErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ loadExtension()
-
-    /**
-    * OS independant PHP extension load. Remember to take care
-    * on the correct extension name for case sensitive OSes.
-    *
-    * @param string $ext The extension name
-    * @return bool Success or not on the dl() call
-    */
-    function loadExtension($ext)
-    {
-        if (!extension_loaded($ext)) {
-            // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
-                return false;
-            }
-
-            if (OS_WINDOWS) {
-                $suffix = '.dll';
-            } elseif (PHP_OS == 'HP-UX') {
-                $suffix = '.sl';
-            } elseif (PHP_OS == 'AIX') {
-                $suffix = '.a';
-            } elseif (PHP_OS == 'OSX') {
-                $suffix = '.bundle';
-            } else {
-                $suffix = '.so';
-            }
-
-            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
-        }
-
-        return true;
-    }
-
-    // }}}
-}
-
-if (PEAR_ZE2) {
-    include_once 'PEAR5.php';
-}
-
-// {{{ _PEAR_call_destructors()
-
-function _PEAR_call_destructors()
-{
-    global $_PEAR_destructor_object_list;
-    if (is_array($_PEAR_destructor_object_list) &&
-        sizeof($_PEAR_destructor_object_list))
-    {
-        reset($_PEAR_destructor_object_list);
-        if (PEAR_ZE2) {
-            $destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo');
-        } else {
-            $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
-        }
-
-        if ($destructLifoExists) {
-            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
-        }
-
-        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
-            $classname = get_class($objref);
-            while ($classname) {
-                $destructor = "_$classname";
-                if (method_exists($objref, $destructor)) {
-                    $objref->$destructor();
-                    break;
-                } else {
-                    $classname = get_parent_class($classname);
-                }
-            }
-        }
-        // Empty the object list to ensure that destructors are
-        // not called more than once.
-        $_PEAR_destructor_object_list = array();
-    }
-
-    // Now call the shutdown functions
-    if (isset($GLOBALS['_PEAR_shutdown_funcs']) AND is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
-        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
-            call_user_func_array($value[0], $value[1]);
-        }
-    }
-}
-
-// }}}
-/**
- * Standard PEAR error class for PHP 4
- *
- * This class is supserseded by {@link PEAR_Exception} in PHP 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Gregory Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
- * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
- * @see        PEAR::raiseError(), PEAR::throwError()
- * @since      Class available since PHP 4.0.2
- */
-class PEAR_Error
-{
-    // {{{ properties
-
-    var $error_message_prefix = '';
-    var $mode                 = PEAR_ERROR_RETURN;
-    var $level                = E_USER_NOTICE;
-    var $code                 = -1;
-    var $message              = '';
-    var $userinfo             = '';
-    var $backtrace            = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Error constructor
-     *
-     * @param string $message  message
-     *
-     * @param int $code     (optional) error code
-     *
-     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
-     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
-     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
-     *
-     * @param mixed $options   (optional) error level, _OR_ in the case of
-     * PEAR_ERROR_CALLBACK, the callback function or object/method
-     * tuple.
-     *
-     * @param string $userinfo (optional) additional user/debug info
-     *
-     * @access public
-     *
-     */
-    function PEAR_Error($message = 'unknown error', $code = null,
-                        $mode = null, $options = null, $userinfo = null)
-    {
-        if ($mode === null) {
-            $mode = PEAR_ERROR_RETURN;
-        }
-        $this->message   = $message;
-        $this->code      = $code;
-        $this->mode      = $mode;
-        $this->userinfo  = $userinfo;
-
-        if (PEAR_ZE2) {
-            $skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
-        } else {
-            $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
-        }
-
-        if (!$skiptrace) {
-            $this->backtrace = debug_backtrace();
-            if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
-                unset($this->backtrace[0]['object']);
-            }
-        }
-
-        if ($mode & PEAR_ERROR_CALLBACK) {
-            $this->level = E_USER_NOTICE;
-            $this->callback = $options;
-        } else {
-            if ($options === null) {
-                $options = E_USER_NOTICE;
-            }
-
-            $this->level = $options;
-            $this->callback = null;
-        }
-
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-            } else {
-                $format = $options;
-            }
-
-            printf($format, $this->getMessage());
-        }
-
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            trigger_error($this->getMessage(), $this->level);
-        }
-
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $msg = $this->getMessage();
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-                if (substr($msg, -1) != "\n") {
-                    $msg .= "\n";
-                }
-            } else {
-                $format = $options;
-            }
-            die(sprintf($format, $msg));
-        }
-
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_callable($this->callback)) {
-                call_user_func($this->callback, $this);
-            }
-        }
-
-        if ($this->mode & PEAR_ERROR_EXCEPTION) {
-            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
-            eval('$e = new Exception($this->message, $this->code);throw($e);');
-        }
-    }
-
-    // }}}
-    // {{{ getMode()
-
-    /**
-     * Get the error mode from an error object.
-     *
-     * @return int error mode
-     * @access public
-     */
-    function getMode() {
-        return $this->mode;
-    }
-
-    // }}}
-    // {{{ getCallback()
-
-    /**
-     * Get the callback function/method from an error object.
-     *
-     * @return mixed callback function or object/method array
-     * @access public
-     */
-    function getCallback() {
-        return $this->callback;
-    }
-
-    // }}}
-    // {{{ getMessage()
-
-
-    /**
-     * Get the error message from an error object.
-     *
-     * @return  string  full error message
-     * @access public
-     */
-    function getMessage()
-    {
-        return ($this->error_message_prefix . $this->message);
-    }
-
-
-    // }}}
-    // {{{ getCode()
-
-    /**
-     * Get error code from an error object
-     *
-     * @return int error code
-     * @access public
-     */
-     function getCode()
-     {
-        return $this->code;
-     }
-
-    // }}}
-    // {{{ getType()
-
-    /**
-     * Get the name of this error/exception.
-     *
-     * @return string error/exception name (type)
-     * @access public
-     */
-    function getType()
-    {
-        return get_class($this);
-    }
-
-    // }}}
-    // {{{ getUserInfo()
-
-    /**
-     * Get additional user-supplied information.
-     *
-     * @return string user-supplied information
-     * @access public
-     */
-    function getUserInfo()
-    {
-        return $this->userinfo;
-    }
-
-    // }}}
-    // {{{ getDebugInfo()
-
-    /**
-     * Get additional debug information supplied by the application.
-     *
-     * @return string debug information
-     * @access public
-     */
-    function getDebugInfo()
-    {
-        return $this->getUserInfo();
-    }
-
-    // }}}
-    // {{{ getBacktrace()
-
-    /**
-     * Get the call backtrace from where the error was generated.
-     * Supported with PHP 4.3.0 or newer.
-     *
-     * @param int $frame (optional) what frame to fetch
-     * @return array Backtrace, or NULL if not available.
-     * @access public
-     */
-    function getBacktrace($frame = null)
-    {
-        if (defined('PEAR_IGNORE_BACKTRACE')) {
-            return null;
-        }
-        if ($frame === null) {
-            return $this->backtrace;
-        }
-        return $this->backtrace[$frame];
-    }
-
-    // }}}
-    // {{{ addUserInfo()
-
-    function addUserInfo($info)
-    {
-        if (empty($this->userinfo)) {
-            $this->userinfo = $info;
-        } else {
-            $this->userinfo .= " ** $info";
-        }
-    }
-
-    // }}}
-    // {{{ toString()
-    function __toString()
-    {
-        return $this->getMessage();
-    }
-    // }}}
-    // {{{ toString()
-
-    /**
-     * Make a string representation of this object.
-     *
-     * @return string a string with an object summary
-     * @access public
-     */
-    function toString() {
-        $modes = array();
-        $levels = array(E_USER_NOTICE  => 'notice',
-                        E_USER_WARNING => 'warning',
-                        E_USER_ERROR   => 'error');
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
-                    $this->callback[1];
-            } else {
-                $callback = $this->callback;
-            }
-            return sprintf('[%s: message="%s" code=%d mode=callback '.
-                           'callback=%s prefix="%s" info="%s"]',
-                           strtolower(get_class($this)), $this->message, $this->code,
-                           $callback, $this->error_message_prefix,
-                           $this->userinfo);
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            $modes[] = 'print';
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            $modes[] = 'trigger';
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $modes[] = 'die';
-        }
-        if ($this->mode & PEAR_ERROR_RETURN) {
-            $modes[] = 'return';
-        }
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
-                       'prefix="%s" info="%s"]',
-                       strtolower(get_class($this)), $this->message, $this->code,
-                       implode("|", $modes), $levels[$this->level],
-                       $this->error_message_prefix,
-                       $this->userinfo);
-    }
-
-    // }}}
-}
-
-/*
- * Local Variables:
- * mode: php
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/lib/ext/PEAR5.php b/lib/ext/PEAR5.php
deleted file mode 100644
index 4286067..0000000
--- a/lib/ext/PEAR5.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * This is only meant for PHP 5 to get rid of certain strict warning
- * that doesn't get hidden since it's in the shutdown function
- */
-class PEAR5
-{
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    static function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-
-        return $properties[$class][$var];
-    }
-}
\ No newline at end of file
diff --git a/lib/ext/Roundcube/bootstrap.php b/lib/ext/Roundcube/bootstrap.php
deleted file mode 100644
index 6e51433..0000000
--- a/lib/ext/Roundcube/bootstrap.php
+++ /dev/null
@@ -1,499 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube PHP suite                          |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | CONTENTS:                                                             |
- |   Roundcube Framework Initialization                                  |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-
-/**
- * Roundcube Framework Initialization
- *
- * @package    Framework
- * @subpackage Core
- */
-
-$config = array(
-    'error_reporting'         => E_ALL & ~E_NOTICE & ~E_STRICT,
-    // Some users are not using Installer, so we'll check some
-    // critical PHP settings here. Only these, which doesn't provide
-    // an error/warning in the logs later. See (#1486307).
-    'mbstring.func_overload'  => 0,
-    'magic_quotes_runtime'    => false,
-    'magic_quotes_sybase'     => false, // #1488506
-);
-
-// check these additional ini settings if not called via CLI
-if (php_sapi_name() != 'cli') {
-    $config += array(
-        'suhosin.session.encrypt' => false,
-        'file_uploads'            => true,
-    );
-}
-
-foreach ($config as $optname => $optval) {
-    $ini_optval = filter_var(ini_get($optname), is_bool($optval) ? FILTER_VALIDATE_BOOLEAN : FILTER_VALIDATE_INT);
-    if ($optval != $ini_optval && @ini_set($optname, $optval) === false) {
-        $error = "ERROR: Wrong '$optname' option value and it wasn't possible to set it to required value ($optval).\n"
-            . "Check your PHP configuration (including php_admin_flag).";
-        if (defined('STDERR')) fwrite(STDERR, $error); else echo $error;
-        exit(1);
-    }
-}
-
-// framework constants
-define('RCUBE_VERSION', '1.0-git');
-define('RCUBE_CHARSET', 'UTF-8');
-
-if (!defined('RCUBE_LIB_DIR')) {
-    define('RCUBE_LIB_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR);
-}
-
-if (!defined('RCUBE_INSTALL_PATH')) {
-    define('RCUBE_INSTALL_PATH', RCUBE_LIB_DIR);
-}
-
-if (!defined('RCUBE_CONFIG_DIR')) {
-    define('RCUBE_CONFIG_DIR', RCUBE_INSTALL_PATH . 'config/');
-}
-
-if (!defined('RCUBE_PLUGINS_DIR')) {
-    define('RCUBE_PLUGINS_DIR', RCUBE_INSTALL_PATH . 'plugins/');
-}
-
-if (!defined('RCUBE_LOCALIZATION_DIR')) {
-    define('RCUBE_LOCALIZATION_DIR', RCUBE_INSTALL_PATH . 'localization/');
-}
-
-// set internal encoding for mbstring extension
-if (extension_loaded('mbstring')) {
-    mb_internal_encoding(RCUBE_CHARSET);
-    @mb_regex_encoding(RCUBE_CHARSET);
-}
-
-// make sure the Roundcube lib directory is in the include_path
-$rcube_path = realpath(RCUBE_LIB_DIR . '..');
-$sep        = PATH_SEPARATOR;
-$regexp     = "!(^|$sep)" . preg_quote($rcube_path, '!') . "($sep|\$)!";
-$path       = ini_get('include_path');
-
-if (!preg_match($regexp, $path)) {
-    set_include_path($path . PATH_SEPARATOR . $rcube_path);
-}
-
-// Register autoloader
-spl_autoload_register('rcube_autoload');
-
-// set PEAR error handling (will also load the PEAR main class)
-PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
-
-
-
-/**
- * Similar function as in_array() but case-insensitive
- *
- * @param string $needle    Needle value
- * @param array  $heystack  Array to search in
- *
- * @return boolean True if found, False if not
- */
-function in_array_nocase($needle, $haystack)
-{
-    $needle = mb_strtolower($needle);
-    foreach ((array)$haystack as $value) {
-        if ($needle === mb_strtolower($value)) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-/**
- * Parse a human readable string for a number of bytes.
- *
- * @param string $str  Input string
- *
- * @return float Number of bytes
- */
-function parse_bytes($str)
-{
-    if (is_numeric($str)) {
-        return floatval($str);
-    }
-
-    if (preg_match('/([0-9\.]+)\s*([a-z]*)/i', $str, $regs)) {
-        $bytes = floatval($regs[1]);
-        switch (strtolower($regs[2])) {
-        case 'g':
-        case 'gb':
-            $bytes *= 1073741824;
-            break;
-        case 'm':
-        case 'mb':
-            $bytes *= 1048576;
-            break;
-        case 'k':
-        case 'kb':
-            $bytes *= 1024;
-            break;
-        }
-    }
-
-    return floatval($bytes);
-}
-
-
-/**
- * Make sure the string ends with a slash
- */
-function slashify($str)
-{
-  return unslashify($str).'/';
-}
-
-
-/**
- * Remove slashes at the end of the string
- */
-function unslashify($str)
-{
-  return preg_replace('/\/+$/', '', $str);
-}
-
-
-/**
- * Returns number of seconds for a specified offset string.
- *
- * @param string $str  String representation of the offset (e.g. 20min, 5h, 2days, 1week)
- *
- * @return int Number of seconds
- */
-function get_offset_sec($str)
-{
-    if (preg_match('/^([0-9]+)\s*([smhdw])/i', $str, $regs)) {
-        $amount = (int) $regs[1];
-        $unit   = strtolower($regs[2]);
-    }
-    else {
-        $amount = (int) $str;
-        $unit   = 's';
-    }
-
-    switch ($unit) {
-    case 'w':
-        $amount *= 7;
-    case 'd':
-        $amount *= 24;
-    case 'h':
-        $amount *= 60;
-    case 'm':
-        $amount *= 60;
-    }
-
-    return $amount;
-}
-
-
-/**
- * Create a unix timestamp with a specified offset from now.
- *
- * @param string $offset_str  String representation of the offset (e.g. 20min, 5h, 2days)
- * @param int    $factor      Factor to multiply with the offset
- *
- * @return int Unix timestamp
- */
-function get_offset_time($offset_str, $factor=1)
-{
-    return time() + get_offset_sec($offset_str) * $factor;
-}
-
-
-/**
- * Truncate string if it is longer than the allowed length.
- * Replace the middle or the ending part of a string with a placeholder.
- *
- * @param string $str         Input string
- * @param int    $maxlength   Max. length
- * @param string $placeholder Replace removed chars with this
- * @param bool   $ending      Set to True if string should be truncated from the end
- *
- * @return string Abbreviated string
- */
-function abbreviate_string($str, $maxlength, $placeholder='...', $ending=false)
-{
-    $length = mb_strlen($str);
-
-    if ($length > $maxlength) {
-        if ($ending) {
-            return mb_substr($str, 0, $maxlength) . $placeholder;
-        }
-
-        $placeholder_length = mb_strlen($placeholder);
-        $first_part_length  = floor(($maxlength - $placeholder_length)/2);
-        $second_starting_location = $length - $maxlength + $first_part_length + $placeholder_length;
-
-        $str = mb_substr($str, 0, $first_part_length) . $placeholder . mb_substr($str, $second_starting_location);
-    }
-
-    return $str;
-}
-
-
-/**
- * Get all keys from array (recursive).
- *
- * @param array $array  Input array
- *
- * @return array List of array keys
- */
-function array_keys_recursive($array)
-{
-    $keys = array();
-
-    if (!empty($array) && is_array($array)) {
-        foreach ($array as $key => $child) {
-            $keys[] = $key;
-            foreach (array_keys_recursive($child) as $val) {
-                $keys[] = $val;
-            }
-        }
-    }
-
-    return $keys;
-}
-
-
-/**
- * Remove all non-ascii and non-word chars except ., -, _
- */
-function asciiwords($str, $css_id = false, $replace_with = '')
-{
-    $allowed = 'a-z0-9\_\-' . (!$css_id ? '\.' : '');
-    return preg_replace("/[^$allowed]/i", $replace_with, $str);
-}
-
-
-/**
- * Check if a string contains only ascii characters
- *
- * @param string $str           String to check
- * @param bool   $control_chars Includes control characters
- *
- * @return bool
- */
-function is_ascii($str, $control_chars = true)
-{
-    $regexp = $control_chars ? '/[^\x00-\x7F]/' : '/[^\x20-\x7E]/';
-    return preg_match($regexp, $str) ? false : true;
-}
-
-
-/**
- * Compose a valid representation of name and e-mail address
- *
- * @param string $email  E-mail address
- * @param string $name   Person name
- *
- * @return string Formatted string
- */
-function format_email_recipient($email, $name = '')
-{
-    $email = trim($email);
-
-    if ($name && $name != $email) {
-        // Special chars as defined by RFC 822 need to in quoted string (or escaped).
-        if (preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $name)) {
-            $name = '"'.addcslashes($name, '"').'"';
-        }
-
-        return "$name <$email>";
-    }
-
-    return $email;
-}
-
-
-/**
- * Format e-mail address
- *
- * @param string $email E-mail address
- *
- * @return string Formatted e-mail address
- */
-function format_email($email)
-{
-    $email = trim($email);
-    $parts = explode('@', $email);
-    $count = count($parts);
-
-    if ($count > 1) {
-        $parts[$count-1] = mb_strtolower($parts[$count-1]);
-
-        $email = implode('@', $parts);
-    }
-
-    return $email;
-}
-
-
-/**
- * Fix version number so it can be used correctly in version_compare()
- *
- * @param string $version Version number string
- *
- * @param return Version number string
- */
-function version_parse($version)
-{
-    return str_replace(
-        array('-stable', '-git'),
-        array('.0', '.99'),
-        $version);
-}
-
-
-/**
- * mbstring replacement functions
- */
-if (!extension_loaded('mbstring'))
-{
-    function mb_strlen($str)
-    {
-        return strlen($str);
-    }
-
-    function mb_strtolower($str)
-    {
-        return strtolower($str);
-    }
-
-    function mb_strtoupper($str)
-    {
-        return strtoupper($str);
-    }
-
-    function mb_substr($str, $start, $len=null)
-    {
-        return substr($str, $start, $len);
-    }
-
-    function mb_strpos($haystack, $needle, $offset=0)
-    {
-        return strpos($haystack, $needle, $offset);
-    }
-
-    function mb_strrpos($haystack, $needle, $offset=0)
-    {
-        return strrpos($haystack, $needle, $offset);
-    }
-}
-
-/**
- * intl replacement functions
- */
-
-if (!function_exists('idn_to_utf8'))
-{
-    function idn_to_utf8($domain, $flags=null)
-    {
-        static $idn, $loaded;
-
-        if (!$loaded) {
-            $idn = new Net_IDNA2();
-            $loaded = true;
-        }
-
-        if ($idn && $domain && preg_match('/(^|\.)xn--/i', $domain)) {
-            try {
-                $domain = $idn->decode($domain);
-            }
-            catch (Exception $e) {
-            }
-        }
-        return $domain;
-    }
-}
-
-if (!function_exists('idn_to_ascii'))
-{
-    function idn_to_ascii($domain, $flags=null)
-    {
-        static $idn, $loaded;
-
-        if (!$loaded) {
-            $idn = new Net_IDNA2();
-            $loaded = true;
-        }
-
-        if ($idn && $domain && preg_match('/[^\x20-\x7E]/', $domain)) {
-            try {
-                $domain = $idn->encode($domain);
-            }
-            catch (Exception $e) {
-            }
-        }
-        return $domain;
-    }
-}
-
-/**
- * Use PHP5 autoload for dynamic class loading
- *
- * @todo Make Zend, PEAR etc play with this
- * @todo Make our classes conform to a more straight forward CS.
- */
-function rcube_autoload($classname)
-{
-    $filename = preg_replace(
-        array(
-            '/Mail_(.+)/',
-            '/Net_(.+)/',
-            '/Auth_(.+)/',
-            '/^html_.+/',
-            '/^rcube(.*)/',
-            '/^utf8$/',
-        ),
-        array(
-            'Mail/\\1',
-            'Net/\\1',
-            'Auth/\\1',
-            'Roundcube/html',
-            'Roundcube/rcube\\1',
-            'utf8.class',
-        ),
-        $classname
-    );
-
-    if ($fp = @fopen("$filename.php", 'r', true)) {
-        fclose($fp);
-        include_once "$filename.php";
-        return true;
-    }
-
-    return false;
-}
-
-/**
- * Local callback function for PEAR errors
- */
-function rcube_pear_error($err)
-{
-    error_log(sprintf("%s (%s): %s",
-        $err->getMessage(),
-        $err->getCode(),
-        $err->getUserinfo()), 0);
-}
diff --git a/lib/ext/Roundcube/html.php b/lib/ext/Roundcube/html.php
deleted file mode 100644
index f6f744c..0000000
--- a/lib/ext/Roundcube/html.php
+++ /dev/null
@@ -1,895 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Helper class to create valid XHTML code                             |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-
-/**
- * Class for HTML code creation
- *
- * @package    Framework
- * @subpackage View
- */
-class html
-{
-    protected $tagname;
-    protected $attrib = array();
-    protected $allowed = array();
-    protected $content;
-
-    public static $doctype = 'xhtml';
-    public static $lc_tags = true;
-    public static $common_attrib = array('id','class','style','title','align','unselectable');
-    public static $containers = array('iframe','div','span','p','h1','h2','h3','ul','form','textarea','table','thead','tbody','tr','th','td','style','script');
-
-
-    /**
-     * Constructor
-     *
-     * @param array $attrib Hash array with tag attributes
-     */
-    public function __construct($attrib = array())
-    {
-        if (is_array($attrib)) {
-            $this->attrib = $attrib;
-        }
-    }
-
-    /**
-     * Return the tag code
-     *
-     * @return string The finally composed HTML tag
-     */
-    public function show()
-    {
-        return self::tag($this->tagname, $this->attrib, $this->content, array_merge(self::$common_attrib, $this->allowed));
-    }
-
-    /****** STATIC METHODS *******/
-
-    /**
-     * Generic method to create a HTML tag
-     *
-     * @param string $tagname Tag name
-     * @param array  $attrib  Tag attributes as key/value pairs
-     * @param string $content Optinal Tag content (creates a container tag)
-     * @param array  $allowed_attrib List with allowed attributes, omit to allow all
-     * @return string The XHTML tag
-     */
-    public static function tag($tagname, $attrib = array(), $content = null, $allowed_attrib = null)
-    {
-        if (is_string($attrib))
-            $attrib = array('class' => $attrib);
-
-        $inline_tags = array('a','span','img');
-        $suffix = $attrib['nl'] || ($content && $attrib['nl'] !== false && !in_array($tagname, $inline_tags)) ? "\n" : '';
-
-        $tagname = self::$lc_tags ? strtolower($tagname) : $tagname;
-        if (isset($content) || in_array($tagname, self::$containers)) {
-            $suffix = $attrib['noclose'] ? $suffix : '</' . $tagname . '>' . $suffix;
-            unset($attrib['noclose'], $attrib['nl']);
-            return '<' . $tagname  . self::attrib_string($attrib, $allowed_attrib) . '>' . $content . $suffix;
-        }
-        else {
-            return '<' . $tagname  . self::attrib_string($attrib, $allowed_attrib) . '>' . $suffix;
-        }
-    }
-
-    /**
-     *
-     */
-    public static function doctype($type)
-    {
-        $doctypes = array(
-            'html5'        => '<!DOCTYPE html>',
-            'xhtml'        => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
-            'xhtml-trans'  => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
-            'xhtml-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
-        );
-
-        if ($doctypes[$type]) {
-            self::$doctype = preg_replace('/-\w+$/', '', $type);
-            return $doctypes[$type];
-        }
-
-        return '';
-    }
-
-    /**
-     * Derrived method for <div> containers
-     *
-     * @param mixed  $attr Hash array with tag attributes or string with class name
-     * @param string $cont Div content
-     * @return string HTML code
-     * @see html::tag()
-     */
-    public static function div($attr = null, $cont = null)
-    {
-        if (is_string($attr)) {
-            $attr = array('class' => $attr);
-        }
-        return self::tag('div', $attr, $cont, array_merge(self::$common_attrib, array('onclick')));
-    }
-
-    /**
-     * Derrived method for <p> blocks
-     *
-     * @param mixed  $attr Hash array with tag attributes or string with class name
-     * @param string $cont Paragraph content
-     * @return string HTML code
-     * @see html::tag()
-     */
-    public static function p($attr = null, $cont = null)
-    {
-        if (is_string($attr)) {
-            $attr = array('class' => $attr);
-        }
-        return self::tag('p', $attr, $cont, self::$common_attrib);
-    }
-
-    /**
-     * Derrived method to create <img />
-     *
-     * @param mixed $attr Hash array with tag attributes or string with image source (src)
-     * @return string HTML code
-     * @see html::tag()
-     */
-    public static function img($attr = null)
-    {
-        if (is_string($attr)) {
-            $attr = array('src' => $attr);
-        }
-        return self::tag('img', $attr + array('alt' => ''), null, array_merge(self::$common_attrib,
-            array('src','alt','width','height','border','usemap','onclick')));
-    }
-
-    /**
-     * Derrived method for link tags
-     *
-     * @param mixed  $attr Hash array with tag attributes or string with link location (href)
-     * @param string $cont Link content
-     * @return string HTML code
-     * @see html::tag()
-     */
-    public static function a($attr, $cont)
-    {
-        if (is_string($attr)) {
-            $attr = array('href' => $attr);
-        }
-        return self::tag('a', $attr, $cont, array_merge(self::$common_attrib,
-            array('href','target','name','rel','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
-    }
-
-    /**
-     * Derrived method for inline span tags
-     *
-     * @param mixed  $attr Hash array with tag attributes or string with class name
-     * @param string $cont Tag content
-     * @return string HTML code
-     * @see html::tag()
-     */
-    public static function span($attr, $cont)
-    {
-        if (is_string($attr)) {
-            $attr = array('class' => $attr);
-        }
-        return self::tag('span', $attr, $cont, self::$common_attrib);
-    }
-
-    /**
-     * Derrived method for form element labels
-     *
-     * @param mixed  $attr Hash array with tag attributes or string with 'for' attrib
-     * @param string $cont Tag content
-     * @return string HTML code
-     * @see html::tag()
-     */
-    public static function label($attr, $cont)
-    {
-        if (is_string($attr)) {
-            $attr = array('for' => $attr);
-        }
-        return self::tag('label', $attr, $cont, array_merge(self::$common_attrib, array('for')));
-    }
-
-    /**
-     * Derrived method to create <iframe></iframe>
-     *
-     * @param mixed $attr Hash array with tag attributes or string with frame source (src)
-     * @return string HTML code
-     * @see html::tag()
-     */
-    public static function iframe($attr = null, $cont = null)
-    {
-        if (is_string($attr)) {
-            $attr = array('src' => $attr);
-        }
-        return self::tag('iframe', $attr, $cont, array_merge(self::$common_attrib,
-            array('src','name','width','height','border','frameborder','onload')));
-    }
-
-    /**
-     * Derrived method to create <script> tags
-     *
-     * @param mixed $attr Hash array with tag attributes or string with script source (src)
-     * @param string $cont Javascript code to be placed as tag content
-     * @return string HTML code
-     * @see html::tag()
-     */
-    public static function script($attr, $cont = null)
-    {
-        if (is_string($attr)) {
-            $attr = array('src' => $attr);
-        }
-        if ($cont) {
-            if (self::$doctype == 'xhtml')
-                $cont = "\n/* <![CDATA[ */\n" . $cont . "\n/* ]]> */\n";
-            else
-                $cont = "\n" . $cont . "\n";
-        }
-
-        return self::tag('script', $attr + array('type' => 'text/javascript', 'nl' => true),
-            $cont, array_merge(self::$common_attrib, array('src','type','charset')));
-    }
-
-    /**
-     * Derrived method for line breaks
-     *
-     * @return string HTML code
-     * @see html::tag()
-     */
-    public static function br($attrib = array())
-    {
-        return self::tag('br', $attrib);
-    }
-
-    /**
-     * Create string with attributes
-     *
-     * @param array $attrib Associative arry with tag attributes
-     * @param array $allowed List of allowed attributes
-     * @return string Valid attribute string
-     */
-    public static function attrib_string($attrib = array(), $allowed = null)
-    {
-        if (empty($attrib)) {
-            return '';
-        }
-
-        $allowed_f = array_flip((array)$allowed);
-        $attrib_arr = array();
-        foreach ($attrib as $key => $value) {
-            // skip size if not numeric
-            if ($key == 'size' && !is_numeric($value)) {
-                continue;
-            }
-
-            // ignore "internal" or not allowed attributes
-            if ($key == 'nl' || ($allowed && !isset($allowed_f[$key])) || $value === null) {
-                continue;
-            }
-
-            // skip empty eventhandlers
-            if (preg_match('/^on[a-z]+/', $key) && !$value) {
-                continue;
-            }
-
-            // attributes with no value
-            if (in_array($key, array('checked', 'multiple', 'disabled', 'selected', 'autofocus'))) {
-                if ($value) {
-                    $attrib_arr[] = $key . '="' . $key . '"';
-                }
-            }
-            else {
-                $attrib_arr[] = $key . '="' . self::quote($value) . '"';
-            }
-        }
-
-        return count($attrib_arr) ? ' '.implode(' ', $attrib_arr) : '';
-    }
-
-    /**
-     * Convert a HTML attribute string attributes to an associative array (name => value)
-     *
-     * @param string Input string
-     * @return array Key-value pairs of parsed attributes
-     */
-    public static function parse_attrib_string($str)
-    {
-        $attrib = array();
-        $regexp = '/\s*([-_a-z]+)=(["\'])??(?(2)([^\2]*)\2|(\S+?))/Ui';
-
-        preg_match_all($regexp, stripslashes($str), $regs, PREG_SET_ORDER);
-
-        // convert attributes to an associative array (name => value)
-        if ($regs) {
-            foreach ($regs as $attr) {
-                $attrib[strtolower($attr[1])] = html_entity_decode($attr[3] . $attr[4]);
-            }
-        }
-
-        return $attrib;
-    }
-
-    /**
-     * Replacing specials characters in html attribute value
-     *
-     * @param string $str Input string
-     *
-     * @return string The quoted string
-     */
-    public static function quote($str)
-    {
-        static $flags;
-
-        if (!$flags) {
-            $flags = ENT_COMPAT;
-            if (defined('ENT_SUBSTITUTE')) {
-                $flags |= ENT_SUBSTITUTE;
-            }
-        }
-
-        return @htmlspecialchars($str, $flags, RCUBE_CHARSET);
-    }
-}
-
-
-/**
- * Class to create an HTML input field
- *
- * @package    Framework
- * @subpackage View
- */
-class html_inputfield extends html
-{
-    protected $tagname = 'input';
-    protected $type = 'text';
-    protected $allowed = array(
-        'type','name','value','size','tabindex','autocapitalize','required',
-        'autocomplete','checked','onchange','onclick','disabled','readonly',
-        'spellcheck','results','maxlength','src','multiple','accept',
-        'placeholder','autofocus',
-    );
-
-    /**
-     * Object constructor
-     *
-     * @param array $attrib Associative array with tag attributes
-     */
-    public function __construct($attrib = array())
-    {
-        if (is_array($attrib)) {
-            $this->attrib = $attrib;
-        }
-
-        if ($attrib['type']) {
-            $this->type = $attrib['type'];
-        }
-    }
-
-    /**
-     * Compose input tag
-     *
-     * @param string $value Field value
-     * @param array  $attrib Additional attributes to override
-     * @return string HTML output
-     */
-    public function show($value = null, $attrib = null)
-    {
-        // overwrite object attributes
-        if (is_array($attrib)) {
-            $this->attrib = array_merge($this->attrib, $attrib);
-        }
-
-        // set value attribute
-        if ($value !== null) {
-            $this->attrib['value'] = $value;
-        }
-        // set type
-        $this->attrib['type'] = $this->type;
-        return parent::show();
-    }
-}
-
-/**
- * Class to create an HTML password field
- *
- * @package    Framework
- * @subpackage View
- */
-class html_passwordfield extends html_inputfield
-{
-    protected $type = 'password';
-}
-
-/**
- * Class to create an hidden HTML input field
- *
- * @package    Framework
- * @subpackage View
- */
-class html_hiddenfield extends html
-{
-    protected $tagname = 'input';
-    protected $type = 'hidden';
-    protected $fields_arr = array();
-    protected $allowed = array('type','name','value','onchange','disabled','readonly');
-
-    /**
-     * Constructor
-     *
-     * @param array $attrib Named tag attributes
-     */
-    public function __construct($attrib = null)
-    {
-        if (is_array($attrib)) {
-            $this->add($attrib);
-        }
-    }
-
-    /**
-     * Add a hidden field to this instance
-     *
-     * @param array $attrib Named tag attributes
-     */
-    public function add($attrib)
-    {
-        $this->fields_arr[] = $attrib;
-    }
-
-    /**
-     * Create HTML code for the hidden fields
-     *
-     * @return string Final HTML code
-     */
-    public function show()
-    {
-        $out = '';
-        foreach ($this->fields_arr as $attrib) {
-            $out .= self::tag($this->tagname, array('type' => $this->type) + $attrib);
-        }
-        return $out;
-    }
-}
-
-/**
- * Class to create HTML radio buttons
- *
- * @package    Framework
- * @subpackage View
- */
-class html_radiobutton extends html_inputfield
-{
-    protected $type = 'radio';
-
-    /**
-     * Get HTML code for this object
-     *
-     * @param string $value  Value of the checked field
-     * @param array  $attrib Additional attributes to override
-     * @return string HTML output
-     */
-    public function show($value = '', $attrib = null)
-    {
-        // overwrite object attributes
-        if (is_array($attrib)) {
-            $this->attrib = array_merge($this->attrib, $attrib);
-        }
-
-        // set value attribute
-        $this->attrib['checked'] = ((string)$value == (string)$this->attrib['value']);
-
-        return parent::show();
-    }
-}
-
-/**
- * Class to create HTML checkboxes
- *
- * @package    Framework
- * @subpackage View
- */
-class html_checkbox extends html_inputfield
-{
-    protected $type = 'checkbox';
-
-    /**
-     * Get HTML code for this object
-     *
-     * @param string $value  Value of the checked field
-     * @param array  $attrib Additional attributes to override
-     * @return string HTML output
-     */
-    public function show($value = '', $attrib = null)
-    {
-        // overwrite object attributes
-        if (is_array($attrib)) {
-            $this->attrib = array_merge($this->attrib, $attrib);
-        }
-
-        // set value attribute
-        $this->attrib['checked'] = ((string)$value == (string)$this->attrib['value']);
-
-        return parent::show();
-    }
-}
-
-/**
- * Class to create an HTML textarea
- *
- * @package    Framework
- * @subpackage View
- */
-class html_textarea extends html
-{
-    protected $tagname = 'textarea';
-    protected $allowed = array('name','rows','cols','wrap','tabindex',
-        'onchange','disabled','readonly','spellcheck');
-
-    /**
-     * Get HTML code for this object
-     *
-     * @param string $value  Textbox value
-     * @param array  $attrib Additional attributes to override
-     * @return string HTML output
-     */
-    public function show($value = '', $attrib = null)
-    {
-        // overwrite object attributes
-        if (is_array($attrib)) {
-            $this->attrib = array_merge($this->attrib, $attrib);
-        }
-
-        // take value attribute as content
-        if (empty($value) && !empty($this->attrib['value'])) {
-            $value = $this->attrib['value'];
-        }
-
-        // make shure we don't print the value attribute
-        if (isset($this->attrib['value'])) {
-            unset($this->attrib['value']);
-        }
-
-        if (!empty($value) && empty($this->attrib['is_escaped'])) {
-            $value = self::quote($value);
-        }
-
-        return self::tag($this->tagname, $this->attrib, $value,
-            array_merge(self::$common_attrib, $this->allowed));
-    }
-}
-
-/**
- * Builder for HTML drop-down menus
- * Syntax:<pre>
- * // create instance. arguments are used to set attributes of select-tag
- * $select = new html_select(array('name' => 'fieldname'));
- *
- * // add one option
- * $select->add('Switzerland', 'CH');
- *
- * // add multiple options
- * $select->add(array('Switzerland','Germany'), array('CH','DE'));
- *
- * // generate pulldown with selection 'Switzerland'  and return html-code
- * // as second argument the same attributes available to instanciate can be used
- * print $select->show('CH');
- * </pre>
- *
- * @package    Framework
- * @subpackage View
- */
-class html_select extends html
-{
-    protected $tagname = 'select';
-    protected $options = array();
-    protected $allowed = array('name','size','tabindex','autocomplete',
-        'multiple','onchange','disabled','rel');
-
-    /**
-     * Add a new option to this drop-down
-     *
-     * @param mixed $names  Option name or array with option names
-     * @param mixed $values Option value or array with option values
-     * @param array $attrib Additional attributes for the option entry
-     */
-    public function add($names, $values = null, $attrib = array())
-    {
-        if (is_array($names)) {
-            foreach ($names as $i => $text) {
-                $this->options[] = array('text' => $text, 'value' => $values[$i]) + $attrib;
-            }
-        }
-        else {
-            $this->options[] = array('text' => $names, 'value' => $values) + $attrib;
-        }
-    }
-
-    /**
-     * Get HTML code for this object
-     *
-     * @param string $select Value of the selection option
-     * @param array  $attrib Additional attributes to override
-     * @return string HTML output
-     */
-    public function show($select = array(), $attrib = null)
-    {
-        // overwrite object attributes
-        if (is_array($attrib)) {
-            $this->attrib = array_merge($this->attrib, $attrib);
-        }
-
-        $this->content = "\n";
-        $select = (array)$select;
-        foreach ($this->options as $option) {
-            $attr = array(
-                'value' => $option['value'],
-                'selected' => (in_array($option['value'], $select, true) ||
-                  in_array($option['text'], $select, true)) ? 1 : null);
-
-            $option_content = $option['text'];
-            if (empty($this->attrib['is_escaped'])) {
-                $option_content = self::quote($option_content);
-            }
-
-            $this->content .= self::tag('option', $attr + $option, $option_content, array('value','label','class','style','title','disabled','selected'));
-        }
-
-        return parent::show();
-    }
-}
-
-
-/**
- * Class to build an HTML table
- *
- * @package    Framework
- * @subpackage View
- */
-class html_table extends html
-{
-    protected $tagname = 'table';
-    protected $allowed = array('id','class','style','width','summary',
-        'cellpadding','cellspacing','border');
-
-    private $header = array();
-    private $rows = array();
-    private $rowindex = 0;
-    private $colindex = 0;
-
-    /**
-     * Constructor
-     *
-     * @param array $attrib Named tag attributes
-     */
-    public function __construct($attrib = array())
-    {
-        $default_attrib = self::$doctype == 'xhtml' ? array('summary' => '', 'border' => 0) : array();
-        $this->attrib = array_merge($attrib, $default_attrib);
-
-        if (!empty($attrib['tagname']) && $attrib['tagname'] != 'table') {
-          $this->tagname = $attrib['tagname'];
-          $this->allowed = self::$common_attrib;
-        }
-    }
-
-    /**
-     * Add a table cell
-     *
-     * @param array  $attr Cell attributes
-     * @param string $cont Cell content
-     */
-    public function add($attr, $cont)
-    {
-        if (is_string($attr)) {
-            $attr = array('class' => $attr);
-        }
-
-        $cell = new stdClass;
-        $cell->attrib  = $attr;
-        $cell->content = $cont;
-
-        $this->rows[$this->rowindex]->cells[$this->colindex] = $cell;
-        $this->colindex += max(1, intval($attr['colspan']));
-
-        if ($this->attrib['cols'] && $this->colindex >= $this->attrib['cols']) {
-            $this->add_row();
-        }
-    }
-
-    /**
-     * Add a table header cell
-     *
-     * @param array  $attr Cell attributes
-     * @param string $cont Cell content
-     */
-    public function add_header($attr, $cont)
-    {
-        if (is_string($attr)) {
-            $attr = array('class' => $attr);
-        }
-
-        $cell = new stdClass;
-        $cell->attrib   = $attr;
-        $cell->content  = $cont;
-        $this->header[] = $cell;
-    }
-
-    /**
-     * Remove a column from a table
-     * Useful for plugins making alterations
-     *
-     * @param string $class
-     */
-    public function remove_column($class)
-    {
-        // Remove the header
-        foreach ($this->header as $index=>$header){
-            if ($header->attrib['class'] == $class){
-                unset($this->header[$index]);
-                break;
-            }
-        }
-
-        // Remove cells from rows
-        foreach ($this->rows as $i=>$row){
-            foreach ($row->cells as $j=>$cell){
-                if ($cell->attrib['class'] == $class){
-                    unset($this->rows[$i]->cells[$j]);
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Jump to next row
-     *
-     * @param array $attr Row attributes
-     */
-    public function add_row($attr = array())
-    {
-        $this->rowindex++;
-        $this->colindex = 0;
-        $this->rows[$this->rowindex] = new stdClass;
-        $this->rows[$this->rowindex]->attrib = $attr;
-        $this->rows[$this->rowindex]->cells = array();
-    }
-
-    /**
-     * Set row attributes
-     *
-     * @param array $attr  Row attributes
-     * @param int   $index Optional row index (default current row index)
-     */
-    public function set_row_attribs($attr = array(), $index = null)
-    {
-        if (is_string($attr)) {
-            $attr = array('class' => $attr);
-        }
-
-        if ($index === null) {
-            $index = $this->rowindex;
-        }
-
-        // make sure row object exists (#1489094)
-        if (!$this->rows[$index]) {
-            $this->rows[$index] = new stdClass;
-        }
-
-        $this->rows[$index]->attrib = $attr;
-    }
-
-    /**
-     * Get row attributes
-     *
-     * @param int $index Row index
-     *
-     * @return array Row attributes
-     */
-    public function get_row_attribs($index = null)
-    {
-        if ($index === null) {
-            $index = $this->rowindex;
-        }
-
-        return $this->rows[$index] ? $this->rows[$index]->attrib : null;
-    }
-
-    /**
-     * Build HTML output of the table data
-     *
-     * @param array $attrib Table attributes
-     * @return string The final table HTML code
-     */
-    public function show($attrib = null)
-    {
-        if (is_array($attrib)) {
-            $this->attrib = array_merge($this->attrib, $attrib);
-        }
-
-        $thead = $tbody = "";
-
-        // include <thead>
-        if (!empty($this->header)) {
-            $rowcontent = '';
-            foreach ($this->header as $c => $col) {
-                $rowcontent .= self::tag($this->_col_tagname(), $col->attrib, $col->content);
-            }
-            $thead = $this->tagname == 'table' ? self::tag('thead', null, self::tag('tr', null, $rowcontent, parent::$common_attrib)) :
-                self::tag($this->_row_tagname(), array('class' => 'thead'), $rowcontent, parent::$common_attrib);
-        }
-
-        foreach ($this->rows as $r => $row) {
-            $rowcontent = '';
-            foreach ($row->cells as $c => $col) {
-                $rowcontent .= self::tag($this->_col_tagname(), $col->attrib, $col->content);
-            }
-
-            if ($r < $this->rowindex || count($row->cells)) {
-                $tbody .= self::tag($this->_row_tagname(), $row->attrib, $rowcontent, parent::$common_attrib);
-            }
-        }
-
-        if ($this->attrib['rowsonly']) {
-            return $tbody;
-        }
-
-        // add <tbody>
-        $this->content = $thead . ($this->tagname == 'table' ? self::tag('tbody', null, $tbody) : $tbody);
-
-        unset($this->attrib['cols'], $this->attrib['rowsonly']);
-        return parent::show();
-    }
-
-    /**
-     * Count number of rows
-     *
-     * @return The number of rows
-     */
-    public function size()
-    {
-        return count($this->rows);
-    }
-
-    /**
-     * Remove table body (all rows)
-     */
-    public function remove_body()
-    {
-        $this->rows     = array();
-        $this->rowindex = 0;
-    }
-
-    /**
-     * Getter for the corresponding tag name for table row elements
-     */
-    private function _row_tagname()
-    {
-        static $row_tagnames = array('table' => 'tr', 'ul' => 'li', '*' => 'div');
-        return $row_tagnames[$this->tagname] ?: $row_tagnames['*'];
-    }
-
-    /**
-     * Getter for the corresponding tag name for table cell elements
-     */
-    private function _col_tagname()
-    {
-        static $col_tagnames = array('table' => 'td', '*' => 'span');
-        return $col_tagnames[$this->tagname] ?: $col_tagnames['*'];
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube.php b/lib/ext/Roundcube/rcube.php
deleted file mode 100644
index 399f84f..0000000
--- a/lib/ext/Roundcube/rcube.php
+++ /dev/null
@@ -1,1570 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Framework base class providing core functions and holding           |
- |   instances of all 'global' objects like db- and storage-connections  |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-
-/**
- * Base class of the Roundcube Framework
- * implemented as singleton
- *
- * @package    Framework
- * @subpackage Core
- */
-class rcube
-{
-    const INIT_WITH_DB = 1;
-    const INIT_WITH_PLUGINS = 2;
-
-    /**
-     * Singleton instace of rcube
-     *
-     * @var rcube
-     */
-    static protected $instance;
-
-    /**
-     * Stores instance of rcube_config.
-     *
-     * @var rcube_config
-     */
-    public $config;
-
-    /**
-     * Instace of database class.
-     *
-     * @var rcube_db
-     */
-    public $db;
-
-    /**
-     * Instace of Memcache class.
-     *
-     * @var Memcache
-     */
-    public $memcache;
-
-   /**
-     * Instace of rcube_session class.
-     *
-     * @var rcube_session
-     */
-    public $session;
-
-    /**
-     * Instance of rcube_smtp class.
-     *
-     * @var rcube_smtp
-     */
-    public $smtp;
-
-    /**
-     * Instance of rcube_storage class.
-     *
-     * @var rcube_storage
-     */
-    public $storage;
-
-    /**
-     * Instance of rcube_output class.
-     *
-     * @var rcube_output
-     */
-    public $output;
-
-    /**
-     * Instance of rcube_plugin_api.
-     *
-     * @var rcube_plugin_api
-     */
-    public $plugins;
-
-
-    /* private/protected vars */
-    protected $texts;
-    protected $caches = array();
-    protected $shutdown_functions = array();
-
-
-    /**
-     * This implements the 'singleton' design pattern
-     *
-     * @param integer Options to initialize with this instance. See rcube::INIT_WITH_* constants
-     * @param string Environment name to run (e.g. live, dev, test)
-     *
-     * @return rcube The one and only instance
-     */
-    static function get_instance($mode = 0, $env = '')
-    {
-        if (!self::$instance) {
-            self::$instance = new rcube($env);
-            self::$instance->init($mode);
-        }
-
-        return self::$instance;
-    }
-
-
-    /**
-     * Private constructor
-     */
-    protected function __construct($env = '')
-    {
-        // load configuration
-        $this->config  = new rcube_config($env);
-        $this->plugins = new rcube_dummy_plugin_api;
-
-        register_shutdown_function(array($this, 'shutdown'));
-    }
-
-
-    /**
-     * Initial startup function
-     */
-    protected function init($mode = 0)
-    {
-        // initialize syslog
-        if ($this->config->get('log_driver') == 'syslog') {
-            $syslog_id       = $this->config->get('syslog_id', 'roundcube');
-            $syslog_facility = $this->config->get('syslog_facility', LOG_USER);
-            openlog($syslog_id, LOG_ODELAY, $syslog_facility);
-        }
-
-        // connect to database
-        if ($mode & self::INIT_WITH_DB) {
-            $this->get_dbh();
-        }
-
-        // create plugin API and load plugins
-        if ($mode & self::INIT_WITH_PLUGINS) {
-            $this->plugins = rcube_plugin_api::get_instance();
-        }
-    }
-
-
-    /**
-     * Get the current database connection
-     *
-     * @return rcube_db Database object
-     */
-    public function get_dbh()
-    {
-        if (!$this->db) {
-            $config_all = $this->config->all();
-            $this->db = rcube_db::factory($config_all['db_dsnw'], $config_all['db_dsnr'], $config_all['db_persistent']);
-            $this->db->set_debug((bool)$config_all['sql_debug']);
-        }
-
-        return $this->db;
-    }
-
-
-    /**
-     * Get global handle for memcache access
-     *
-     * @return object Memcache
-     */
-    public function get_memcache()
-    {
-        if (!isset($this->memcache)) {
-            // no memcache support in PHP
-            if (!class_exists('Memcache')) {
-                $this->memcache = false;
-                return false;
-            }
-
-            $this->memcache     = new Memcache;
-            $this->mc_available = 0;
-
-            // add all configured hosts to pool
-            $pconnect = $this->config->get('memcache_pconnect', true);
-            foreach ($this->config->get('memcache_hosts', array()) as $host) {
-                if (substr($host, 0, 7) != 'unix://') {
-                    list($host, $port) = explode(':', $host);
-                    if (!$port) $port = 11211;
-                }
-                else {
-                    $port = 0;
-                }
-
-                $this->mc_available += intval($this->memcache->addServer(
-                    $host, $port, $pconnect, 1, 1, 15, false, array($this, 'memcache_failure')));
-            }
-
-            // test connection and failover (will result in $this->mc_available == 0 on complete failure)
-            $this->memcache->increment('__CONNECTIONTEST__', 1);  // NOP if key doesn't exist
-
-            if (!$this->mc_available) {
-                $this->memcache = false;
-            }
-        }
-
-        return $this->memcache;
-    }
-
-
-    /**
-     * Callback for memcache failure
-     */
-    public function memcache_failure($host, $port)
-    {
-        static $seen = array();
-
-        // only report once
-        if (!$seen["$host:$port"]++) {
-            $this->mc_available--;
-            self::raise_error(array(
-                'code' => 604, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => "Memcache failure on host $host:$port"),
-                true, false);
-        }
-    }
-
-
-    /**
-     * Initialize and get cache object
-     *
-     * @param string $name   Cache identifier
-     * @param string $type   Cache type ('db', 'apc' or 'memcache')
-     * @param string $ttl    Expiration time for cache items
-     * @param bool   $packed Enables/disables data serialization
-     *
-     * @return rcube_cache Cache object
-     */
-    public function get_cache($name, $type='db', $ttl=0, $packed=true)
-    {
-        if (!isset($this->caches[$name]) && ($userid = $this->get_user_id())) {
-            $this->caches[$name] = new rcube_cache($type, $userid, $name, $ttl, $packed);
-        }
-
-        return $this->caches[$name];
-    }
-
-
-    /**
-     * Initialize and get shared cache object
-     *
-     * @param string $name   Cache identifier
-     * @param bool   $packed Enables/disables data serialization
-     *
-     * @return rcube_cache_shared Cache object
-     */
-    public function get_cache_shared($name, $packed=true)
-    {
-        $shared_name = "shared_$name";
-
-        if (!array_key_exists($shared_name, $this->caches)) {
-            $opt  = strtolower($name) . '_cache';
-            $type = $this->config->get($opt);
-            $ttl  = $this->config->get($opt . '_ttl');
-
-            if (!$type) {
-                // cache is disabled
-                return $this->caches[$shared_name] = null;
-            }
-
-            if ($ttl === null) {
-                $ttl = $this->config->get('shared_cache_ttl', '10d');
-            }
-
-            $this->caches[$shared_name] = new rcube_cache_shared($type, $name, $ttl, $packed);
-        }
-
-        return $this->caches[$shared_name];
-    }
-
-
-    /**
-     * Create SMTP object and connect to server
-     *
-     * @param boolean True if connection should be established
-     */
-    public function smtp_init($connect = false)
-    {
-        $this->smtp = new rcube_smtp();
-
-        if ($connect) {
-            $this->smtp->connect();
-        }
-    }
-
-
-    /**
-     * Initialize and get storage object
-     *
-     * @return rcube_storage Storage object
-     */
-    public function get_storage()
-    {
-        // already initialized
-        if (!is_object($this->storage)) {
-            $this->storage_init();
-        }
-
-        return $this->storage;
-    }
-
-
-    /**
-     * Initialize storage object
-     */
-    public function storage_init()
-    {
-        // already initialized
-        if (is_object($this->storage)) {
-            return;
-        }
-
-        $driver       = $this->config->get('storage_driver', 'imap');
-        $driver_class = "rcube_{$driver}";
-
-        if (!class_exists($driver_class)) {
-            self::raise_error(array(
-                'code' => 700, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Storage driver class ($driver) not found!"),
-                true, true);
-        }
-
-        // Initialize storage object
-        $this->storage = new $driver_class;
-
-        // for backward compat. (deprecated, will be removed)
-        $this->imap = $this->storage;
-
-        // enable caching of mail data
-        $storage_cache  = $this->config->get("{$driver}_cache");
-        $messages_cache = $this->config->get('messages_cache');
-        // for backward compatybility
-        if ($storage_cache === null && $messages_cache === null && $this->config->get('enable_caching')) {
-            $storage_cache  = 'db';
-            $messages_cache = true;
-        }
-
-        if ($storage_cache) {
-            $this->storage->set_caching($storage_cache);
-        }
-        if ($messages_cache) {
-            $this->storage->set_messages_caching(true);
-        }
-
-        // set pagesize from config
-        $pagesize = $this->config->get('mail_pagesize');
-        if (!$pagesize) {
-            $pagesize = $this->config->get('pagesize', 50);
-        }
-        $this->storage->set_pagesize($pagesize);
-
-        // set class options
-        $options = array(
-            'auth_type'   => $this->config->get("{$driver}_auth_type", 'check'),
-            'auth_cid'    => $this->config->get("{$driver}_auth_cid"),
-            'auth_pw'     => $this->config->get("{$driver}_auth_pw"),
-            'debug'       => (bool) $this->config->get("{$driver}_debug"),
-            'force_caps'  => (bool) $this->config->get("{$driver}_force_caps"),
-            'disabled_caps' => $this->config->get("{$driver}_disabled_caps"),
-            'timeout'     => (int) $this->config->get("{$driver}_timeout"),
-            'skip_deleted' => (bool) $this->config->get('skip_deleted'),
-            'driver'      => $driver,
-        );
-
-        if (!empty($_SESSION['storage_host'])) {
-            $options['host']     = $_SESSION['storage_host'];
-            $options['user']     = $_SESSION['username'];
-            $options['port']     = $_SESSION['storage_port'];
-            $options['ssl']      = $_SESSION['storage_ssl'];
-            $options['password'] = $this->decrypt($_SESSION['password']);
-            $_SESSION[$driver.'_host'] = $_SESSION['storage_host'];
-        }
-
-        $options = $this->plugins->exec_hook("storage_init", $options);
-
-        // for backward compat. (deprecated, to be removed)
-        $options = $this->plugins->exec_hook("imap_init", $options);
-
-        $this->storage->set_options($options);
-        $this->set_storage_prop();
-    }
-
-
-    /**
-     * Set storage parameters.
-     * This must be done AFTER connecting to the server!
-     */
-    protected function set_storage_prop()
-    {
-        $storage = $this->get_storage();
-
-        $storage->set_charset($this->config->get('default_charset', RCUBE_CHARSET));
-
-        if ($default_folders = $this->config->get('default_folders')) {
-            $storage->set_default_folders($default_folders);
-        }
-        if (isset($_SESSION['mbox'])) {
-            $storage->set_folder($_SESSION['mbox']);
-        }
-        if (isset($_SESSION['page'])) {
-            $storage->set_page($_SESSION['page']);
-        }
-    }
-
-
-    /**
-     * Create session object and start the session.
-     */
-    public function session_init()
-    {
-        // session started (Installer?)
-        if (session_id()) {
-            return;
-        }
-
-        $sess_name   = $this->config->get('session_name');
-        $sess_domain = $this->config->get('session_domain');
-        $sess_path   = $this->config->get('session_path');
-        $lifetime    = $this->config->get('session_lifetime', 0) * 60;
-        $is_secure   = $this->config->get('use_https') || rcube_utils::https_check();
-
-        // set session domain
-        if ($sess_domain) {
-            ini_set('session.cookie_domain', $sess_domain);
-        }
-        // set session path
-        if ($sess_path) {
-            ini_set('session.cookie_path', $sess_path);
-        }
-        // set session garbage collecting time according to session_lifetime
-        if ($lifetime) {
-            ini_set('session.gc_maxlifetime', $lifetime * 2);
-        }
-
-        ini_set('session.cookie_secure', $is_secure);
-        ini_set('session.name', $sess_name ? $sess_name : 'roundcube_sessid');
-        ini_set('session.use_cookies', 1);
-        ini_set('session.use_only_cookies', 1);
-        ini_set('session.cookie_httponly', 1);
-
-        // use database for storing session data
-        $this->session = new rcube_session($this->get_dbh(), $this->config);
-
-        $this->session->register_gc_handler(array($this, 'gc'));
-        $this->session->set_secret($this->config->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
-        $this->session->set_ip_check($this->config->get('ip_check'));
-
-        if ($this->config->get('session_auth_name')) {
-            $this->session->set_cookiename($this->config->get('session_auth_name'));
-        }
-
-        // start PHP session (if not in CLI mode)
-        if ($_SERVER['REMOTE_ADDR']) {
-            $this->session->start();
-        }
-    }
-
-
-    /**
-     * Garbage collector - cache/temp cleaner
-     */
-    public function gc()
-    {
-        rcube_cache::gc();
-        rcube_cache_shared::gc();
-        $this->get_storage()->cache_gc();
-
-        $this->gc_temp();
-    }
-
-
-    /**
-     * Garbage collector function for temp files.
-     * Remove temp files older than two days
-     */
-    public function gc_temp()
-    {
-        $tmp = unslashify($this->config->get('temp_dir'));
-
-        // expire in 48 hours by default
-        $temp_dir_ttl = $this->config->get('temp_dir_ttl', '48h');
-        $temp_dir_ttl = get_offset_sec($temp_dir_ttl);
-        if ($temp_dir_ttl < 6*3600)
-            $temp_dir_ttl = 6*3600;   // 6 hours sensible lower bound.
-
-        $expire = time() - $temp_dir_ttl;
-
-        if ($tmp && ($dir = opendir($tmp))) {
-            while (($fname = readdir($dir)) !== false) {
-                if ($fname[0] == '.') {
-                    continue;
-                }
-
-                if (@filemtime($tmp.'/'.$fname) < $expire) {
-                    @unlink($tmp.'/'.$fname);
-                }
-            }
-
-            closedir($dir);
-        }
-    }
-
-
-    /**
-     * Runs garbage collector with probability based on
-     * session settings. This is intended for environments
-     * without a session.
-     */
-    public function gc_run()
-    {
-        $probability = (int) ini_get('session.gc_probability');
-        $divisor     = (int) ini_get('session.gc_divisor');
-
-        if ($divisor > 0 && $probability > 0) {
-            $random = mt_rand(1, $divisor);
-            if ($random <= $probability) {
-                $this->gc();
-            }
-        }
-    }
-
-
-    /**
-     * Get localized text in the desired language
-     *
-     * @param mixed   $attrib  Named parameters array or label name
-     * @param string  $domain  Label domain (plugin) name
-     *
-     * @return string Localized text
-     */
-    public function gettext($attrib, $domain=null)
-    {
-        // load localization files if not done yet
-        if (empty($this->texts)) {
-            $this->load_language();
-        }
-
-        // extract attributes
-        if (is_string($attrib)) {
-            $attrib = array('name' => $attrib);
-        }
-
-        $name = $attrib['name'] ? $attrib['name'] : '';
-
-        // attrib contain text values: use them from now
-        if (($setval = $attrib[strtolower($_SESSION['language'])]) || ($setval = $attrib['en_us'])) {
-            $this->texts[$name] = $setval;
-        }
-
-        // check for text with domain
-        if ($domain && ($text = $this->texts[$domain.'.'.$name])) {
-        }
-        // text does not exist
-        else if (!($text = $this->texts[$name])) {
-            return "[$name]";
-        }
-
-        // replace vars in text
-        if (is_array($attrib['vars'])) {
-            foreach ($attrib['vars'] as $var_key => $var_value) {
-                $text = str_replace($var_key[0]!='$' ? '$'.$var_key : $var_key, $var_value, $text);
-            }
-        }
-
-        // format output
-        if (($attrib['uppercase'] && strtolower($attrib['uppercase'] == 'first')) || $attrib['ucfirst']) {
-            return ucfirst($text);
-        }
-        else if ($attrib['uppercase']) {
-            return mb_strtoupper($text);
-        }
-        else if ($attrib['lowercase']) {
-            return mb_strtolower($text);
-        }
-
-        return strtr($text, array('\n' => "\n"));
-    }
-
-
-    /**
-     * Check if the given text label exists
-     *
-     * @param string  $name       Label name
-     * @param string  $domain     Label domain (plugin) name or '*' for all domains
-     * @param string  $ref_domain Sets domain name if label is found
-     *
-     * @return boolean True if text exists (either in the current language or in en_US)
-     */
-    public function text_exists($name, $domain = null, &$ref_domain = null)
-    {
-        // load localization files if not done yet
-        if (empty($this->texts)) {
-            $this->load_language();
-        }
-
-        if (isset($this->texts[$name])) {
-            $ref_domain = '';
-            return true;
-        }
-
-        // any of loaded domains (plugins)
-        if ($domain == '*') {
-            foreach ($this->plugins->loaded_plugins() as $domain) {
-                if (isset($this->texts[$domain.'.'.$name])) {
-                    $ref_domain = $domain;
-                    return true;
-                }
-            }
-        }
-        // specified domain
-        else if ($domain) {
-            $ref_domain = $domain;
-            return isset($this->texts[$domain.'.'.$name]);
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Load a localization package
-     *
-     * @param string Language ID
-     * @param array  Additional text labels/messages
-     */
-    public function load_language($lang = null, $add = array())
-    {
-        $lang = $this->language_prop(($lang ? $lang : $_SESSION['language']));
-
-        // load localized texts
-        if (empty($this->texts) || $lang != $_SESSION['language']) {
-            $this->texts = array();
-
-            // handle empty lines after closing PHP tag in localization files
-            ob_start();
-
-            // get english labels (these should be complete)
-            @include(RCUBE_LOCALIZATION_DIR . 'en_US/labels.inc');
-            @include(RCUBE_LOCALIZATION_DIR . 'en_US/messages.inc');
-
-            if (is_array($labels))
-                $this->texts = $labels;
-            if (is_array($messages))
-                $this->texts = array_merge($this->texts, $messages);
-
-            // include user language files
-            if ($lang != 'en' && $lang != 'en_US' && is_dir(RCUBE_LOCALIZATION_DIR . $lang)) {
-                include_once(RCUBE_LOCALIZATION_DIR . $lang . '/labels.inc');
-                include_once(RCUBE_LOCALIZATION_DIR . $lang . '/messages.inc');
-
-                if (is_array($labels))
-                    $this->texts = array_merge($this->texts, $labels);
-                if (is_array($messages))
-                    $this->texts = array_merge($this->texts, $messages);
-            }
-
-            ob_end_clean();
-
-            $_SESSION['language'] = $lang;
-        }
-
-        // append additional texts (from plugin)
-        if (is_array($add) && !empty($add)) {
-            $this->texts += $add;
-        }
-    }
-
-
-    /**
-     * Check the given string and return a valid language code
-     *
-     * @param string Language code
-     *
-     * @return string Valid language code
-     */
-    protected function language_prop($lang)
-    {
-        static $rcube_languages, $rcube_language_aliases;
-
-        // user HTTP_ACCEPT_LANGUAGE if no language is specified
-        if (empty($lang) || $lang == 'auto') {
-            $accept_langs = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
-            $lang         = $accept_langs[0];
-
-            if (preg_match('/^([a-z]+)[_-]([a-z]+)$/i', $lang, $m)) {
-                $lang = $m[1] . '_' . strtoupper($m[2]);
-            }
-        }
-
-        if (empty($rcube_languages)) {
-            @include(RCUBE_LOCALIZATION_DIR . 'index.inc');
-        }
-
-        // check if we have an alias for that language
-        if (!isset($rcube_languages[$lang]) && isset($rcube_language_aliases[$lang])) {
-            $lang = $rcube_language_aliases[$lang];
-        }
-        // try the first two chars
-        else if (!isset($rcube_languages[$lang])) {
-            $short = substr($lang, 0, 2);
-
-            // check if we have an alias for the short language code
-            if (!isset($rcube_languages[$short]) && isset($rcube_language_aliases[$short])) {
-                $lang = $rcube_language_aliases[$short];
-            }
-            // expand 'nn' to 'nn_NN'
-            else if (!isset($rcube_languages[$short])) {
-                $lang = $short.'_'.strtoupper($short);
-            }
-        }
-
-        if (!isset($rcube_languages[$lang]) || !is_dir(RCUBE_LOCALIZATION_DIR . $lang)) {
-            $lang = 'en_US';
-        }
-
-        return $lang;
-    }
-
-
-    /**
-     * Read directory program/localization and return a list of available languages
-     *
-     * @return array List of available localizations
-     */
-    public function list_languages()
-    {
-        static $sa_languages = array();
-
-        if (!sizeof($sa_languages)) {
-            @include(RCUBE_LOCALIZATION_DIR . 'index.inc');
-
-            if ($dh = @opendir(RCUBE_LOCALIZATION_DIR)) {
-                while (($name = readdir($dh)) !== false) {
-                    if ($name[0] == '.' || !is_dir(RCUBE_LOCALIZATION_DIR . $name)) {
-                        continue;
-                    }
-
-                    if ($label = $rcube_languages[$name]) {
-                        $sa_languages[$name] = $label;
-                    }
-                }
-                closedir($dh);
-            }
-        }
-
-        return $sa_languages;
-    }
-
-
-    /**
-     * Encrypt using 3DES
-     *
-     * @param string $clear clear text input
-     * @param string $key encryption key to retrieve from the configuration, defaults to 'des_key'
-     * @param boolean $base64 whether or not to base64_encode() the result before returning
-     *
-     * @return string encrypted text
-     */
-    public function encrypt($clear, $key = 'des_key', $base64 = true)
-    {
-        if (!$clear) {
-            return '';
-        }
-
-        /*-
-         * Add a single canary byte to the end of the clear text, which
-         * will help find out how much of padding will need to be removed
-         * upon decryption; see http://php.net/mcrypt_generic#68082
-         */
-        $clear = pack("a*H2", $clear, "80");
-
-        if (function_exists('mcrypt_module_open') &&
-            ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, ""))
-        ) {
-            $iv = $this->create_iv(mcrypt_enc_get_iv_size($td));
-            mcrypt_generic_init($td, $this->config->get_crypto_key($key), $iv);
-            $cipher = $iv . mcrypt_generic($td, $clear);
-            mcrypt_generic_deinit($td);
-            mcrypt_module_close($td);
-        }
-        else {
-            @include_once 'des.inc';
-
-            if (function_exists('des')) {
-                $des_iv_size = 8;
-                $iv = $this->create_iv($des_iv_size);
-                $cipher = $iv . des($this->config->get_crypto_key($key), $clear, 1, 1, $iv);
-            }
-            else {
-                self::raise_error(array(
-                    'code' => 500, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Could not perform encryption; make sure Mcrypt is installed or lib/des.inc is available"
-                    ), true, true);
-            }
-        }
-
-        return $base64 ? base64_encode($cipher) : $cipher;
-    }
-
-
-    /**
-     * Decrypt 3DES-encrypted string
-     *
-     * @param string $cipher encrypted text
-     * @param string $key encryption key to retrieve from the configuration, defaults to 'des_key'
-     * @param boolean $base64 whether or not input is base64-encoded
-     *
-     * @return string decrypted text
-     */
-    public function decrypt($cipher, $key = 'des_key', $base64 = true)
-    {
-        if (!$cipher) {
-            return '';
-        }
-
-        $cipher = $base64 ? base64_decode($cipher) : $cipher;
-
-        if (function_exists('mcrypt_module_open') &&
-            ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, ""))
-        ) {
-            $iv_size = mcrypt_enc_get_iv_size($td);
-            $iv = substr($cipher, 0, $iv_size);
-
-            // session corruption? (#1485970)
-            if (strlen($iv) < $iv_size) {
-                return '';
-            }
-
-            $cipher = substr($cipher, $iv_size);
-            mcrypt_generic_init($td, $this->config->get_crypto_key($key), $iv);
-            $clear = mdecrypt_generic($td, $cipher);
-            mcrypt_generic_deinit($td);
-            mcrypt_module_close($td);
-        }
-        else {
-            @include_once 'des.inc';
-
-            if (function_exists('des')) {
-                $des_iv_size = 8;
-                $iv = substr($cipher, 0, $des_iv_size);
-                $cipher = substr($cipher, $des_iv_size);
-                $clear = des($this->config->get_crypto_key($key), $cipher, 0, 1, $iv);
-            }
-            else {
-                self::raise_error(array(
-                    'code' => 500, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Could not perform decryption; make sure Mcrypt is installed or lib/des.inc is available"
-                    ), true, true);
-            }
-        }
-
-        /*-
-         * Trim PHP's padding and the canary byte; see note in
-         * rcube::encrypt() and http://php.net/mcrypt_generic#68082
-         */
-        $clear = substr(rtrim($clear, "\0"), 0, -1);
-
-        return $clear;
-    }
-
-
-    /**
-     * Generates encryption initialization vector (IV)
-     *
-     * @param int Vector size
-     *
-     * @return string Vector string
-     */
-    private function create_iv($size)
-    {
-        // mcrypt_create_iv() can be slow when system lacks entrophy
-        // we'll generate IV vector manually
-        $iv = '';
-        for ($i = 0; $i < $size; $i++) {
-            $iv .= chr(mt_rand(0, 255));
-        }
-
-        return $iv;
-    }
-
-
-    /**
-     * Build a valid URL to this instance of Roundcube
-     *
-     * @param mixed Either a string with the action or url parameters as key-value pairs
-     * @return string Valid application URL
-     */
-    public function url($p)
-    {
-        // STUB: should be overloaded by the application
-        return '';
-    }
-
-
-    /**
-     * Function to be executed in script shutdown
-     * Registered with register_shutdown_function()
-     */
-    public function shutdown()
-    {
-        foreach ($this->shutdown_functions as $function) {
-            call_user_func($function);
-        }
-
-        // write session data as soon as possible and before
-        // closing database connection, don't do this before
-        // registered shutdown functions, they may need the session
-        // Note: this will run registered gc handlers (ie. cache gc)
-        if ($_SERVER['REMOTE_ADDR'] && is_object($this->session)) {
-            $this->session->write_close();
-        }
-
-        if (is_object($this->smtp)) {
-            $this->smtp->disconnect();
-        }
-
-        foreach ($this->caches as $cache) {
-            if (is_object($cache)) {
-                $cache->close();
-            }
-        }
-
-        if (is_object($this->storage)) {
-            $this->storage->close();
-        }
-    }
-
-
-    /**
-     * Registers shutdown function to be executed on shutdown.
-     * The functions will be executed before destroying any
-     * objects like smtp, imap, session, etc.
-     *
-     * @param callback Function callback
-     */
-    public function add_shutdown_function($function)
-    {
-        $this->shutdown_functions[] = $function;
-    }
-
-
-    /**
-     * Quote a given string.
-     * Shortcut function for rcube_utils::rep_specialchars_output()
-     *
-     * @return string HTML-quoted string
-     */
-    public static function Q($str, $mode = 'strict', $newlines = true)
-    {
-        return rcube_utils::rep_specialchars_output($str, 'html', $mode, $newlines);
-    }
-
-
-    /**
-     * Quote a given string for javascript output.
-     * Shortcut function for rcube_utils::rep_specialchars_output()
-     *
-     * @return string JS-quoted string
-     */
-    public static function JQ($str)
-    {
-        return rcube_utils::rep_specialchars_output($str, 'js');
-    }
-
-
-    /**
-     * Construct shell command, execute it and return output as string.
-     * Keywords {keyword} are replaced with arguments
-     *
-     * @param $cmd Format string with {keywords} to be replaced
-     * @param $values (zero, one or more arrays can be passed)
-     *
-     * @return output of command. shell errors not detectable
-     */
-    public static function exec(/* $cmd, $values1 = array(), ... */)
-    {
-        $args   = func_get_args();
-        $cmd    = array_shift($args);
-        $values = $replacements = array();
-
-        // merge values into one array
-        foreach ($args as $arg) {
-            $values += (array)$arg;
-        }
-
-        preg_match_all('/({(-?)([a-z]\w*)})/', $cmd, $matches, PREG_SET_ORDER);
-        foreach ($matches as $tags) {
-            list(, $tag, $option, $key) = $tags;
-            $parts = array();
-
-            if ($option) {
-                foreach ((array)$values["-$key"] as $key => $value) {
-                    if ($value === true || $value === false || $value === null) {
-                        $parts[] = $value ? $key : "";
-                    }
-                    else {
-                        foreach ((array)$value as $val) {
-                            $parts[] = "$key " . escapeshellarg($val);
-                        }
-                    }
-                }
-            }
-            else {
-                foreach ((array)$values[$key] as $value) {
-                    $parts[] = escapeshellarg($value);
-                }
-            }
-
-            $replacements[$tag] = join(" ", $parts);
-        }
-
-        // use strtr behaviour of going through source string once
-        $cmd = strtr($cmd, $replacements);
-
-        return (string)shell_exec($cmd);
-    }
-
-
-    /**
-     * Print or write debug messages
-     *
-     * @param mixed Debug message or data
-     */
-    public static function console()
-    {
-        $args = func_get_args();
-
-        if (class_exists('rcube', false)) {
-            $rcube = self::get_instance();
-            $plugin = $rcube->plugins->exec_hook('console', array('args' => $args));
-            if ($plugin['abort']) {
-                return;
-            }
-           $args = $plugin['args'];
-        }
-
-        $msg = array();
-        foreach ($args as $arg) {
-            $msg[] = !is_string($arg) ? var_export($arg, true) : $arg;
-        }
-
-        self::write_log('console', join(";\n", $msg));
-    }
-
-
-    /**
-     * Append a line to a logfile in the logs directory.
-     * Date will be added automatically to the line.
-     *
-     * @param $name name of log file
-     * @param line Line to append
-     */
-    public static function write_log($name, $line)
-    {
-        if (!is_string($line)) {
-            $line = var_export($line, true);
-        }
-
-        $date_format = self::$instance ? self::$instance->config->get('log_date_format') : null;
-        $log_driver  = self::$instance ? self::$instance->config->get('log_driver') : null;
-
-        if (empty($date_format)) {
-            $date_format = 'd-M-Y H:i:s O';
-        }
-
-        $date = date($date_format);
-
-        // trigger logging hook
-        if (is_object(self::$instance) && is_object(self::$instance->plugins)) {
-            $log  = self::$instance->plugins->exec_hook('write_log', array('name' => $name, 'date' => $date, 'line' => $line));
-            $name = $log['name'];
-            $line = $log['line'];
-            $date = $log['date'];
-            if ($log['abort'])
-                return true;
-        }
-
-        if ($log_driver == 'syslog') {
-            $prio = $name == 'errors' ? LOG_ERR : LOG_INFO;
-            syslog($prio, $line);
-            return true;
-        }
-
-        // log_driver == 'file' is assumed here
-
-        $line = sprintf("[%s]: %s\n", $date, $line);
-        $log_dir  = self::$instance ? self::$instance->config->get('log_dir') : null;
-
-        if (empty($log_dir)) {
-            $log_dir = RCUBE_INSTALL_PATH . 'logs';
-        }
-
-        // try to open specific log file for writing
-        $logfile = $log_dir.'/'.$name;
-
-        if ($fp = @fopen($logfile, 'a')) {
-            fwrite($fp, $line);
-            fflush($fp);
-            fclose($fp);
-            return true;
-        }
-
-        trigger_error("Error writing to log file $logfile; Please check permissions", E_USER_WARNING);
-        return false;
-    }
-
-
-    /**
-     * Throw system error (and show error page).
-     *
-     * @param array Named parameters
-     *      - code:    Error code (required)
-     *      - type:    Error type [php|db|imap|javascript] (required)
-     *      - message: Error message
-     *      - file:    File where error occurred
-     *      - line:    Line where error occurred
-     * @param boolean True to log the error
-     * @param boolean Terminate script execution
-     */
-    public static function raise_error($arg = array(), $log = false, $terminate = false)
-    {
-        // handle PHP exceptions
-        if (is_object($arg) && is_a($arg, 'Exception')) {
-            $arg = array(
-                'type' => 'php',
-                'code' => $arg->getCode(),
-                'line' => $arg->getLine(),
-                'file' => $arg->getFile(),
-                'message' => $arg->getMessage(),
-            );
-        }
-        else if (is_string($arg)) {
-            $arg = array('message' => $arg, 'type' => 'php');
-        }
-
-        if (empty($arg['code'])) {
-            $arg['code'] = 500;
-        }
-
-        // installer
-        if (class_exists('rcube_install', false)) {
-            $rci = rcube_install::get_instance();
-            $rci->raise_error($arg);
-            return;
-        }
-
-        $cli = php_sapi_name() == 'cli';
-
-        if (($log || $terminate) && !$cli && $arg['type'] && $arg['message']) {
-            $arg['fatal'] = $terminate;
-            self::log_bug($arg);
-        }
-
-        // terminate script
-        if ($terminate) {
-            // display error page
-            if (is_object(self::$instance->output)) {
-                self::$instance->output->raise_error($arg['code'], $arg['message']);
-            }
-            else if ($cli) {
-                fwrite(STDERR, 'ERROR: ' . $arg['message']);
-            }
-
-            exit(1);
-        }
-    }
-
-
-    /**
-     * Report error according to configured debug_level
-     *
-     * @param array Named parameters
-     * @see self::raise_error()
-     */
-    public static function log_bug($arg_arr)
-    {
-        $program = strtoupper($arg_arr['type']);
-        $level   = self::get_instance()->config->get('debug_level');
-
-        // disable errors for ajax requests, write to log instead (#1487831)
-        if (($level & 4) && !empty($_REQUEST['_remote'])) {
-            $level = ($level ^ 4) | 1;
-        }
-
-        // write error to local log file
-        if (($level & 1) || !empty($arg_arr['fatal'])) {
-            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-                $post_query = '?_task='.urlencode($_POST['_task']).'&_action='.urlencode($_POST['_action']);
-            }
-            else {
-                $post_query = '';
-            }
-
-            $log_entry = sprintf("%s Error: %s%s (%s %s)",
-                $program,
-                $arg_arr['message'],
-                $arg_arr['file'] ? sprintf(' in %s on line %d', $arg_arr['file'], $arg_arr['line']) : '',
-                $_SERVER['REQUEST_METHOD'],
-                $_SERVER['REQUEST_URI'] . $post_query);
-
-            if (!self::write_log('errors', $log_entry)) {
-                // send error to PHPs error handler if write_log didn't succeed
-                trigger_error($arg_arr['message'], E_USER_WARNING);
-            }
-        }
-
-        // report the bug to the global bug reporting system
-        if ($level & 2) {
-            // TODO: Send error via HTTP
-        }
-
-        // show error if debug_mode is on
-        if ($level & 4) {
-            print "<b>$program Error";
-
-            if (!empty($arg_arr['file']) && !empty($arg_arr['line'])) {
-                print " in $arg_arr[file] ($arg_arr[line])";
-            }
-
-            print ':</b>&nbsp;';
-            print nl2br($arg_arr['message']);
-            print '<br />';
-            flush();
-        }
-    }
-
-
-    /**
-     * Returns current time (with microseconds).
-     *
-     * @return float Current time in seconds since the Unix
-     */
-    public static function timer()
-    {
-        return microtime(true);
-    }
-
-
-    /**
-     * Logs time difference according to provided timer
-     *
-     * @param float  $timer  Timer (self::timer() result)
-     * @param string $label  Log line prefix
-     * @param string $dest   Log file name
-     *
-     * @see self::timer()
-     */
-    public static function print_timer($timer, $label = 'Timer', $dest = 'console')
-    {
-        static $print_count = 0;
-
-        $print_count++;
-        $now  = self::timer();
-        $diff = $now - $timer;
-
-        if (empty($label)) {
-            $label = 'Timer '.$print_count;
-        }
-
-        self::write_log($dest, sprintf("%s: %0.4f sec", $label, $diff));
-    }
-
-
-    /**
-     * Getter for logged user ID.
-     *
-     * @return mixed User identifier
-     */
-    public function get_user_id()
-    {
-        if (is_object($this->user)) {
-            return $this->user->ID;
-        }
-        else if (isset($_SESSION['user_id'])) {
-            return $_SESSION['user_id'];
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Getter for logged user name.
-     *
-     * @return string User name
-     */
-    public function get_user_name()
-    {
-        if (is_object($this->user)) {
-            return $this->user->get_username();
-        }
-        else if (isset($_SESSION['username'])) {
-            return $_SESSION['username'];
-        }
-    }
-
-
-    /**
-     * Getter for logged user email (derived from user name not identity).
-     *
-     * @return string User email address
-     */
-    public function get_user_email()
-    {
-        if (is_object($this->user)) {
-            return $this->user->get_username('mail');
-        }
-    }
-
-
-    /**
-     * Getter for logged user password.
-     *
-     * @return string User password
-     */
-    public function get_user_password()
-    {
-        if ($this->password) {
-            return $this->password;
-        }
-        else if ($_SESSION['password']) {
-            return $this->decrypt($_SESSION['password']);
-        }
-    }
-
-
-    /**
-     * Getter for logged user language code.
-     *
-     * @return string User language code
-     */
-    public function get_user_language()
-    {
-        if (is_object($this->user)) {
-            return $this->user->language;
-        }
-        else if (isset($_SESSION['language'])) {
-            return $_SESSION['language'];
-        }
-    }
-
-    /**
-     * Unique Message-ID generator.
-     *
-     * @return string Message-ID
-     */
-    public function gen_message_id()
-    {
-        $local_part  = md5(uniqid('rcube'.mt_rand(), true));
-        $domain_part = $this->user->get_username('domain');
-
-        // Try to find FQDN, some spamfilters doesn't like 'localhost' (#1486924)
-        if (!preg_match('/\.[a-z]+$/i', $domain_part)) {
-            foreach (array($_SERVER['HTTP_HOST'], $_SERVER['SERVER_NAME']) as $host) {
-                $host = preg_replace('/:[0-9]+$/', '', $host);
-                if ($host && preg_match('/\.[a-z]+$/i', $host)) {
-                    $domain_part = $host;
-                }
-            }
-        }
-
-        return sprintf('<%s@%s>', $local_part, $domain_part);
-    }
-
-    /**
-     * Send the given message using the configured method.
-     *
-     * @param object $message    Reference to Mail_MIME object
-     * @param string $from       Sender address string
-     * @param array  $mailto     Array of recipient address strings
-     * @param array  $error      SMTP error array (reference)
-     * @param string $body_file  Location of file with saved message body (reference),
-     *                           used when delay_file_io is enabled
-     * @param array  $options    SMTP options (e.g. DSN request)
-     *
-     * @return boolean Send status.
-     */
-    public function deliver_message(&$message, $from, $mailto, &$error, &$body_file = null, $options = null)
-    {
-        $plugin = $this->plugins->exec_hook('message_before_send', array(
-            'message' => $message,
-            'from'    => $from,
-            'mailto'  => $mailto,
-            'options' => $options,
-        ));
-
-        if ($plugin['abort']) {
-            return isset($plugin['result']) ? $plugin['result'] : false;
-        }
-
-        $from    = $plugin['from'];
-        $mailto  = $plugin['mailto'];
-        $options = $plugin['options'];
-        $message = $plugin['message'];
-        $headers = $message->headers();
-
-        // send thru SMTP server using custom SMTP library
-        if ($this->config->get('smtp_server')) {
-            // generate list of recipients
-            $a_recipients = array($mailto);
-
-            if (strlen($headers['Cc']))
-                $a_recipients[] = $headers['Cc'];
-            if (strlen($headers['Bcc']))
-                $a_recipients[] = $headers['Bcc'];
-
-            // clean Bcc from header for recipients
-            $send_headers = $headers;
-            unset($send_headers['Bcc']);
-            // here too, it because txtHeaders() below use $message->_headers not only $send_headers
-            unset($message->_headers['Bcc']);
-
-            $smtp_headers = $message->txtHeaders($send_headers, true);
-
-            if ($message->getParam('delay_file_io')) {
-                // use common temp dir
-                $temp_dir = $this->config->get('temp_dir');
-                $body_file = tempnam($temp_dir, 'rcmMsg');
-                if (PEAR::isError($mime_result = $message->saveMessageBody($body_file))) {
-                    self::raise_error(array('code' => 650, 'type' => 'php',
-                        'file' => __FILE__, 'line' => __LINE__,
-                        'message' => "Could not create message: ".$mime_result->getMessage()),
-                        TRUE, FALSE);
-                    return false;
-                }
-                $msg_body = fopen($body_file, 'r');
-            }
-            else {
-                $msg_body = $message->get();
-            }
-
-            // send message
-            if (!is_object($this->smtp)) {
-                $this->smtp_init(true);
-            }
-
-            $sent     = $this->smtp->send_mail($from, $a_recipients, $smtp_headers, $msg_body, $options);
-            $response = $this->smtp->get_response();
-            $error    = $this->smtp->get_error();
-
-            // log error
-            if (!$sent) {
-                self::raise_error(array('code' => 800, 'type' => 'smtp',
-                    'line' => __LINE__, 'file' => __FILE__,
-                    'message' => "SMTP error: ".join("\n", $response)), TRUE, FALSE);
-            }
-        }
-        // send mail using PHP's mail() function
-        else {
-            // unset some headers because they will be added by the mail() function
-            $headers_enc = $message->headers($headers);
-            $headers_php = $message->_headers;
-            unset($headers_php['To'], $headers_php['Subject']);
-
-            // reset stored headers and overwrite
-            $message->_headers = array();
-            $header_str = $message->txtHeaders($headers_php);
-
-            // #1485779
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-                if (preg_match_all('/<([^@]+@[^>]+)>/', $headers_enc['To'], $m)) {
-                    $headers_enc['To'] = implode(', ', $m[1]);
-                }
-            }
-
-            $msg_body = $message->get();
-
-            if (PEAR::isError($msg_body)) {
-                self::raise_error(array('code' => 650, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Could not create message: ".$msg_body->getMessage()),
-                    TRUE, FALSE);
-            }
-            else {
-                $delim   = $this->config->header_delimiter();
-                $to      = $headers_enc['To'];
-                $subject = $headers_enc['Subject'];
-                $header_str = rtrim($header_str);
-
-                if ($delim != "\r\n") {
-                    $header_str = str_replace("\r\n", $delim, $header_str);
-                    $msg_body   = str_replace("\r\n", $delim, $msg_body);
-                    $to         = str_replace("\r\n", $delim, $to);
-                    $subject    = str_replace("\r\n", $delim, $subject);
-                }
-
-                if (filter_var(ini_get('safe_mode'), FILTER_VALIDATE_BOOLEAN))
-                    $sent = mail($to, $subject, $msg_body, $header_str);
-                else
-                    $sent = mail($to, $subject, $msg_body, $header_str, "-f$from");
-            }
-        }
-
-        if ($sent) {
-            $this->plugins->exec_hook('message_sent', array('headers' => $headers, 'body' => $msg_body));
-
-            // remove MDN headers after sending
-            unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']);
-
-            // get all recipients
-            if ($headers['Cc'])
-                $mailto .= $headers['Cc'];
-            if ($headers['Bcc'])
-                $mailto .= $headers['Bcc'];
-            if (preg_match_all('/<([^@]+@[^>]+)>/', $mailto, $m))
-                $mailto = implode(', ', array_unique($m[1]));
-
-            if ($this->config->get('smtp_log')) {
-                self::write_log('sendmail', sprintf("User %s [%s]; Message for %s; %s",
-                    $this->user->get_username(),
-                    $_SERVER['REMOTE_ADDR'],
-                    $mailto,
-                    !empty($response) ? join('; ', $response) : ''));
-            }
-        }
-
-        if (is_resource($msg_body)) {
-            fclose($msg_body);
-        }
-
-        $message->_headers = array();
-        $message->headers($headers);
-
-        return $sent;
-    }
-
-}
-
-
-/**
- * Lightweight plugin API class serving as a dummy if plugins are not enabled
- *
- * @package Framework
- * @subpackage Core
- */
-class rcube_dummy_plugin_api
-{
-    /**
-     * Triggers a plugin hook.
-     * @see rcube_plugin_api::exec_hook()
-     */
-    public function exec_hook($hook, $args = array())
-    {
-        return $args;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_addressbook.php b/lib/ext/Roundcube/rcube_addressbook.php
deleted file mode 100644
index 886f65c..0000000
--- a/lib/ext/Roundcube/rcube_addressbook.php
+++ /dev/null
@@ -1,617 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Interface to the local address book database                        |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-
-/**
- * Abstract skeleton of an address book/repository
- *
- * @package    Framework
- * @subpackage Addressbook
- */
-abstract class rcube_addressbook
-{
-    /** constants for error reporting **/
-    const ERROR_READ_ONLY = 1;
-    const ERROR_NO_CONNECTION = 2;
-    const ERROR_VALIDATE = 3;
-    const ERROR_SAVING = 4;
-    const ERROR_SEARCH = 5;
-
-    /** public properties (mandatory) */
-    public $primary_key;
-    public $groups = false;
-    public $export_groups = true;
-    public $readonly = true;
-    public $searchonly = false;
-    public $undelete = false;
-    public $ready = false;
-    public $group_id = null;
-    public $list_page = 1;
-    public $page_size = 10;
-    public $sort_col = 'name';
-    public $sort_order = 'ASC';
-    public $coltypes = array('name' => array('limit'=>1), 'firstname' => array('limit'=>1), 'surname' => array('limit'=>1), 'email' => array('limit'=>1));
-    public $date_cols = array();
-
-    protected $error;
-
-    /**
-     * Returns addressbook name (e.g. for addressbooks listing)
-     */
-    abstract function get_name();
-
-    /**
-     * Save a search string for future listings
-     *
-     * @param mixed Search params to use in listing method, obtained by get_search_set()
-     */
-    abstract function set_search_set($filter);
-
-    /**
-     * Getter for saved search properties
-     *
-     * @return mixed Search properties used by this class
-     */
-    abstract function get_search_set();
-
-    /**
-     * Reset saved results and search parameters
-     */
-    abstract function reset();
-
-    /**
-     * Refresh saved search set after data has changed
-     *
-     * @return mixed New search set
-     */
-    function refresh_search()
-    {
-        return $this->get_search_set();
-    }
-
-    /**
-     * List the current set of contact records
-     *
-     * @param  array  List of cols to show
-     * @param  int    Only return this number of records, use negative values for tail
-     * @return array  Indexed list of contact records, each a hash array
-     */
-    abstract function list_records($cols=null, $subset=0);
-
-    /**
-     * Search records
-     *
-     * @param array   List of fields to search in
-     * @param string  Search value
-     * @param int     Matching mode:
-     *                0 - partial (*abc*),
-     *                1 - strict (=),
-     *                2 - prefix (abc*)
-     * @param boolean True if results are requested, False if count only
-     * @param boolean True to skip the count query (select only)
-     * @param array   List of fields that cannot be empty
-     * @return object rcube_result_set List of contact records and 'count' value
-     */
-    abstract function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array());
-
-    /**
-     * Count number of available contacts in database
-     *
-     * @return rcube_result_set Result set with values for 'count' and 'first'
-     */
-    abstract function count();
-
-    /**
-     * Return the last result set
-     *
-     * @return rcube_result_set Current result set or NULL if nothing selected yet
-     */
-    abstract function get_result();
-
-    /**
-     * Get a specific contact record
-     *
-     * @param mixed record identifier(s)
-     * @param boolean True to return record as associative array, otherwise a result set is returned
-     *
-     * @return mixed Result object with all record fields or False if not found
-     */
-    abstract function get_record($id, $assoc=false);
-
-    /**
-     * Returns the last error occurred (e.g. when updating/inserting failed)
-     *
-     * @return array Hash array with the following fields: type, message
-     */
-    function get_error()
-    {
-        return $this->error;
-    }
-
-    /**
-     * Setter for errors for internal use
-     *
-     * @param int Error type (one of this class' error constants)
-     * @param string Error message (name of a text label)
-     */
-    protected function set_error($type, $message)
-    {
-        $this->error = array('type' => $type, 'message' => $message);
-    }
-
-    /**
-     * Close connection to source
-     * Called on script shutdown
-     */
-    function close() { }
-
-    /**
-     * Set internal list page
-     *
-     * @param  number  Page number to list
-     * @access public
-     */
-    function set_page($page)
-    {
-        $this->list_page = (int)$page;
-    }
-
-    /**
-     * Set internal page size
-     *
-     * @param  number  Number of messages to display on one page
-     * @access public
-     */
-    function set_pagesize($size)
-    {
-        $this->page_size = (int)$size;
-    }
-
-    /**
-     * Set internal sort settings
-     *
-     * @param string $sort_col Sort column
-     * @param string $sort_order Sort order
-     */
-    function set_sort_order($sort_col, $sort_order = null)
-    {
-        if ($sort_col != null && ($this->coltypes[$sort_col] || in_array($sort_col, $this->coltypes))) {
-            $this->sort_col = $sort_col;
-        }
-        if ($sort_order != null) {
-            $this->sort_order = strtoupper($sort_order) == 'DESC' ? 'DESC' : 'ASC';
-        }
-    }
-
-    /**
-     * Check the given data before saving.
-     * If input isn't valid, the message to display can be fetched using get_error()
-     *
-     * @param array Assoziative array with data to save
-     * @param boolean Attempt to fix/complete record automatically
-     * @return boolean True if input is valid, False if not.
-     */
-    public function validate(&$save_data, $autofix = false)
-    {
-        $rcube = rcube::get_instance();
-        $valid = true;
-
-        // check validity of email addresses
-        foreach ($this->get_col_values('email', $save_data, true) as $email) {
-            if (strlen($email)) {
-                if (!rcube_utils::check_email(rcube_utils::idn_to_ascii($email))) {
-                    $error = $rcube->gettext(array('name' => 'emailformaterror', 'vars' => array('email' => $email)));
-                    $this->set_error(self::ERROR_VALIDATE, $error);
-                    $valid = false;
-                    break;
-                }
-            }
-        }
-
-        // allow plugins to do contact validation and auto-fixing
-        $plugin = $rcube->plugins->exec_hook('contact_validate', array(
-            'record'  => $save_data,
-            'autofix' => $autofix,
-            'valid'   => $valid,
-        ));
-
-        if ($valid && !$plugin['valid']) {
-            $this->set_error(self::ERROR_VALIDATE, $plugin['error']);
-        }
-
-        if (is_array($plugin['record'])) {
-            $save_data = $plugin['record'];
-        }
-
-        return $plugin['valid'];
-    }
-
-    /**
-     * Create a new contact record
-     *
-     * @param array Assoziative array with save data
-     *  Keys:   Field name with optional section in the form FIELD:SECTION
-     *  Values: Field value. Can be either a string or an array of strings for multiple values
-     * @param boolean True to check for duplicates first
-     * @return mixed The created record ID on success, False on error
-     */
-    function insert($save_data, $check=false)
-    {
-        /* empty for read-only address books */
-    }
-
-    /**
-     * Create new contact records for every item in the record set
-     *
-     * @param object rcube_result_set Recordset to insert
-     * @param boolean True to check for duplicates first
-     * @return array List of created record IDs
-     */
-    function insertMultiple($recset, $check=false)
-    {
-        $ids = array();
-        if (is_object($recset) && is_a($recset, rcube_result_set)) {
-            while ($row = $recset->next()) {
-                if ($insert = $this->insert($row, $check))
-                    $ids[] = $insert;
-            }
-        }
-        return $ids;
-    }
-
-    /**
-     * Update a specific contact record
-     *
-     * @param mixed Record identifier
-     * @param array Assoziative array with save data
-     *  Keys:   Field name with optional section in the form FIELD:SECTION
-     *  Values: Field value. Can be either a string or an array of strings for multiple values
-     * @return boolean True on success, False on error
-     */
-    function update($id, $save_cols)
-    {
-        /* empty for read-only address books */
-    }
-
-    /**
-     * Mark one or more contact records as deleted
-     *
-     * @param array  Record identifiers
-     * @param bool   Remove records irreversible (see self::undelete)
-     */
-    function delete($ids, $force=true)
-    {
-        /* empty for read-only address books */
-    }
-
-    /**
-     * Unmark delete flag on contact record(s)
-     *
-     * @param array  Record identifiers
-     */
-    function undelete($ids)
-    {
-        /* empty for read-only address books */
-    }
-
-    /**
-     * Mark all records in database as deleted
-     */
-    function delete_all()
-    {
-        /* empty for read-only address books */
-    }
-
-    /**
-     * Setter for the current group
-     * (empty, has to be re-implemented by extending class)
-     */
-    function set_group($gid) { }
-
-    /**
-     * List all active contact groups of this source
-     *
-     * @param string  Optional search string to match group name
-     * @param int     Matching mode:
-     *                0 - partial (*abc*),
-     *                1 - strict (=),
-     *                2 - prefix (abc*)
-     *
-     * @return array  Indexed list of contact groups, each a hash array
-     */
-    function list_groups($search = null, $mode = 0)
-    {
-        /* empty for address books don't supporting groups */
-        return array();
-    }
-
-    /**
-     * Get group properties such as name and email address(es)
-     *
-     * @param string Group identifier
-     * @return array Group properties as hash array
-     */
-    function get_group($group_id)
-    {
-        /* empty for address books don't supporting groups */
-        return null;
-    }
-
-    /**
-     * Create a contact group with the given name
-     *
-     * @param string The group name
-     * @return mixed False on error, array with record props in success
-     */
-    function create_group($name)
-    {
-        /* empty for address books don't supporting groups */
-        return false;
-    }
-
-    /**
-     * Delete the given group and all linked group members
-     *
-     * @param string Group identifier
-     * @return boolean True on success, false if no data was changed
-     */
-    function delete_group($gid)
-    {
-        /* empty for address books don't supporting groups */
-        return false;
-    }
-
-    /**
-     * Rename a specific contact group
-     *
-     * @param string Group identifier
-     * @param string New name to set for this group
-     * @param string New group identifier (if changed, otherwise don't set)
-     * @return boolean New name on success, false if no data was changed
-     */
-    function rename_group($gid, $newname, &$newid)
-    {
-        /* empty for address books don't supporting groups */
-        return false;
-    }
-
-    /**
-     * Add the given contact records the a certain group
-     *
-     * @param string       Group identifier
-     * @param array|string List of contact identifiers to be added
-     *
-     * @return int Number of contacts added
-     */
-    function add_to_group($group_id, $ids)
-    {
-        /* empty for address books don't supporting groups */
-        return 0;
-    }
-
-    /**
-     * Remove the given contact records from a certain group
-     *
-     * @param string       Group identifier
-     * @param array|string List of contact identifiers to be removed
-     *
-     * @return int Number of deleted group members
-     */
-    function remove_from_group($group_id, $ids)
-    {
-        /* empty for address books don't supporting groups */
-        return 0;
-    }
-
-    /**
-     * Get group assignments of a specific contact record
-     *
-     * @param mixed Record identifier
-     *
-     * @return array List of assigned groups as ID=>Name pairs
-     * @since 0.5-beta
-     */
-    function get_record_groups($id)
-    {
-        /* empty for address books don't supporting groups */
-        return array();
-    }
-
-    /**
-     * Utility function to return all values of a certain data column
-     * either as flat list or grouped by subtype
-     *
-     * @param string Col name
-     * @param array  Record data array as used for saving
-     * @param boolean True to return one array with all values, False for hash array with values grouped by type
-     * @return array List of column values
-     */
-    public static function get_col_values($col, $data, $flat = false)
-    {
-        $out = array();
-        foreach ((array)$data as $c => $values) {
-            if ($c === $col || strpos($c, $col.':') === 0) {
-                if ($flat) {
-                    $out = array_merge($out, (array)$values);
-                }
-                else {
-                    list(, $type) = explode(':', $c);
-                    $out[$type] = array_merge((array)$out[$type], (array)$values);
-                }
-            }
-        }
-
-        // remove duplicates
-        if ($flat && !empty($out)) {
-            $out = array_unique($out);
-        }
-
-        return $out;
-    }
-
-    /**
-     * Normalize the given string for fulltext search.
-     * Currently only optimized for Latin-1 characters; to be extended
-     *
-     * @param string Input string (UTF-8)
-     * @return string Normalized string
-     * @deprecated since 0.9-beta
-     */
-    protected static function normalize_string($str)
-    {
-        return rcube_utils::normalize_string($str);
-    }
-
-    /**
-     * Compose a valid display name from the given structured contact data
-     *
-     * @param array  Hash array with contact data as key-value pairs
-     * @param bool   Don't attempt to extract components from the email address
-     *
-     * @return string Display name
-     */
-    public static function compose_display_name($contact, $full_email = false)
-    {
-        $contact = rcube::get_instance()->plugins->exec_hook('contact_displayname', $contact);
-        $fn = $contact['name'];
-
-        if (!$fn)  // default display name composition according to vcard standard
-            $fn = trim(join(' ', array_filter(array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix']))));
-
-        // use email address part for name
-        $email = self::get_col_values('email', $contact, true);
-        $email = $email[0];
-
-        if ($email && (empty($fn) || $fn == $email)) {
-            // return full email
-            if ($full_email)
-                return $email;
-
-            list($emailname) = explode('@', $email);
-            if (preg_match('/(.*)[\.\-\_](.*)/', $emailname, $match))
-                $fn = trim(ucfirst($match[1]).' '.ucfirst($match[2]));
-            else
-                $fn = ucfirst($emailname);
-        }
-
-        return $fn;
-    }
-
-    /**
-     * Compose the name to display in the contacts list for the given contact record.
-     * This respects the settings parameter how to list conacts.
-     *
-     * @param array  Hash array with contact data as key-value pairs
-     * @return string List name
-     */
-    public static function compose_list_name($contact)
-    {
-        static $compose_mode;
-
-        if (!isset($compose_mode))  // cache this
-            $compose_mode = rcube::get_instance()->config->get('addressbook_name_listing', 0);
-
-        if ($compose_mode == 3)
-            $fn = join(' ', array($contact['surname'] . ',', $contact['firstname'], $contact['middlename']));
-        else if ($compose_mode == 2)
-            $fn = join(' ', array($contact['surname'], $contact['firstname'], $contact['middlename']));
-        else if ($compose_mode == 1)
-            $fn = join(' ', array($contact['firstname'], $contact['middlename'], $contact['surname']));
-        else if ($compose_mode == 0)
-            $fn = !empty($contact['name']) ? $contact['name'] : join(' ', array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix']));
-        else {
-            $plugin = rcube::get_instance()->plugins->exec_hook('contact_listname', array('contact' => $contact));
-            $fn     = $plugin['fn'];
-        }
-
-        $fn = trim($fn, ', ');
-
-        // fallback to display name
-        if (empty($fn) && $contact['name'])
-            $fn = $contact['name'];
-
-        // fallback to email address
-        if (empty($fn) && ($email = self::get_col_values('email', $contact, true)) && !empty($email)) {
-            return $email[0];
-        }
-
-        return $fn;
-    }
-
-    /**
-     * Create a unique key for sorting contacts
-     */
-    public static function compose_contact_key($contact, $sort_col)
-    {
-        $key = $contact[$sort_col] . ':' . $contact['sourceid'];
-
-        // add email to a key to not skip contacts with the same name (#1488375)
-        if (($email = self::get_col_values('email', $contact, true)) && !empty($email)) {
-            $key .= ':' . implode(':', (array)$email);
-        }
-
-        return $key;
-    }
-
-    /**
-     * Compare search value with contact data
-     *
-     * @param string       $colname Data name
-     * @param string|array $value   Data value
-     * @param string       $search  Search value
-     * @param int          $mode    Search mode
-     *
-     * @return bool Comparision result
-     */
-    protected function compare_search_value($colname, $value, $search, $mode)
-    {
-        // The value is a date string, for date we'll
-        // use only strict comparison (mode = 1)
-        // @TODO: partial search, e.g. match only day and month
-        if (in_array($colname, $this->date_cols)) {
-            return (($value = rcube_utils::anytodatetime($value))
-                && ($search = rcube_utils::anytodatetime($search))
-                && $value->format('Ymd') == $search->format('Ymd'));
-        }
-
-        // composite field, e.g. address
-        foreach ((array)$value as $val) {
-            $val = mb_strtolower($val);
-            switch ($mode) {
-            case 1:
-                $got = ($val == $search);
-                break;
-
-            case 2:
-                $got = ($search == substr($val, 0, strlen($search)));
-                break;
-
-            default:
-                $got = (strpos($val, $search) !== false);
-            }
-
-            if ($got) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-}
-
diff --git a/lib/ext/Roundcube/rcube_base_replacer.php b/lib/ext/Roundcube/rcube_base_replacer.php
deleted file mode 100644
index fa67647..0000000
--- a/lib/ext/Roundcube/rcube_base_replacer.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Provide basic functions for base URL replacement                    |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Helper class to turn relative urls into absolute ones
- * using a predefined base
- *
- * @package    Framework
- * @subpackage Utils
- * @author     Thomas Bruederli <roundcube@gmail.com>
- */
-class rcube_base_replacer
-{
-    private $base_url;
-
-
-    public function __construct($base)
-    {
-        $this->base_url = $base;
-    }
-
-
-    public function callback($matches)
-    {
-        return $matches[1] . '="' . self::absolute_url($matches[3], $this->base_url) . '"';
-    }
-
-
-    public function replace($body)
-    {
-        return preg_replace_callback(array(
-            '/(src|background|href)=(["\']?)([^"\'\s>]+)(\2|\s|>)/i',
-            '/(url\s*\()(["\']?)([^"\'\)\s]+)(\2)\)/i',
-        ),
-        array($this, 'callback'), $body);
-    }
-
-
-    /**
-     * Convert paths like ../xxx to an absolute path using a base url
-     *
-     * @param string $path     Relative path
-     * @param string $base_url Base URL
-     *
-     * @return string Absolute URL
-     */
-    public static function absolute_url($path, $base_url)
-    {
-        $host_url = $base_url;
-        $abs_path = $path;
-
-        // check if path is an absolute URL
-        if (preg_match('/^[fhtps]+:\/\//', $path)) {
-            return $path;
-        }
-
-        // check if path is a content-id scheme
-        if (strpos($path, 'cid:') === 0) {
-            return $path;
-        }
-
-        // cut base_url to the last directory
-        if (strrpos($base_url, '/') > 7) {
-            $host_url = substr($base_url, 0, strpos($base_url, '/', 7));
-            $base_url = substr($base_url, 0, strrpos($base_url, '/'));
-        }
-
-        // $path is absolute
-        if ($path[0] == '/') {
-            $abs_path = $host_url.$path;
-        }
-        else {
-            // strip './' because its the same as ''
-            $path = preg_replace('/^\.\//', '', $path);
-
-            if (preg_match_all('/\.\.\//', $path, $matches, PREG_SET_ORDER)) {
-                foreach ($matches as $a_match) {
-                    if ($pos = strrpos($base_url, '/')) {
-                        $base_url = substr($base_url, 0, $pos);
-                    }
-                    $path = substr($path, 3);
-                }
-            }
-
-            $abs_path = $base_url.'/'.$path;
-        }
-
-        return $abs_path;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_browser.php b/lib/ext/Roundcube/rcube_browser.php
deleted file mode 100644
index e53e312..0000000
--- a/lib/ext/Roundcube/rcube_browser.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2007-2009, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Class representing the client browser's properties                  |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Provide details about the client's browser based on the User-Agent header
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_browser
-{
-    function __construct()
-    {
-        $HTTP_USER_AGENT = strtolower($_SERVER['HTTP_USER_AGENT']);
-
-        $this->ver   = 0;
-        $this->win   = strpos($HTTP_USER_AGENT, 'win') != false;
-        $this->mac   = strpos($HTTP_USER_AGENT, 'mac') != false;
-        $this->linux = strpos($HTTP_USER_AGENT, 'linux') != false;
-        $this->unix  = strpos($HTTP_USER_AGENT, 'unix') != false;
-
-        $this->opera  = strpos($HTTP_USER_AGENT, 'opera') !== false;
-        $this->ns     = strpos($HTTP_USER_AGENT, 'netscape') !== false;
-        $this->chrome = strpos($HTTP_USER_AGENT, 'chrome') !== false;
-        $this->ie     = !$this->opera && (strpos($HTTP_USER_AGENT, 'compatible; msie') !== false || strpos($HTTP_USER_AGENT, 'trident/') !== false);
-        $this->safari = !$this->chrome && (strpos($HTTP_USER_AGENT, 'safari') !== false || strpos($HTTP_USER_AGENT, 'applewebkit') !== false);
-        $this->mz     = !$this->ie && !$this->safari && !$this->chrome && !$this->ns && strpos($HTTP_USER_AGENT, 'mozilla') !== false;
-
-        if (preg_match('/(chrome|msie|opera|version|khtml)(\s*|\/)([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
-            $this->ver = (float) $regs[3];
-        }
-        else if (preg_match('/rv:([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
-            $this->ver = (float) $regs[1];
-        }
-
-        if (preg_match('/ ([a-z]{2})-([a-z]{2})/', $HTTP_USER_AGENT, $regs))
-            $this->lang =  $regs[1];
-        else
-            $this->lang =  'en';
-
-        $this->dom      = $this->mz || $this->safari || ($this->ie && $this->ver>=5) || ($this->opera && $this->ver>=7);
-        $this->pngalpha = $this->mz || $this->safari || ($this->ie && $this->ver>=5.5) ||
-            ($this->ie && $this->ver>=5 && $this->mac) || ($this->opera && $this->ver>=7) ? true : false;
-        $this->imgdata  = !$this->ie;
-    }
-}
-
diff --git a/lib/ext/Roundcube/rcube_cache.php b/lib/ext/Roundcube/rcube_cache.php
deleted file mode 100644
index a708cb2..0000000
--- a/lib/ext/Roundcube/rcube_cache.php
+++ /dev/null
@@ -1,594 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011, The Roundcube Dev Team                            |
- | Copyright (C) 2011, Kolab Systems AG                                  |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Caching engine                                                      |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-
-/**
- * Interface class for accessing Roundcube cache
- *
- * @package    Framework
- * @subpackage Cache
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- */
-class rcube_cache
-{
-    /**
-     * Instance of database handler
-     *
-     * @var rcube_db|Memcache|bool
-     */
-    private $db;
-    private $type;
-    private $userid;
-    private $prefix;
-    private $table;
-    private $ttl;
-    private $packed;
-    private $index;
-    private $cache         = array();
-    private $cache_changes = array();
-    private $cache_sums    = array();
-
-
-    /**
-     * Object constructor.
-     *
-     * @param string $type   Engine type ('db' or 'memcache' or 'apc')
-     * @param int    $userid User identifier
-     * @param string $prefix Key name prefix
-     * @param string $ttl    Expiration time of memcache/apc items
-     * @param bool   $packed Enables/disabled data serialization.
-     *                       It's possible to disable data serialization if you're sure
-     *                       stored data will be always a safe string
-     */
-    function __construct($type, $userid, $prefix='', $ttl=0, $packed=true)
-    {
-        $rcube = rcube::get_instance();
-        $type  = strtolower($type);
-
-        if ($type == 'memcache') {
-            $this->type = 'memcache';
-            $this->db   = $rcube->get_memcache();
-        }
-        else if ($type == 'apc') {
-            $this->type = 'apc';
-            $this->db   = function_exists('apc_exists'); // APC 3.1.4 required
-        }
-        else {
-            $this->type  = 'db';
-            $this->db    = $rcube->get_dbh();
-            $this->table = $this->db->table_name('cache');
-        }
-
-        // convert ttl string to seconds
-        $ttl = get_offset_sec($ttl);
-        if ($ttl > 2592000) $ttl = 2592000;
-
-        $this->userid    = (int) $userid;
-        $this->ttl       = $ttl;
-        $this->packed    = $packed;
-        $this->prefix    = $prefix;
-    }
-
-
-    /**
-     * Returns cached value.
-     *
-     * @param string $key Cache key name
-     *
-     * @return mixed Cached value
-     */
-    function get($key)
-    {
-        if (!array_key_exists($key, $this->cache)) {
-            return $this->read_record($key);
-        }
-
-        return $this->cache[$key];
-    }
-
-
-    /**
-     * Sets (add/update) value in cache.
-     *
-     * @param string $key  Cache key name
-     * @param mixed  $data Cache data
-     */
-    function set($key, $data)
-    {
-        $this->cache[$key]         = $data;
-        $this->cache_changed       = true;
-        $this->cache_changes[$key] = true;
-    }
-
-
-    /**
-     * Returns cached value without storing it in internal memory.
-     *
-     * @param string $key Cache key name
-     *
-     * @return mixed Cached value
-     */
-    function read($key)
-    {
-        if (array_key_exists($key, $this->cache)) {
-            return $this->cache[$key];
-        }
-
-        return $this->read_record($key, true);
-    }
-
-
-    /**
-     * Sets (add/update) value in cache and immediately saves
-     * it in the backend, no internal memory will be used.
-     *
-     * @param string $key  Cache key name
-     * @param mixed  $data Cache data
-     *
-     * @param boolean True on success, False on failure
-     */
-    function write($key, $data)
-    {
-        return $this->write_record($key, $this->serialize($data));
-    }
-
-
-    /**
-     * Clears the cache.
-     *
-     * @param string  $key         Cache key name or pattern
-     * @param boolean $prefix_mode Enable it to clear all keys starting
-     *                             with prefix specified in $key
-     */
-    function remove($key=null, $prefix_mode=false)
-    {
-        // Remove all keys
-        if ($key === null) {
-            $this->cache         = array();
-            $this->cache_changed = false;
-            $this->cache_changes = array();
-            $this->cache_sums    = array();
-        }
-        // Remove keys by name prefix
-        else if ($prefix_mode) {
-            foreach (array_keys($this->cache) as $k) {
-                if (strpos($k, $key) === 0) {
-                    $this->cache[$k] = null;
-                    $this->cache_changes[$k] = false;
-                    unset($this->cache_sums[$k]);
-                }
-            }
-        }
-        // Remove one key by name
-        else {
-            $this->cache[$key] = null;
-            $this->cache_changes[$key] = false;
-            unset($this->cache_sums[$key]);
-        }
-
-        // Remove record(s) from the backend
-        $this->remove_record($key, $prefix_mode);
-    }
-
-
-    /**
-     * Remove cache records older than ttl
-     */
-    function expunge()
-    {
-        if ($this->type == 'db' && $this->db && $this->ttl) {
-            $this->db->query(
-                "DELETE FROM ".$this->table.
-                " WHERE user_id = ?".
-                " AND cache_key LIKE ?".
-                " AND expires < " . $this->db->now(),
-                $this->userid,
-                $this->prefix.'.%');
-        }
-    }
-
-
-    /**
-     * Remove expired records of all caches
-     */
-    static function gc()
-    {
-        $rcube = rcube::get_instance();
-        $db    = $rcube->get_dbh();
-
-        $db->query("DELETE FROM " . $db->table_name('cache') . " WHERE expires < " . $db->now());
-    }
-
-
-    /**
-     * Writes the cache back to the DB.
-     */
-    function close()
-    {
-        if (!$this->cache_changed) {
-            return;
-        }
-
-        foreach ($this->cache as $key => $data) {
-            // The key has been used
-            if ($this->cache_changes[$key]) {
-                // Make sure we're not going to write unchanged data
-                // by comparing current md5 sum with the sum calculated on DB read
-                $data = $this->serialize($data);
-
-                if (!$this->cache_sums[$key] || $this->cache_sums[$key] != md5($data)) {
-                    $this->write_record($key, $data);
-                }
-            }
-        }
-
-        $this->write_index();
-    }
-
-
-    /**
-     * Reads cache entry.
-     *
-     * @param string  $key     Cache key name
-     * @param boolean $nostore Enable to skip in-memory store
-     *
-     * @return mixed Cached value
-     */
-    private function read_record($key, $nostore=false)
-    {
-        if (!$this->db) {
-            return null;
-        }
-
-        if ($this->type != 'db') {
-            if ($this->type == 'memcache') {
-                $data = $this->db->get($this->ckey($key));
-            }
-            else if ($this->type == 'apc') {
-                $data = apc_fetch($this->ckey($key));
-            }
-
-            if ($data) {
-                $md5sum = md5($data);
-                $data   = $this->unserialize($data);
-
-                if ($nostore) {
-                    return $data;
-                }
-
-                $this->cache_sums[$key] = $md5sum;
-                $this->cache[$key]      = $data;
-            }
-            else {
-                $this->cache[$key] = null;
-            }
-        }
-        else {
-            $sql_result = $this->db->limitquery(
-                "SELECT data, cache_key".
-                " FROM " . $this->table.
-                " WHERE user_id = ?".
-                " AND cache_key = ?".
-                // for better performance we allow more records for one key
-                // get the newer one
-                " ORDER BY created DESC",
-                0, 1, $this->userid, $this->prefix.'.'.$key);
-
-            if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                $key = substr($sql_arr['cache_key'], strlen($this->prefix)+1);
-                $md5sum = $sql_arr['data'] ? md5($sql_arr['data']) : null;
-                if ($sql_arr['data']) {
-                    $data = $this->unserialize($sql_arr['data']);
-                }
-
-                if ($nostore) {
-                    return $data;
-                }
-
-                $this->cache[$key]      = $data;
-                $this->cache_sums[$key] = $md5sum;
-            }
-            else {
-                $this->cache[$key] = null;
-            }
-        }
-
-        return $this->cache[$key];
-    }
-
-
-    /**
-     * Writes single cache record into DB.
-     *
-     * @param string $key  Cache key name
-     * @param mxied  $data Serialized cache data 
-     *
-     * @param boolean True on success, False on failure
-     */
-    private function write_record($key, $data)
-    {
-        if (!$this->db) {
-            return false;
-        }
-
-        if ($this->type == 'memcache' || $this->type == 'apc') {
-            return $this->add_record($this->ckey($key), $data);
-        }
-
-        $key_exists = array_key_exists($key, $this->cache_sums);
-        $key        = $this->prefix . '.' . $key;
-
-        // Remove NULL rows (here we don't need to check if the record exist)
-        if ($data == 'N;') {
-            $this->db->query(
-                "DELETE FROM " . $this->table.
-                " WHERE user_id = ?".
-                " AND cache_key = ?",
-                $this->userid, $key);
-
-            return true;
-        }
-
-        // update existing cache record
-        if ($key_exists) {
-            $result = $this->db->query(
-                "UPDATE " . $this->table.
-                " SET created = " . $this->db->now().
-                    ", expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL').
-                    ", data = ?".
-                " WHERE user_id = ?".
-                " AND cache_key = ?",
-                $data, $this->userid, $key);
-        }
-        // add new cache record
-        else {
-            // for better performance we allow more records for one key
-            // so, no need to check if record exist (see rcube_cache::read_record())
-            $result = $this->db->query(
-                "INSERT INTO " . $this->table.
-                " (created, expires, user_id, cache_key, data)".
-                " VALUES (" . $this->db->now() . ", " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL') . ", ?, ?, ?)",
-                $this->userid, $key, $data);
-        }
-
-        return $this->db->affected_rows($result);
-    }
-
-
-    /**
-     * Deletes the cache record(s).
-     *
-     * @param string  $key         Cache key name or pattern
-     * @param boolean $prefix_mode Enable it to clear all keys starting
-     *                             with prefix specified in $key
-     */
-    private function remove_record($key=null, $prefix_mode=false)
-    {
-        if (!$this->db) {
-            return;
-        }
-
-        if ($this->type != 'db') {
-            $this->load_index();
-
-            // Remove all keys
-            if ($key === null) {
-                foreach ($this->index as $key) {
-                    $this->delete_record($key, false);
-                }
-                $this->index = array();
-            }
-            // Remove keys by name prefix
-            else if ($prefix_mode) {
-                foreach ($this->index as $k) {
-                    if (strpos($k, $key) === 0) {
-                        $this->delete_record($k);
-                    }
-                }
-            }
-            // Remove one key by name
-            else {
-                $this->delete_record($key);
-            }
-
-            return;
-        }
-
-        // Remove all keys (in specified cache)
-        if ($key === null) {
-            $where = " AND cache_key LIKE " . $this->db->quote($this->prefix.'.%');
-        }
-        // Remove keys by name prefix
-        else if ($prefix_mode) {
-            $where = " AND cache_key LIKE " . $this->db->quote($this->prefix.'.'.$key.'%');
-        }
-        // Remove one key by name
-        else {
-            $where = " AND cache_key = " . $this->db->quote($this->prefix.'.'.$key);
-        }
-
-        $this->db->query(
-            "DELETE FROM " . $this->table.
-            " WHERE user_id = ?" . $where,
-            $this->userid);
-    }
-
-
-    /**
-     * Adds entry into memcache/apc DB.
-     *
-     * @param string  $key   Cache key name
-     * @param mxied   $data  Serialized cache data
-     * @param bollean $index Enables immediate index update
-     *
-     * @param boolean True on success, False on failure
-     */
-    private function add_record($key, $data, $index=false)
-    {
-        if ($this->type == 'memcache') {
-            $result = $this->db->replace($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
-            if (!$result)
-                $result = $this->db->set($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
-        }
-        else if ($this->type == 'apc') {
-            if (apc_exists($key))
-                apc_delete($key);
-            $result = apc_store($key, $data, $this->ttl);
-        }
-
-        // Update index
-        if ($index && $result) {
-            $this->load_index();
-
-            if (array_search($key, $this->index) === false) {
-                $this->index[] = $key;
-                $data = serialize($this->index);
-                $this->add_record($this->ikey(), $data);
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Deletes entry from memcache/apc DB.
-     */
-    private function delete_record($key, $index=true)
-    {
-        if ($this->type == 'memcache') {
-            // #1488592: use 2nd argument
-            $this->db->delete($this->ckey($key), 0);
-        }
-        else {
-            apc_delete($this->ckey($key));
-        }
-
-        if ($index) {
-            if (($idx = array_search($key, $this->index)) !== false) {
-                unset($this->index[$idx]);
-            }
-        }
-    }
-
-
-    /**
-     * Writes the index entry into memcache/apc DB.
-     */
-    private function write_index()
-    {
-        if (!$this->db) {
-            return;
-        }
-
-        if ($this->type == 'db') {
-            return;
-        }
-
-        $this->load_index();
-
-        // Make sure index contains new keys
-        foreach ($this->cache as $key => $value) {
-            if ($value !== null) {
-                if (array_search($key, $this->index) === false) {
-                    $this->index[] = $key;
-                }
-            }
-        }
-
-        $data = serialize($this->index);
-        $this->add_record($this->ikey(), $data);
-    }
-
-
-    /**
-     * Gets the index entry from memcache/apc DB.
-     */
-    private function load_index()
-    {
-        if (!$this->db) {
-            return;
-        }
-
-        if ($this->index !== null) {
-            return;
-        }
-
-        $index_key = $this->ikey();
-        if ($this->type == 'memcache') {
-            $data = $this->db->get($index_key);
-        }
-        else if ($this->type == 'apc') {
-            $data = apc_fetch($index_key);
-        }
-
-        $this->index = $data ? unserialize($data) : array();
-    }
-
-
-    /**
-     * Creates per-user cache key name (for memcache and apc)
-     *
-     * @param string $key Cache key name
-     *
-     * @return string Cache key
-     */
-    private function ckey($key)
-    {
-        return sprintf('%d:%s:%s', $this->userid, $this->prefix, $key);
-    }
-
-
-    /**
-     * Creates per-user index cache key name (for memcache and apc)
-     *
-     * @return string Cache key
-     */
-    private function ikey()
-    {
-        // This way each cache will have its own index
-        return sprintf('%d:%s%s', $this->userid, $this->prefix, 'INDEX');
-    }
-
-    /**
-     * Serializes data for storing
-     */
-    private function serialize($data)
-    {
-        if ($this->type == 'db') {
-            return $this->db->encode($data, $this->packed);
-        }
-
-        return $this->packed ? serialize($data) : $data;
-    }
-
-    /**
-     * Unserializes serialized data
-     */
-    private function unserialize($data)
-    {
-        if ($this->type == 'db') {
-            return $this->db->decode($data, $this->packed);
-        }
-
-        return $this->packed ? @unserialize($data) : $data;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_cache_shared.php b/lib/ext/Roundcube/rcube_cache_shared.php
deleted file mode 100644
index 8f25740..0000000
--- a/lib/ext/Roundcube/rcube_cache_shared.php
+++ /dev/null
@@ -1,581 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011-2013, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2013, Kolab Systems AG                             |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Shared (cross-user) caching engine                                  |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-
-/**
- * Interface class for accessing Roundcube shared cache
- *
- * @package    Framework
- * @subpackage Cache
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- */
-class rcube_cache_shared
-{
-    /**
-     * Instance of database handler
-     *
-     * @var rcube_db|Memcache|bool
-     */
-    private $db;
-    private $type;
-    private $prefix;
-    private $ttl;
-    private $packed;
-    private $index;
-    private $table;
-    private $cache         = array();
-    private $cache_changes = array();
-    private $cache_sums    = array();
-
-
-    /**
-     * Object constructor.
-     *
-     * @param string $type   Engine type ('db' or 'memcache' or 'apc')
-     * @param string $prefix Key name prefix
-     * @param string $ttl    Expiration time of memcache/apc items
-     * @param bool   $packed Enables/disabled data serialization.
-     *                       It's possible to disable data serialization if you're sure
-     *                       stored data will be always a safe string
-     */
-    function __construct($type, $prefix='', $ttl=0, $packed=true)
-    {
-        $rcube = rcube::get_instance();
-        $type  = strtolower($type);
-
-        if ($type == 'memcache') {
-            $this->type = 'memcache';
-            $this->db   = $rcube->get_memcache();
-        }
-        else if ($type == 'apc') {
-            $this->type = 'apc';
-            $this->db   = function_exists('apc_exists'); // APC 3.1.4 required
-        }
-        else {
-            $this->type  = 'db';
-            $this->db    = $rcube->get_dbh();
-            $this->table = $this->db->table_name('cache_shared');
-        }
-
-        // convert ttl string to seconds
-        $ttl = get_offset_sec($ttl);
-        if ($ttl > 2592000) $ttl = 2592000;
-
-        $this->ttl       = $ttl;
-        $this->packed    = $packed;
-        $this->prefix    = $prefix;
-    }
-
-
-    /**
-     * Returns cached value.
-     *
-     * @param string $key Cache key name
-     *
-     * @return mixed Cached value
-     */
-    function get($key)
-    {
-        if (!array_key_exists($key, $this->cache)) {
-            return $this->read_record($key);
-        }
-
-        return $this->cache[$key];
-    }
-
-
-    /**
-     * Sets (add/update) value in cache.
-     *
-     * @param string $key  Cache key name
-     * @param mixed  $data Cache data
-     */
-    function set($key, $data)
-    {
-        $this->cache[$key]         = $data;
-        $this->cache_changed       = true;
-        $this->cache_changes[$key] = true;
-    }
-
-
-    /**
-     * Returns cached value without storing it in internal memory.
-     *
-     * @param string $key Cache key name
-     *
-     * @return mixed Cached value
-     */
-    function read($key)
-    {
-        if (array_key_exists($key, $this->cache)) {
-            return $this->cache[$key];
-        }
-
-        return $this->read_record($key, true);
-    }
-
-
-    /**
-     * Sets (add/update) value in cache and immediately saves
-     * it in the backend, no internal memory will be used.
-     *
-     * @param string $key  Cache key name
-     * @param mixed  $data Cache data
-     *
-     * @param boolean True on success, False on failure
-     */
-    function write($key, $data)
-    {
-        return $this->write_record($key, $this->serialize($data));
-    }
-
-
-    /**
-     * Clears the cache.
-     *
-     * @param string  $key         Cache key name or pattern
-     * @param boolean $prefix_mode Enable it to clear all keys starting
-     *                             with prefix specified in $key
-     */
-    function remove($key=null, $prefix_mode=false)
-    {
-        // Remove all keys
-        if ($key === null) {
-            $this->cache         = array();
-            $this->cache_changed = false;
-            $this->cache_changes = array();
-            $this->cache_sums    = array();
-        }
-        // Remove keys by name prefix
-        else if ($prefix_mode) {
-            foreach (array_keys($this->cache) as $k) {
-                if (strpos($k, $key) === 0) {
-                    $this->cache[$k] = null;
-                    $this->cache_changes[$k] = false;
-                    unset($this->cache_sums[$k]);
-                }
-            }
-        }
-        // Remove one key by name
-        else {
-            $this->cache[$key] = null;
-            $this->cache_changes[$key] = false;
-            unset($this->cache_sums[$key]);
-        }
-
-        // Remove record(s) from the backend
-        $this->remove_record($key, $prefix_mode);
-    }
-
-
-    /**
-     * Remove cache records older than ttl
-     */
-    function expunge()
-    {
-        if ($this->type == 'db' && $this->db && $this->ttl) {
-            $this->db->query(
-                "DELETE FROM " . $this->table
-                . " WHERE cache_key LIKE ?"
-                . " AND expires < " . $this->db->now(),
-                $this->prefix . '.%');
-        }
-    }
-
-
-    /**
-     * Remove expired records of all caches
-     */
-    static function gc()
-    {
-        $rcube = rcube::get_instance();
-        $db    = $rcube->get_dbh();
-
-        $db->query("DELETE FROM " . $db->table_name('cache_shared') . " WHERE expires < " . $db->now());
-    }
-
-
-    /**
-     * Writes the cache back to the DB.
-     */
-    function close()
-    {
-        if (!$this->cache_changed) {
-            return;
-        }
-
-        foreach ($this->cache as $key => $data) {
-            // The key has been used
-            if ($this->cache_changes[$key]) {
-                // Make sure we're not going to write unchanged data
-                // by comparing current md5 sum with the sum calculated on DB read
-                $data = $this->serialize($data);
-
-                if (!$this->cache_sums[$key] || $this->cache_sums[$key] != md5($data)) {
-                    $this->write_record($key, $data);
-                }
-            }
-        }
-
-        $this->write_index();
-    }
-
-
-    /**
-     * Reads cache entry.
-     *
-     * @param string  $key     Cache key name
-     * @param boolean $nostore Enable to skip in-memory store
-     *
-     * @return mixed Cached value
-     */
-    private function read_record($key, $nostore=false)
-    {
-        if (!$this->db) {
-            return null;
-        }
-
-        if ($this->type != 'db') {
-            if ($this->type == 'memcache') {
-                $data = $this->db->get($this->ckey($key));
-            }
-            else if ($this->type == 'apc') {
-                $data = apc_fetch($this->ckey($key));
-            }
-
-            if ($data) {
-                $md5sum = md5($data);
-                $data   = $this->unserialize($data);
-
-                if ($nostore) {
-                    return $data;
-                }
-
-                $this->cache_sums[$key] = $md5sum;
-                $this->cache[$key]      = $data;
-            }
-            else {
-                $this->cache[$key] = null;
-            }
-        }
-        else {
-            $sql_result = $this->db->limitquery(
-                "SELECT data, cache_key".
-                " FROM " . $this->table .
-                " WHERE cache_key = ?".
-                // for better performance we allow more records for one key
-                // get the newer one
-                " ORDER BY created DESC",
-                0, 1, $this->prefix . '.' . $key);
-
-            if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                $md5sum = $sql_arr['data'] ? md5($sql_arr['data']) : null;
-                if ($sql_arr['data']) {
-                    $data = $this->unserialize($sql_arr['data']);
-                }
-
-                if ($nostore) {
-                    return $data;
-                }
-
-                $this->cache[$key]      = $data;
-                $this->cache_sums[$key] = $md5sum;
-            }
-            else {
-                $this->cache[$key] = null;
-            }
-        }
-
-        return $this->cache[$key];
-    }
-
-
-    /**
-     * Writes single cache record into DB.
-     *
-     * @param string $key  Cache key name
-     * @param mxied  $data Serialized cache data 
-     *
-     * @param boolean True on success, False on failure
-     */
-    private function write_record($key, $data)
-    {
-        if (!$this->db) {
-            return false;
-        }
-
-        if ($this->type == 'memcache' || $this->type == 'apc') {
-            return $this->add_record($this->ckey($key), $data);
-        }
-
-        $key_exists = array_key_exists($key, $this->cache_sums);
-        $key        = $this->prefix . '.' . $key;
-
-        // Remove NULL rows (here we don't need to check if the record exist)
-        if ($data == 'N;') {
-            $this->db->query("DELETE FROM " . $this->table . " WHERE cache_key = ?", $key);
-            return true;
-        }
-
-        // update existing cache record
-        if ($key_exists) {
-            $result = $this->db->query(
-                "UPDATE " . $this->table .
-                " SET created = " . $this->db->now() .
-                    ", expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL') .
-                    ", data = ?".
-                " WHERE cache_key = ?",
-                $data, $key);
-        }
-        // add new cache record
-        else {
-            // for better performance we allow more records for one key
-            // so, no need to check if record exist (see rcube_cache::read_record())
-            $result = $this->db->query(
-                "INSERT INTO ".$this->table.
-                " (created, expires, cache_key, data)".
-                " VALUES (".$this->db->now().", " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL') . ", ?, ?)",
-                $key, $data);
-        }
-
-        return $this->db->affected_rows($result);
-    }
-
-
-    /**
-     * Deletes the cache record(s).
-     *
-     * @param string  $key         Cache key name or pattern
-     * @param boolean $prefix_mode Enable it to clear all keys starting
-     *                             with prefix specified in $key
-     */
-    private function remove_record($key=null, $prefix_mode=false)
-    {
-        if (!$this->db) {
-            return;
-        }
-
-        if ($this->type != 'db') {
-            $this->load_index();
-
-            // Remove all keys
-            if ($key === null) {
-                foreach ($this->index as $key) {
-                    $this->delete_record($key, false);
-                }
-                $this->index = array();
-            }
-            // Remove keys by name prefix
-            else if ($prefix_mode) {
-                foreach ($this->index as $k) {
-                    if (strpos($k, $key) === 0) {
-                        $this->delete_record($k);
-                    }
-                }
-            }
-            // Remove one key by name
-            else {
-                $this->delete_record($key);
-            }
-
-            return;
-        }
-
-        // Remove all keys (in specified cache)
-        if ($key === null) {
-            $where = " WHERE cache_key LIKE " . $this->db->quote($this->prefix.'.%');
-        }
-        // Remove keys by name prefix
-        else if ($prefix_mode) {
-            $where = " WHERE cache_key LIKE " . $this->db->quote($this->prefix.'.'.$key.'%');
-        }
-        // Remove one key by name
-        else {
-            $where = " WHERE cache_key = " . $this->db->quote($this->prefix.'.'.$key);
-        }
-
-        $this->db->query("DELETE FROM " . $this->table . $where);
-    }
-
-
-    /**
-     * Adds entry into memcache/apc DB.
-     *
-     * @param string  $key   Cache key name
-     * @param mxied   $data  Serialized cache data
-     * @param bollean $index Enables immediate index update
-     *
-     * @param boolean True on success, False on failure
-     */
-    private function add_record($key, $data, $index=false)
-    {
-        if ($this->type == 'memcache') {
-            $result = $this->db->replace($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
-            if (!$result) {
-                $result = $this->db->set($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
-            }
-        }
-        else if ($this->type == 'apc') {
-            if (apc_exists($key)) {
-                apc_delete($key);
-            }
-            $result = apc_store($key, $data, $this->ttl);
-        }
-
-        // Update index
-        if ($index && $result) {
-            $this->load_index();
-
-            if (array_search($key, $this->index) === false) {
-                $this->index[] = $key;
-                $data = serialize($this->index);
-                $this->add_record($this->ikey(), $data);
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Deletes entry from memcache/apc DB.
-     */
-    private function delete_record($key, $index=true)
-    {
-        if ($this->type == 'memcache') {
-            // #1488592: use 2nd argument
-            $this->db->delete($this->ckey($key), 0);
-        }
-        else {
-            apc_delete($this->ckey($key));
-        }
-
-        if ($index) {
-            if (($idx = array_search($key, $this->index)) !== false) {
-                unset($this->index[$idx]);
-            }
-        }
-    }
-
-
-    /**
-     * Writes the index entry into memcache/apc DB.
-     */
-    private function write_index()
-    {
-        if (!$this->db) {
-            return;
-        }
-
-        if ($this->type == 'db') {
-            return;
-        }
-
-        $this->load_index();
-
-        // Make sure index contains new keys
-        foreach ($this->cache as $key => $value) {
-            if ($value !== null) {
-                if (array_search($key, $this->index) === false) {
-                    $this->index[] = $key;
-                }
-            }
-        }
-
-        $data = serialize($this->index);
-        $this->add_record($this->ikey(), $data);
-    }
-
-
-    /**
-     * Gets the index entry from memcache/apc DB.
-     */
-    private function load_index()
-    {
-        if (!$this->db) {
-            return;
-        }
-
-        if ($this->index !== null) {
-            return;
-        }
-
-        $index_key = $this->ikey();
-
-        if ($this->type == 'memcache') {
-            $data = $this->db->get($index_key);
-        }
-        else if ($this->type == 'apc') {
-            $data = apc_fetch($index_key);
-        }
-
-        $this->index = $data ? unserialize($data) : array();
-    }
-
-
-    /**
-     * Creates cache key name (for memcache and apc)
-     *
-     * @param string $key Cache key name
-     *
-     * @return string Cache key
-     */
-    private function ckey($key)
-    {
-        return $this->prefix . ':' . $key;
-    }
-
-
-    /**
-     * Creates index cache key name (for memcache and apc)
-     *
-     * @return string Cache key
-     */
-    private function ikey()
-    {
-        // This way each cache will have its own index
-        return $this->prefix . 'INDEX';
-    }
-
-    /**
-     * Serializes data for storing
-     */
-    private function serialize($data)
-    {
-        if ($this->type == 'db') {
-            return $this->db->encode($data, $this->packed);
-        }
-
-        return $this->packed ? serialize($data) : $data;
-    }
-
-    /**
-     * Unserializes serialized data
-     */
-    private function unserialize($data)
-    {
-        if ($this->type == 'db') {
-            return $this->db->decode($data, $this->packed);
-        }
-
-        return $this->packed ? @unserialize($data) : $data;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_charset.php b/lib/ext/Roundcube/rcube_charset.php
deleted file mode 100644
index 19dbf6c..0000000
--- a/lib/ext/Roundcube/rcube_charset.php
+++ /dev/null
@@ -1,817 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
- | Copyright (C) 2000 Edmund Grimley Evans <edmundo@rano.org>            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Provide charset conversion functionality                            |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Character sets conversion functionality
- *
- * @package    Framework
- * @subpackage Core
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- * @author     Edmund Grimley Evans <edmundo@rano.org>
- */
-class rcube_charset
-{
-    // Aliases: some of them from HTML5 spec.
-    static public $aliases = array(
-        'USASCII'       => 'WINDOWS-1252',
-        'ANSIX31101983' => 'WINDOWS-1252',
-        'ANSIX341968'   => 'WINDOWS-1252',
-        'UNKNOWN8BIT'   => 'ISO-8859-15',
-        'UNKNOWN'       => 'ISO-8859-15',
-        'USERDEFINED'   => 'ISO-8859-15',
-        'KSC56011987'   => 'EUC-KR',
-        'GB2312'        => 'GBK',
-        'GB231280'      => 'GBK',
-        'UNICODE'       => 'UTF-8',
-        'UTF7IMAP'      => 'UTF7-IMAP',
-        'TIS620'        => 'WINDOWS-874',
-        'ISO88599'      => 'WINDOWS-1254',
-        'ISO885911'     => 'WINDOWS-874',
-        'MACROMAN'      => 'MACINTOSH',
-        '77'            => 'MAC',
-        '128'           => 'SHIFT-JIS',
-        '129'           => 'CP949',
-        '130'           => 'CP1361',
-        '134'           => 'GBK',
-        '136'           => 'BIG5',
-        '161'           => 'WINDOWS-1253',
-        '162'           => 'WINDOWS-1254',
-        '163'           => 'WINDOWS-1258',
-        '177'           => 'WINDOWS-1255',
-        '178'           => 'WINDOWS-1256',
-        '186'           => 'WINDOWS-1257',
-        '204'           => 'WINDOWS-1251',
-        '222'           => 'WINDOWS-874',
-        '238'           => 'WINDOWS-1250',
-        'MS950'         => 'CP950',
-        'WINDOWS949'    => 'UHC',
-    );
-
-
-    /**
-     * Catch an error and throw an exception.
-     *
-     * @param  int    Level of the error
-     * @param  string Error message
-     */
-    public static function error_handler($errno, $errstr)
-    {
-        throw new ErrorException($errstr, 0, $errno);
-    }
-
-
-    /**
-     * Parse and validate charset name string (see #1485758).
-     * Sometimes charset string is malformed, there are also charset aliases 
-     * but we need strict names for charset conversion (specially utf8 class)
-     *
-     * @param string $input Input charset name
-     *
-     * @return string The validated charset name
-     */
-    public static function parse_charset($input)
-    {
-        static $charsets = array();
-        $charset = strtoupper($input);
-
-        if (isset($charsets[$input])) {
-            return $charsets[$input];
-        }
-
-        $charset = preg_replace(array(
-            '/^[^0-9A-Z]+/',    // e.g. _ISO-8859-JP$SIO
-            '/\$.*$/',          // e.g. _ISO-8859-JP$SIO
-            '/UNICODE-1-1-*/',  // RFC1641/1642
-            '/^X-/',            // X- prefix (e.g. X-ROMAN8 => ROMAN8)
-        ), '', $charset);
-
-        if ($charset == 'BINARY') {
-            return $charsets[$input] = null;
-        }
-
-        // allow A-Z and 0-9 only
-        $str = preg_replace('/[^A-Z0-9]/', '', $charset);
-
-        if (isset(self::$aliases[$str])) {
-            $result = self::$aliases[$str];
-        }
-        // UTF
-        else if (preg_match('/U[A-Z][A-Z](7|8|16|32)(BE|LE)*/', $str, $m)) {
-            $result = 'UTF-' . $m[1] . $m[2];
-        }
-        // ISO-8859
-        else if (preg_match('/ISO8859([0-9]{0,2})/', $str, $m)) {
-            $iso = 'ISO-8859-' . ($m[1] ? $m[1] : 1);
-            // some clients sends windows-1252 text as latin1,
-            // it is safe to use windows-1252 for all latin1
-            $result = $iso == 'ISO-8859-1' ? 'WINDOWS-1252' : $iso;
-        }
-        // handle broken charset names e.g. WINDOWS-1250HTTP-EQUIVCONTENT-TYPE
-        else if (preg_match('/(WIN|WINDOWS)([0-9]+)/', $str, $m)) {
-            $result = 'WINDOWS-' . $m[2];
-        }
-        // LATIN
-        else if (preg_match('/LATIN(.*)/', $str, $m)) {
-            $aliases = array('2' => 2, '3' => 3, '4' => 4, '5' => 9, '6' => 10,
-                '7' => 13, '8' => 14, '9' => 15, '10' => 16,
-                'ARABIC' => 6, 'CYRILLIC' => 5, 'GREEK' => 7, 'GREEK1' => 7, 'HEBREW' => 8
-            );
-
-            // some clients sends windows-1252 text as latin1,
-            // it is safe to use windows-1252 for all latin1
-            if ($m[1] == 1) {
-                $result = 'WINDOWS-1252';
-            }
-            // if iconv is not supported we need ISO labels, it's also safe for iconv
-            else if (!empty($aliases[$m[1]])) {
-                $result = 'ISO-8859-'.$aliases[$m[1]];
-            }
-            // iconv requires convertion of e.g. LATIN-1 to LATIN1
-            else {
-                $result = $str;
-            }
-        }
-        else {
-            $result = $charset;
-        }
-
-        $charsets[$input] = $result;
-
-        return $result;
-    }
-
-
-    /**
-     * Convert a string from one charset to another.
-     * Uses mbstring and iconv functions if possible
-     *
-     * @param  string Input string
-     * @param  string Suspected charset of the input string
-     * @param  string Target charset to convert to; defaults to RCUBE_CHARSET
-     *
-     * @return string Converted string
-     */
-    public static function convert($str, $from, $to = null)
-    {
-        static $iconv_options   = null;
-        static $mbstring_list   = null;
-        static $mbstring_sch    = null;
-        static $conv            = null;
-
-        $to   = empty($to) ? RCUBE_CHARSET : $to;
-        $from = self::parse_charset($from);
-
-        // It is a common case when UTF-16 charset is used with US-ASCII content (#1488654)
-        // In that case we can just skip the conversion (use UTF-8)
-        if ($from == 'UTF-16' && !preg_match('/[^\x00-\x7F]/', $str)) {
-            $from = 'UTF-8';
-        }
-
-        if ($from == $to || empty($str) || empty($from)) {
-            return $str;
-        }
-
-        if ($iconv_options === null) {
-            if (function_exists('iconv')) {
-                // ignore characters not available in output charset
-                $iconv_options = '//IGNORE';
-                if (iconv('', $iconv_options, '') === false) {
-                    // iconv implementation does not support options
-                    $iconv_options = '';
-                }
-            }
-        }
-
-        // convert charset using iconv module
-        if ($iconv_options !== null && $from != 'UTF7-IMAP' && $to != 'UTF7-IMAP') {
-            // throw an exception if iconv reports an illegal character in input
-            // it means that input string has been truncated
-            set_error_handler(array('rcube_charset', 'error_handler'), E_NOTICE);
-            try {
-                $_iconv = iconv($from, $to . $iconv_options, $str);
-            } catch (ErrorException $e) {
-                $_iconv = false;
-            }
-            restore_error_handler();
-
-            if ($_iconv !== false) {
-                return $_iconv;
-            }
-        }
-
-        if ($mbstring_list === null) {
-            if (extension_loaded('mbstring')) {
-                $mbstring_sch  = mb_substitute_character();
-                $mbstring_list = mb_list_encodings();
-                $mbstring_list = array_map('strtoupper', $mbstring_list);
-            }
-        }
-
-        // convert charset using mbstring module
-        if ($mbstring_list !== null) {
-            $aliases['WINDOWS-1257'] = 'ISO-8859-13';
-            // it happens that mbstring supports ASCII but not US-ASCII
-            if (($from == 'US-ASCII' || $to == 'US-ASCII') && !in_array('US-ASCII', $mbstring_list)) {
-                $aliases['US-ASCII'] = 'ASCII';
-            }
-
-            $mb_from = $aliases[$from] ? $aliases[$from] : $from;
-            $mb_to   = $aliases[$to] ? $aliases[$to] : $to;
-
-            // return if encoding found, string matches encoding and convert succeeded
-            if (in_array($mb_from, $mbstring_list) && in_array($mb_to, $mbstring_list)) {
-                if (mb_check_encoding($str, $mb_from)) {
-                    // Do the same as //IGNORE with iconv
-                    mb_substitute_character('none');
-                    $out = mb_convert_encoding($str, $mb_to, $mb_from);
-                    mb_substitute_character($mbstring_sch);
-
-                    if ($out !== false) {
-                        return $out;
-                    }
-                }
-            }
-        }
-
-        // convert charset using bundled classes/functions
-        if ($to == 'UTF-8') {
-            if ($from == 'UTF7-IMAP') {
-                if ($_str = self::utf7imap_to_utf8($str)) {
-                    return $_str;
-                }
-            }
-            else if ($from == 'UTF-7') {
-                if ($_str = self::utf7_to_utf8($str)) {
-                    return $_str;
-                }
-            }
-            else if ($from == 'ISO-8859-1' && function_exists('utf8_encode')) {
-                return utf8_encode($str);
-            }
-            else if (class_exists('utf8')) {
-                if (!$conv) {
-                    $conv = new utf8($from);
-                }
-                else {
-                    $conv->loadCharset($from);
-                }
-
-                if ($_str = $conv->strToUtf8($str)) {
-                    return $_str;
-                }
-            }
-        }
-
-        // encode string for output
-        if ($from == 'UTF-8') {
-            // @TODO: we need a function for UTF-7 (RFC2152) conversion
-            if ($to == 'UTF7-IMAP' || $to == 'UTF-7') {
-                if ($_str = self::utf8_to_utf7imap($str)) {
-                    return $_str;
-                }
-            }
-            else if ($to == 'ISO-8859-1' && function_exists('utf8_decode')) {
-                return utf8_decode($str);
-            }
-            else if (class_exists('utf8')) {
-                if (!$conv) {
-                    $conv = new utf8($to);
-                }
-                else {
-                    $conv->loadCharset($from);
-                }
-
-                if ($_str = $conv->strToUtf8($str)) {
-                    return $_str;
-                }
-            }
-        }
-
-        // return original string
-        return $str;
-    }
-
-
-    /**
-     * Converts string from standard UTF-7 (RFC 2152) to UTF-8.
-     *
-     * @param  string  Input string (UTF-7)
-     *
-     * @return string  Converted string (UTF-8)
-     */
-    public static function utf7_to_utf8($str)
-    {
-        $Index_64 = array(
-            0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-            0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-            0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0,
-            1,1,1,1, 1,1,1,1, 1,1,0,0, 0,0,0,0,
-            0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1,
-            1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,0,
-            0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1,
-            1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,0,
-        );
-
-        $u7len = strlen($str);
-        $str   = strval($str);
-        $res   = '';
-
-        for ($i=0; $u7len > 0; $i++, $u7len--) {
-            $u7 = $str[$i];
-            if ($u7 == '+') {
-                $i++;
-                $u7len--;
-                $ch = '';
-
-                for (; $u7len > 0; $i++, $u7len--) {
-                    $u7 = $str[$i];
-
-                    if (!$Index_64[ord($u7)]) {
-                        break;
-                    }
-
-                    $ch .= $u7;
-                }
-
-                if ($ch == '') {
-                    if ($u7 == '-') {
-                        $res .= '+';
-                    }
-
-                    continue;
-                }
-
-                $res .= self::utf16_to_utf8(base64_decode($ch));
-            }
-            else {
-                $res .= $u7;
-            }
-        }
-
-        return $res;
-    }
-
-
-    /**
-     * Converts string from UTF-16 to UTF-8 (helper for utf-7 to utf-8 conversion)
-     *
-     * @param  string  Input string
-     *
-     * @return string  The converted string
-     */
-    public static function utf16_to_utf8($str)
-    {
-        $len = strlen($str);
-        $dec = '';
-
-        for ($i = 0; $i < $len; $i += 2) {
-            $c = ord($str[$i]) << 8 | ord($str[$i + 1]);
-            if ($c >= 0x0001 && $c <= 0x007F) {
-                $dec .= chr($c);
-            }
-            else if ($c > 0x07FF) {
-                $dec .= chr(0xE0 | (($c >> 12) & 0x0F));
-                $dec .= chr(0x80 | (($c >>  6) & 0x3F));
-                $dec .= chr(0x80 | (($c >>  0) & 0x3F));
-            }
-            else {
-                $dec .= chr(0xC0 | (($c >>  6) & 0x1F));
-                $dec .= chr(0x80 | (($c >>  0) & 0x3F));
-            }
-        }
-
-        return $dec;
-    }
-
-
-    /**
-     * Convert the data ($str) from RFC 2060's UTF-7 to UTF-8.
-     * If input data is invalid, return the original input string.
-     * RFC 2060 obviously intends the encoding to be unique (see
-     * point 5 in section 5.1.3), so we reject any non-canonical
-     * form, such as &ACY- (instead of &-) or &AMA-&AMA- (instead
-     * of &AMAAwA-).
-     *
-     * Translated from C to PHP by Thomas Bruederli <roundcube@gmail.com>
-     *
-     * @param string $str Input string (UTF7-IMAP)
-     *
-     * @return string Output string (UTF-8)
-     */
-    public static function utf7imap_to_utf8($str)
-    {
-        $Index_64 = array(
-            -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-            -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-            -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, 63,-1,-1,-1,
-            52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1,-1,-1,-1,
-            -1, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
-            15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
-            -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
-            41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
-        );
-
-        $u7len = strlen($str);
-        $str   = strval($str);
-        $p     = '';
-        $err   = '';
-
-        for ($i=0; $u7len > 0; $i++, $u7len--) {
-            $u7 = $str[$i];
-            if ($u7 == '&') {
-                $i++;
-                $u7len--;
-                $u7 = $str[$i];
-
-                if ($u7len && $u7 == '-') {
-                    $p .= '&';
-                    continue;
-                }
-
-                $ch = 0;
-                $k = 10;
-                for (; $u7len > 0; $i++, $u7len--) {
-                    $u7 = $str[$i];
-
-                    if ((ord($u7) & 0x80) || ($b = $Index_64[ord($u7)]) == -1) {
-                        break;
-                    }
-
-                    if ($k > 0) {
-                        $ch |= $b << $k;
-                        $k -= 6;
-                    }
-                    else {
-                        $ch |= $b >> (-$k);
-                        if ($ch < 0x80) {
-                            // Printable US-ASCII
-                            if (0x20 <= $ch && $ch < 0x7f) {
-                                return $err;
-                            }
-                            $p .= chr($ch);
-                        }
-                        else if ($ch < 0x800) {
-                            $p .= chr(0xc0 | ($ch >> 6));
-                            $p .= chr(0x80 | ($ch & 0x3f));
-                        }
-                        else {
-                            $p .= chr(0xe0 | ($ch >> 12));
-                            $p .= chr(0x80 | (($ch >> 6) & 0x3f));
-                            $p .= chr(0x80 | ($ch & 0x3f));
-                        }
-
-                        $ch = ($b << (16 + $k)) & 0xffff;
-                        $k += 10;
-                    }
-                }
-
-                // Non-zero or too many extra bits
-                if ($ch || $k < 6) {
-                    return $err;
-                }
-
-                // BASE64 not properly terminated
-                if (!$u7len || $u7 != '-') {
-                    return $err;
-                }
-
-                // Adjacent BASE64 sections
-                if ($u7len > 2 && $str[$i+1] == '&' && $str[$i+2] != '-') {
-                    return $err;
-                }
-            }
-            // Not printable US-ASCII
-            else if (ord($u7) < 0x20 || ord($u7) >= 0x7f) {
-                return $err;
-            }
-            else {
-                $p .= $u7;
-            }
-        }
-
-        return $p;
-    }
-
-
-    /**
-     * Convert the data ($str) from UTF-8 to RFC 2060's UTF-7.
-     * Unicode characters above U+FFFF are replaced by U+FFFE.
-     * If input data is invalid, return an empty string.
-     *
-     * Translated from C to PHP by Thomas Bruederli <roundcube@gmail.com>
-     *
-     * @param string $str Input string (UTF-8)
-     *
-     * @return string Output string (UTF7-IMAP)
-     */
-    public static function utf8_to_utf7imap($str)
-    {
-        $B64Chars = array(
-            'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-            'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
-            'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
-            't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
-            '8', '9', '+', ','
-        );
-
-        $u8len  = strlen($str);
-        $base64 = 0;
-        $i      = 0;
-        $p      = '';
-        $err    = '';
-
-        while ($u8len) {
-            $u8 = $str[$i];
-            $c  = ord($u8);
-
-            if ($c < 0x80) {
-                $ch = $c;
-                $n  = 0;
-            }
-            else if ($c < 0xc2) {
-                return $err;
-            }
-            else if ($c < 0xe0) {
-                $ch = $c & 0x1f;
-                $n  = 1;
-            }
-            else if ($c < 0xf0) {
-                $ch = $c & 0x0f;
-                $n  = 2;
-            }
-            else if ($c < 0xf8) {
-                $ch = $c & 0x07;
-                $n  = 3;
-            }
-            else if ($c < 0xfc) {
-                $ch = $c & 0x03;
-                $n  = 4;
-            }
-            else if ($c < 0xfe) {
-                $ch = $c & 0x01;
-                $n  = 5;
-            }
-            else {
-                return $err;
-            }
-
-            $i++;
-            $u8len--;
-
-            if ($n > $u8len) {
-                return $err;
-            }
-
-            for ($j=0; $j < $n; $j++) {
-                $o = ord($str[$i+$j]);
-                if (($o & 0xc0) != 0x80) {
-                    return $err;
-                }
-                $ch = ($ch << 6) | ($o & 0x3f);
-            }
-
-            if ($n > 1 && !($ch >> ($n * 5 + 1))) {
-                return $err;
-            }
-
-            $i += $n;
-            $u8len -= $n;
-
-            if ($ch < 0x20 || $ch >= 0x7f) {
-                if (!$base64) {
-                    $p .= '&';
-                    $base64 = 1;
-                    $b = 0;
-                    $k = 10;
-                }
-                if ($ch & ~0xffff) {
-                    $ch = 0xfffe;
-                }
-
-                $p .= $B64Chars[($b | $ch >> $k)];
-                $k -= 6;
-                for (; $k >= 0; $k -= 6) {
-                    $p .= $B64Chars[(($ch >> $k) & 0x3f)];
-                }
-
-                $b = ($ch << (-$k)) & 0x3f;
-                $k += 16;
-            }
-            else {
-                if ($base64) {
-                    if ($k > 10) {
-                        $p .= $B64Chars[$b];
-                    }
-                    $p .= '-';
-                    $base64 = 0;
-                }
-
-                $p .= chr($ch);
-                if (chr($ch) == '&') {
-                    $p .= '-';
-                }
-            }
-        }
-
-        if ($base64) {
-            if ($k > 10) {
-                $p .= $B64Chars[$b];
-            }
-            $p .= '-';
-        }
-
-        return $p;
-    }
-
-
-    /**
-     * A method to guess character set of a string.
-     *
-     * @param string $string   String
-     * @param string $failover Default result for failover
-     * @param string $language User language
-     *
-     * @return string Charset name
-     */
-    public static function detect($string, $failover = null, $language = null)
-    {
-        if (substr($string, 0, 4) == "\0\0\xFE\xFF") return 'UTF-32BE';  // Big Endian
-        if (substr($string, 0, 4) == "\xFF\xFE\0\0") return 'UTF-32LE';  // Little Endian
-        if (substr($string, 0, 2) == "\xFE\xFF")     return 'UTF-16BE';  // Big Endian
-        if (substr($string, 0, 2) == "\xFF\xFE")     return 'UTF-16LE';  // Little Endian
-        if (substr($string, 0, 3) == "\xEF\xBB\xBF") return 'UTF-8';
-
-        // heuristics
-        if ($string[0] == "\0" && $string[1] == "\0" && $string[2] == "\0" && $string[3] != "\0") return 'UTF-32BE';
-        if ($string[0] != "\0" && $string[1] == "\0" && $string[2] == "\0" && $string[3] == "\0") return 'UTF-32LE';
-        if ($string[0] == "\0" && $string[1] != "\0" && $string[2] == "\0" && $string[3] != "\0") return 'UTF-16BE';
-        if ($string[0] != "\0" && $string[1] == "\0" && $string[2] != "\0" && $string[3] == "\0") return 'UTF-16LE';
-
-        if (function_exists('mb_detect_encoding')) {
-            if (empty($language)) {
-                $rcube    = rcube::get_instance();
-                $language = $rcube->get_user_language();
-            }
-
-            // Prioritize charsets according to current language (#1485669)
-            switch ($language) {
-            case 'ja_JP':
-                $prio = array('ISO-2022-JP', 'JIS', 'UTF-8', 'EUC-JP', 'eucJP-win', 'SJIS', 'SJIS-win');
-                break;
-
-            case 'zh_CN':
-            case 'zh_TW':
-                $prio = array('UTF-8', 'BIG-5', 'GB2312', 'EUC-TW');
-                break;
-
-            case 'ko_KR':
-                $prio = array('UTF-8', 'EUC-KR', 'ISO-2022-KR');
-                break;
-
-            case 'ru_RU':
-                $prio = array('UTF-8', 'WINDOWS-1251', 'KOI8-R');
-                break;
-
-            case 'tr_TR':
-                $prio = array('UTF-8', 'ISO-8859-9', 'WINDOWS-1254');
-                break;
-
-            default:
-                $prio = array('UTF-8', 'SJIS', 'GB2312',
-                    'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',
-                    'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9',
-                    'ISO-8859-10', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16',
-                    'WINDOWS-1252', 'WINDOWS-1251', 'EUC-JP', 'EUC-TW', 'KOI8-R', 'BIG-5',
-                    'ISO-2022-KR', 'ISO-2022-JP',
-                );
-            }
-
-            $encodings = array_unique(array_merge($prio, mb_list_encodings()));
-
-            return mb_detect_encoding($string, $encodings);
-        }
-
-        // No match, check for UTF-8
-        // from http://w3.org/International/questions/qa-forms-utf-8.html
-        if (preg_match('/\A(
-            [\x09\x0A\x0D\x20-\x7E]
-            | [\xC2-\xDF][\x80-\xBF]
-            | \xE0[\xA0-\xBF][\x80-\xBF]
-            | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}
-            | \xED[\x80-\x9F][\x80-\xBF]
-            | \xF0[\x90-\xBF][\x80-\xBF]{2}
-            | [\xF1-\xF3][\x80-\xBF]{3}
-            | \xF4[\x80-\x8F][\x80-\xBF]{2}
-            )*\z/xs', substr($string, 0, 2048))
-        ) {
-            return 'UTF-8';
-        }
-
-        return $failover;
-    }
-
-
-    /**
-     * Removes non-unicode characters from input.
-     *
-     * @param mixed $input String or array.
-     *
-     * @return mixed String or array
-     */
-    public static function clean($input)
-    {
-        // handle input of type array
-        if (is_array($input)) {
-            foreach ($input as $idx => $val) {
-                $input[$idx] = self::clean($val);
-            }
-            return $input;
-        }
-
-        if (!is_string($input) || $input == '') {
-            return $input;
-        }
-
-        // iconv/mbstring are much faster (especially with long strings)
-        if (function_exists('mb_convert_encoding')) {
-            if (($res = mb_convert_encoding($input, 'UTF-8', 'UTF-8')) !== false) {
-                return $res;
-            }
-        }
-
-        if (function_exists('iconv')) {
-            if (($res = @iconv('UTF-8', 'UTF-8//IGNORE', $input)) !== false) {
-                return $res;
-            }
-        }
-
-        $seq    = '';
-        $out    = '';
-        $regexp = '/^('.
-//          '[\x00-\x7F]'.                                  // UTF8-1
-            '|[\xC2-\xDF][\x80-\xBF]'.                      // UTF8-2
-            '|\xE0[\xA0-\xBF][\x80-\xBF]'.                  // UTF8-3
-            '|[\xE1-\xEC][\x80-\xBF][\x80-\xBF]'.           // UTF8-3
-            '|\xED[\x80-\x9F][\x80-\xBF]'.                  // UTF8-3
-            '|[\xEE-\xEF][\x80-\xBF][\x80-\xBF]'.           // UTF8-3
-            '|\xF0[\x90-\xBF][\x80-\xBF][\x80-\xBF]'.       // UTF8-4
-            '|[\xF1-\xF3][\x80-\xBF][\x80-\xBF][\x80-\xBF]'.// UTF8-4
-            '|\xF4[\x80-\x8F][\x80-\xBF][\x80-\xBF]'.       // UTF8-4
-            ')$/';
-
-        for ($i = 0, $len = strlen($input); $i < $len; $i++) {
-            $chr = $input[$i];
-            $ord = ord($chr);
-
-            // 1-byte character
-            if ($ord <= 0x7F) {
-                if ($seq) {
-                    $out .= preg_match($regexp, $seq) ? $seq : '';
-                }
-                $seq = '';
-                $out .= $chr;
-            // first (or second) byte of multibyte sequence
-            }
-            else if ($ord >= 0xC0) {
-                if (strlen($seq) > 1) {
-                    $out .= preg_match($regexp, $seq) ? $seq : '';
-                    $seq = '';
-                }
-                else if ($seq && ord($seq) < 0xC0) {
-                    $seq = '';
-                }
-                $seq .= $chr;
-            // next byte of multibyte sequence
-            }
-            else if ($seq) {
-                $seq .= $chr;
-            }
-        }
-
-        if ($seq) {
-            $out .= preg_match($regexp, $seq) ? $seq : '';
-        }
-
-        return $out;
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_config.php b/lib/ext/Roundcube/rcube_config.php
deleted file mode 100644
index 04b914c..0000000
--- a/lib/ext/Roundcube/rcube_config.php
+++ /dev/null
@@ -1,612 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Class to read configuration settings                                |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Configuration class for Roundcube
- *
- * @package    Framework
- * @subpackage Core
- */
-class rcube_config
-{
-    const DEFAULT_SKIN = 'larry';
-
-    private $env = '';
-    private $paths = array();
-    private $prop = array();
-    private $errors = array();
-    private $userprefs = array();
-
-    /**
-     * Renamed options
-     *
-     * @var array
-     */
-    private $legacy_props = array(
-        // new name => old name
-        'default_folders'      => 'default_imap_folders',
-        'mail_pagesize'        => 'pagesize',
-        'addressbook_pagesize' => 'pagesize',
-        'reply_mode'           => 'top_posting',
-        'refresh_interval'     => 'keep_alive',
-        'min_refresh_interval' => 'min_keep_alive',
-        'messages_cache_ttl'   => 'message_cache_lifetime',
-        'redundant_attachments_cache_ttl' => 'redundant_attachments_memcache_ttl',
-    );
-
-
-    /**
-     * Object constructor
-     *
-     * @param string Environment suffix for config files to load
-     */
-    public function __construct($env = '')
-    {
-        $this->env = $env;
-
-        if ($paths = getenv('RCUBE_CONFIG_PATH')) {
-            $this->paths = explode(PATH_SEPARATOR, $paths);
-            // make all paths absolute
-            foreach ($this->paths as $i => $path) {
-                if (!$this->_is_absolute($path)) {
-                    if ($realpath = realpath(RCUBE_INSTALL_PATH . $path)) {
-                        $this->paths[$i] = unslashify($realpath) . '/';
-                    }
-                    else {
-                        unset($this->paths[$i]);
-                    }
-                }
-                else {
-                    $this->paths[$i] = unslashify($path) . '/';
-                }
-            }
-        }
-
-        if (defined('RCUBE_CONFIG_DIR') && !in_array(RCUBE_CONFIG_DIR, $this->paths)) {
-            $this->paths[] = RCUBE_CONFIG_DIR;
-        }
-
-        if (empty($this->paths)) {
-            $this->paths[] = RCUBE_INSTALL_PATH . 'config/';
-        }
-
-        $this->load();
-
-        // Defaults, that we do not require you to configure,
-        // but contain information that is used in various
-        // locations in the code:
-        $this->set('contactlist_fields', array('name', 'firstname', 'surname', 'email'));
-    }
-
-
-    /**
-     * Load config from local config file
-     *
-     * @todo Remove global $CONFIG
-     */
-    private function load()
-    {
-        // Load default settings
-        if (!$this->load_from_file('defaults.inc.php')) {
-            $this->errors[] = 'defaults.inc.php was not found.';
-        }
-
-        // load main config file
-        if (!$this->load_from_file('config.inc.php')) {
-            // Old configuration files
-            if (!$this->load_from_file('main.inc.php') ||
-                !$this->load_from_file('db.inc.php')) {
-                $this->errors[] = 'config.inc.php was not found.';
-            }
-            else if (rand(1,100) == 10) {  // log warning on every 100th request (average)
-                trigger_error("config.inc.php was not found. Please migrate your config by running bin/update.sh", E_USER_WARNING);
-            }
-        }
-
-        // load host-specific configuration
-        $this->load_host_config();
-
-        // set skin (with fallback to old 'skin_path' property)
-        if (empty($this->prop['skin'])) {
-            if (!empty($this->prop['skin_path'])) {
-                $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
-            }
-            else {
-                $this->prop['skin'] = self::DEFAULT_SKIN;
-            }
-        }
-
-        // larry is the new default skin :-)
-        if ($this->prop['skin'] == 'default')
-            $this->prop['skin'] = self::DEFAULT_SKIN;
-
-        // fix paths
-        $this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : RCUBE_INSTALL_PATH . 'logs';
-        $this->prop['temp_dir'] = $this->prop['temp_dir'] ? realpath(unslashify($this->prop['temp_dir'])) : RCUBE_INSTALL_PATH . 'temp';
-
-        // fix default imap folders encoding
-        foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
-            $this->prop[$folder] = rcube_charset::convert($this->prop[$folder], RCUBE_CHARSET, 'UTF7-IMAP');
-
-        if (!empty($this->prop['default_folders']))
-            foreach ($this->prop['default_folders'] as $n => $folder)
-                $this->prop['default_folders'][$n] = rcube_charset::convert($folder, RCUBE_CHARSET, 'UTF7-IMAP');
-
-        // set PHP error logging according to config
-        if ($this->prop['debug_level'] & 1) {
-            ini_set('log_errors', 1);
-
-            if ($this->prop['log_driver'] == 'syslog') {
-                ini_set('error_log', 'syslog');
-            }
-            else {
-                ini_set('error_log', $this->prop['log_dir'].'/errors');
-            }
-        }
-
-        // enable display_errors in 'show' level, but not for ajax requests
-        ini_set('display_errors', intval(empty($_REQUEST['_remote']) && ($this->prop['debug_level'] & 4)));
-
-        // remove deprecated properties
-        unset($this->prop['dst_active']);
-
-        // export config data
-        $GLOBALS['CONFIG'] = &$this->prop;
-    }
-
-    /**
-     * Load a host-specific config file if configured
-     * This will merge the host specific configuration with the given one
-     */
-    private function load_host_config()
-    {
-        if (empty($this->prop['include_host_config'])) {
-            return;
-        }
-
-        foreach (array('HTTP_HOST', 'SERVER_NAME', 'SERVER_ADDR') as $key) {
-            $fname = null;
-            $name  = $_SERVER[$key];
-
-            if (!$name) {
-                continue;
-            }
-
-            if (is_array($this->prop['include_host_config'])) {
-                $fname = $this->prop['include_host_config'][$name];
-            }
-            else {
-                $fname = preg_replace('/[^a-z0-9\.\-_]/i', '', $name) . '.inc.php';
-            }
-
-            if ($fname && $this->load_from_file($fname)) {
-                return;
-            }
-        }
-    }
-
-    /**
-     * Read configuration from a file
-     * and merge with the already stored config values
-     *
-     * @param string $file Name of the config file to be loaded
-     * @return booelan True on success, false on failure
-     */
-    public function load_from_file($file)
-    {
-        $success = false;
-
-        foreach ($this->resolve_paths($file) as $fpath) {
-            if ($fpath && is_file($fpath) && is_readable($fpath)) {
-                // use output buffering, we don't need any output here 
-                ob_start();
-                include($fpath);
-                ob_end_clean();
-
-                if (is_array($config)) {
-                    $this->merge($config);
-                    $success = true;
-                }
-                // deprecated name of config variable
-                if (is_array($rcmail_config)) {
-                    $this->merge($rcmail_config);
-                    $success = true;
-                }
-            }
-        }
-
-        return $success;
-    }
-
-    /**
-     * Helper method to resolve absolute paths to the given config file.
-     * This also takes the 'env' property into account.
-     *
-     * @param string  Filename or absolute file path
-     * @param boolean Return -$env file path if exists
-     * @return array  List of candidates in config dir path(s)
-     */
-    public function resolve_paths($file, $use_env = true)
-    {
-        $files = array();
-        $abs_path = $this->_is_absolute($file);
-
-        foreach ($this->paths as $basepath) {
-            $realpath = $abs_path ? $file : realpath($basepath . '/' . $file);
-
-            // check if <file>-env.ini exists
-            if ($realpath && $use_env && !empty($this->env)) {
-                $envfile = preg_replace('/\.(inc.php)$/', '-' . $this->env . '.\\1', $realpath);
-                if (is_file($envfile))
-                    $realpath = $envfile;
-            }
-
-            if ($realpath) {
-                $files[] = $realpath;
-
-                // no need to continue the loop if an absolute file path is given
-                if ($abs_path) {
-                    break;
-                }
-            }
-        }
-
-        return $files;
-    }
-
-    /**
-     * Determine whether the given file path is absolute or relative
-     */
-    private function _is_absolute($path)
-    {
-        return $path[0] == DIRECTORY_SEPARATOR || preg_match('!^[a-z]:[\\\\/]!i', $path);
-    }
-
-    /**
-     * Getter for a specific config parameter
-     *
-     * @param  string $name Parameter name
-     * @param  mixed  $def  Default value if not set
-     * @return mixed  The requested config value
-     */
-    public function get($name, $def = null)
-    {
-        if (isset($this->prop[$name])) {
-            $result = $this->prop[$name];
-        }
-        else {
-            $result = $def;
-        }
-
-        $rcube = rcube::get_instance();
-
-        if ($name == 'timezone') {
-            if (empty($result) || $result == 'auto') {
-                $result = $this->client_timezone();
-            }
-        }
-        else if ($name == 'client_mimetypes') {
-            if ($result == null && $def == null)
-                $result = 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,image/bmp,image/tiff,application/x-javascript,application/pdf,application/x-shockwave-flash';
-            if ($result && is_string($result))
-                $result = explode(',', $result);
-        }
-
-        $plugin = $rcube->plugins->exec_hook('config_get', array(
-            'name' => $name, 'default' => $def, 'result' => $result));
-
-        return $plugin['result'];
-    }
-
-
-    /**
-     * Setter for a config parameter
-     *
-     * @param string $name  Parameter name
-     * @param mixed  $value Parameter value
-     */
-    public function set($name, $value)
-    {
-        $this->prop[$name] = $value;
-    }
-
-
-    /**
-     * Override config options with the given values (eg. user prefs)
-     *
-     * @param array $prefs Hash array with config props to merge over
-     */
-    public function merge($prefs)
-    {
-        $prefs = $this->fix_legacy_props($prefs);
-        $this->prop = array_merge($this->prop, $prefs, $this->userprefs);
-    }
-
-
-    /**
-     * Merge the given prefs over the current config
-     * and make sure that they survive further merging.
-     *
-     * @param array $prefs Hash array with user prefs
-     */
-    public function set_user_prefs($prefs)
-    {
-        $prefs = $this->fix_legacy_props($prefs);
-
-        // Honor the dont_override setting for any existing user preferences
-        $dont_override = $this->get('dont_override');
-        if (is_array($dont_override) && !empty($dont_override)) {
-            foreach ($dont_override as $key) {
-                unset($prefs[$key]);
-            }
-        }
-
-        // larry is the new default skin :-)
-        if ($prefs['skin'] == 'default') {
-            $prefs['skin'] = self::DEFAULT_SKIN;
-        }
-
-        $this->userprefs = $prefs;
-        $this->prop      = array_merge($this->prop, $prefs);
-    }
-
-
-    /**
-     * Getter for all config options
-     *
-     * @return array  Hash array containing all config properties
-     */
-    public function all()
-    {
-        return $this->prop;
-    }
-
-    /**
-     * Special getter for user's timezone offset including DST
-     *
-     * @return float  Timezone offset (in hours)
-     * @deprecated
-     */
-    public function get_timezone()
-    {
-      if ($tz = $this->get('timezone')) {
-        try {
-          $tz = new DateTimeZone($tz);
-          return $tz->getOffset(new DateTime('now')) / 3600;
-        }
-        catch (Exception $e) {
-        }
-      }
-
-      return 0;
-    }
-
-    /**
-     * Return requested DES crypto key.
-     *
-     * @param string $key Crypto key name
-     * @return string Crypto key
-     */
-    public function get_crypto_key($key)
-    {
-        // Bomb out if the requested key does not exist
-        if (!array_key_exists($key, $this->prop)) {
-            rcube::raise_error(array(
-                'code' => 500, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Request for unconfigured crypto key \"$key\""
-            ), true, true);
-        }
-
-        $key = $this->prop[$key];
-
-        // Bomb out if the configured key is not exactly 24 bytes long
-        if (strlen($key) != 24) {
-            rcube::raise_error(array(
-                'code' => 500, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Configured crypto key '$key' is not exactly 24 bytes long"
-            ), true, true);
-        }
-
-        return $key;
-    }
-
-
-    /**
-     * Try to autodetect operating system and find the correct line endings
-     *
-     * @return string The appropriate mail header delimiter
-     */
-    public function header_delimiter()
-    {
-        // use the configured delimiter for headers
-        if (!empty($this->prop['mail_header_delimiter'])) {
-            $delim = $this->prop['mail_header_delimiter'];
-            if ($delim == "\n" || $delim == "\r\n")
-                return $delim;
-            else
-                rcube::raise_error(array(
-                    'code' => 500, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Invalid mail_header_delimiter setting"
-                ), true, false);
-        }
-
-        $php_os = strtolower(substr(PHP_OS, 0, 3));
-
-        if ($php_os == 'win')
-            return "\r\n";
-
-        if ($php_os == 'mac')
-            return "\r\n";
-
-        return "\n";
-    }
-
-
-    /**
-     * Return the mail domain configured for the given host
-     *
-     * @param string  $host   IMAP host
-     * @param boolean $encode If true, domain name will be converted to IDN ASCII
-     * @return string Resolved SMTP host
-     */
-    public function mail_domain($host, $encode=true)
-    {
-        $domain = $host;
-
-        if (is_array($this->prop['mail_domain'])) {
-            if (isset($this->prop['mail_domain'][$host]))
-                $domain = $this->prop['mail_domain'][$host];
-        }
-        else if (!empty($this->prop['mail_domain'])) {
-            $domain = rcube_utils::parse_host($this->prop['mail_domain']);
-        }
-
-        if ($encode) {
-            $domain = rcube_utils::idn_to_ascii($domain);
-        }
-
-        return $domain;
-    }
-
-
-    /**
-     * Getter for error state
-     *
-     * @return mixed Error message on error, False if no errors
-     */
-    public function get_error()
-    {
-        return empty($this->errors) ? false : join("\n", $this->errors);
-    }
-
-
-    /**
-     * Internal getter for client's (browser) timezone identifier
-     */
-    private function client_timezone()
-    {
-        // @TODO: remove this legacy timezone handling in the future
-        $props = $this->fix_legacy_props(array('timezone' => $_SESSION['timezone']));
-
-        if (!empty($props['timezone'])) {
-            try {
-                $tz = new DateTimeZone($props['timezone']);
-                return $tz->getName();
-            }
-            catch (Exception $e) { /* gracefully ignore */ }
-        }
-
-        // fallback to server's timezone
-        return date_default_timezone_get();
-    }
-
-    /**
-     * Convert legacy options into new ones
-     *
-     * @param array $props Hash array with config props
-     *
-     * @return array Converted config props
-     */
-    private function fix_legacy_props($props)
-    {
-        foreach ($this->legacy_props as $new => $old) {
-            if (isset($props[$old])) {
-                if (!isset($props[$new])) {
-                    $props[$new] = $props[$old];
-                }
-                unset($props[$old]);
-            }
-        }
-
-        // convert deprecated numeric timezone value
-        if (isset($props['timezone']) && is_numeric($props['timezone'])) {
-            if ($tz = self::timezone_name_from_abbr($props['timezone'])) {
-                $props['timezone'] = $tz;
-            }
-            else {
-                unset($props['timezone']);
-            }
-        }
-
-        return $props;
-    }
-
-    /**
-     * timezone_name_from_abbr() replacement. Converts timezone offset
-     * into timezone name abbreviation.
-     *
-     * @param float $offset Timezone offset (in hours)
-     *
-     * @return string Timezone abbreviation
-     */
-    static public function timezone_name_from_abbr($offset)
-    {
-        // List of timezones here is not complete - https://bugs.php.net/bug.php?id=44780
-        if ($tz = timezone_name_from_abbr('', $offset * 3600, 0)) {
-            return $tz;
-        }
-
-        // try with more complete list (#1489261)
-        $timezones = array(
-            '-660' => "Pacific/Apia",
-            '-600' => "Pacific/Honolulu",
-            '-570' => "Pacific/Marquesas",
-            '-540' => "America/Anchorage",
-            '-480' => "America/Los_Angeles",
-            '-420' => "America/Denver",
-            '-360' => "America/Chicago",
-            '-300' => "America/New_York",
-            '-270' => "America/Caracas",
-            '-240' => "America/Halifax",
-            '-210' => "Canada/Newfoundland",
-            '-180' => "America/Sao_Paulo",
-             '-60' => "Atlantic/Azores",
-               '0' => "Europe/London",
-              '60' => "Europe/Paris",
-             '120' => "Europe/Helsinki",
-             '180' => "Europe/Moscow",
-             '210' => "Asia/Tehran",
-             '240' => "Asia/Dubai",
-             '300' => "Asia/Karachi",
-             '270' => "Asia/Kabul",
-             '300' => "Asia/Karachi",
-             '330' => "Asia/Kolkata",
-             '345' => "Asia/Katmandu",
-             '360' => "Asia/Yekaterinburg",
-             '390' => "Asia/Rangoon",
-             '420' => "Asia/Krasnoyarsk",
-             '480' => "Asia/Shanghai",
-             '525' => "Australia/Eucla",
-             '540' => "Asia/Tokyo",
-             '570' => "Australia/Adelaide",
-             '600' => "Australia/Melbourne",
-             '630' => "Australia/Lord_Howe",
-             '660' => "Asia/Vladivostok",
-             '690' => "Pacific/Norfolk",
-             '720' => "Pacific/Auckland",
-             '765' => "Pacific/Chatham",
-             '780' => "Pacific/Enderbury",
-             '840' => "Pacific/Kiritimati",
-        );
-
-        return $timezones[(string) intval($offset * 60)];
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_contacts.php b/lib/ext/Roundcube/rcube_contacts.php
deleted file mode 100644
index 5c9e5ab..0000000
--- a/lib/ext/Roundcube/rcube_contacts.php
+++ /dev/null
@@ -1,1004 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Interface to the local address book database                        |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-
-/**
- * Model class for the local address book database
- *
- * @package    Framework
- * @subpackage Addressbook
- */
-class rcube_contacts extends rcube_addressbook
-{
-    // protected for backward compat. with some plugins
-    protected $db_name = 'contacts';
-    protected $db_groups = 'contactgroups';
-    protected $db_groupmembers = 'contactgroupmembers';
-    protected $vcard_fieldmap = array();
-
-    /**
-     * Store database connection.
-     *
-     * @var rcube_db
-     */
-    private $db = null;
-    private $user_id = 0;
-    private $filter = null;
-    private $result = null;
-    private $cache;
-    private $table_cols = array('name', 'email', 'firstname', 'surname');
-    private $fulltext_cols = array('name', 'firstname', 'surname', 'middlename', 'nickname',
-      'jobtitle', 'organization', 'department', 'maidenname', 'email', 'phone',
-      'address', 'street', 'locality', 'zipcode', 'region', 'country', 'website', 'im', 'notes');
-
-    // public properties
-    public $primary_key = 'contact_id';
-    public $name;
-    public $readonly = false;
-    public $groups = true;
-    public $undelete = true;
-    public $list_page = 1;
-    public $page_size = 10;
-    public $group_id = 0;
-    public $ready = false;
-    public $coltypes = array('name', 'firstname', 'surname', 'middlename', 'prefix', 'suffix', 'nickname',
-      'jobtitle', 'organization', 'department', 'assistant', 'manager',
-      'gender', 'maidenname', 'spouse', 'email', 'phone', 'address',
-      'birthday', 'anniversary', 'website', 'im', 'notes', 'photo');
-    public $date_cols = array('birthday', 'anniversary');
-
-    const SEPARATOR = ',';
-
-
-    /**
-     * Object constructor
-     *
-     * @param object  Instance of the rcube_db class
-     * @param integer User-ID
-     */
-    function __construct($dbconn, $user)
-    {
-        $this->db = $dbconn;
-        $this->user_id = $user;
-        $this->ready = $this->db && !$this->db->is_error();
-    }
-
-
-    /**
-     * Returns addressbook name
-     */
-     function get_name()
-     {
-        return $this->name;
-     }
-
-
-    /**
-     * Save a search string for future listings
-     *
-     * @param string SQL params to use in listing method
-     */
-    function set_search_set($filter)
-    {
-        $this->filter = $filter;
-        $this->cache = null;
-    }
-
-
-    /**
-     * Getter for saved search properties
-     *
-     * @return mixed Search properties used by this class
-     */
-    function get_search_set()
-    {
-        return $this->filter;
-    }
-
-
-    /**
-     * Setter for the current group
-     * (empty, has to be re-implemented by extending class)
-     */
-    function set_group($gid)
-    {
-        $this->group_id = $gid;
-        $this->cache = null;
-    }
-
-
-    /**
-     * Reset all saved results and search parameters
-     */
-    function reset()
-    {
-        $this->result = null;
-        $this->filter = null;
-        $this->cache = null;
-    }
-
-
-    /**
-     * List all active contact groups of this source
-     *
-     * @param string  Search string to match group name
-     * @param int     Matching mode:
-     *                0 - partial (*abc*),
-     *                1 - strict (=),
-     *                2 - prefix (abc*)
-     *
-     * @return array  Indexed list of contact groups, each a hash array
-     */
-    function list_groups($search = null, $mode = 0)
-    {
-        $results = array();
-
-        if (!$this->groups)
-            return $results;
-
-        if ($search) {
-            switch (intval($mode)) {
-            case 1:
-                $sql_filter = $this->db->ilike('name', $search);
-                break;
-            case 2:
-                $sql_filter = $this->db->ilike('name', $search . '%');
-                break;
-            default:
-                $sql_filter = $this->db->ilike('name', '%' . $search . '%');
-            }
-
-            $sql_filter = " AND $sql_filter";
-        }
-
-        $sql_result = $this->db->query(
-            "SELECT * FROM ".$this->db->table_name($this->db_groups).
-            " WHERE del<>1".
-            " AND user_id=?".
-            $sql_filter.
-            " ORDER BY name",
-            $this->user_id);
-
-        while ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
-            $sql_arr['ID'] = $sql_arr['contactgroup_id'];
-            $results[]     = $sql_arr;
-        }
-
-        return $results;
-    }
-
-
-    /**
-     * Get group properties such as name and email address(es)
-     *
-     * @param string Group identifier
-     * @return array Group properties as hash array
-     */
-    function get_group($group_id)
-    {
-        $sql_result = $this->db->query(
-            "SELECT * FROM ".$this->db->table_name($this->db_groups).
-            " WHERE del<>1".
-            " AND contactgroup_id=?".
-            " AND user_id=?",
-            $group_id, $this->user_id);
-
-        if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
-            $sql_arr['ID'] = $sql_arr['contactgroup_id'];
-            return $sql_arr;
-        }
-
-        return null;
-    }
-
-    /**
-     * List the current set of contact records
-     *
-     * @param  array   List of cols to show, Null means all
-     * @param  int     Only return this number of records, use negative values for tail
-     * @param  boolean True to skip the count query (select only)
-     * @return array  Indexed list of contact records, each a hash array
-     */
-    function list_records($cols=null, $subset=0, $nocount=false)
-    {
-        if ($nocount || $this->list_page <= 1) {
-            // create dummy result, we don't need a count now
-            $this->result = new rcube_result_set();
-        } else {
-            // count all records
-            $this->result = $this->count();
-        }
-
-        $start_row = $subset < 0 ? $this->result->first + $this->page_size + $subset : $this->result->first;
-        $length = $subset != 0 ? abs($subset) : $this->page_size;
-
-        if ($this->group_id)
-            $join = " LEFT JOIN ".$this->db->table_name($this->db_groupmembers)." AS m".
-                " ON (m.contact_id = c.".$this->primary_key.")";
-
-        $order_col = (in_array($this->sort_col, $this->table_cols) ? $this->sort_col : 'name');
-        $order_cols = array('c.'.$order_col);
-        if ($order_col == 'firstname')
-            $order_cols[] = 'c.surname';
-        else if ($order_col == 'surname')
-            $order_cols[] = 'c.firstname';
-        if ($order_col != 'name')
-            $order_cols[] = 'c.name';
-        $order_cols[] = 'c.email';
-
-        $sql_result = $this->db->limitquery(
-            "SELECT * FROM ".$this->db->table_name($this->db_name)." AS c" .
-            $join .
-            " WHERE c.del<>1" .
-                " AND c.user_id=?" .
-                ($this->group_id ? " AND m.contactgroup_id=?" : "").
-                ($this->filter ? " AND (".$this->filter.")" : "") .
-            " ORDER BY ". $this->db->concat($order_cols) .
-            " " . $this->sort_order,
-            $start_row,
-            $length,
-            $this->user_id,
-            $this->group_id);
-
-        // determine whether we have to parse the vcard or if only db cols are requested
-        $read_vcard = !$cols || count(array_intersect($cols, $this->table_cols)) < count($cols);
-
-        while ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
-            $sql_arr['ID'] = $sql_arr[$this->primary_key];
-
-            if ($read_vcard)
-                $sql_arr = $this->convert_db_data($sql_arr);
-            else {
-                $sql_arr['email'] = explode(self::SEPARATOR, $sql_arr['email']);
-                $sql_arr['email'] = array_map('trim', $sql_arr['email']);
-            }
-
-            $this->result->add($sql_arr);
-        }
-
-        $cnt = count($this->result->records);
-
-        // update counter
-        if ($nocount)
-            $this->result->count = $cnt;
-        else if ($this->list_page <= 1) {
-            if ($cnt < $this->page_size && $subset == 0)
-                $this->result->count = $cnt;
-            else if (isset($this->cache['count']))
-                $this->result->count = $this->cache['count'];
-            else
-                $this->result->count = $this->_count();
-        }
-
-        return $this->result;
-    }
-
-
-    /**
-     * Search contacts
-     *
-     * @param mixed   $fields   The field name of array of field names to search in
-     * @param mixed   $value    Search value (or array of values when $fields is array)
-     * @param int     $mode     Matching mode:
-     *                          0 - partial (*abc*),
-     *                          1 - strict (=),
-     *                          2 - prefix (abc*)
-     * @param boolean $select   True if results are requested, False if count only
-     * @param boolean $nocount  True to skip the count query (select only)
-     * @param array   $required List of fields that cannot be empty
-     *
-     * @return object rcube_result_set Contact records and 'count' value
-     */
-    function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array())
-    {
-        if (!is_array($fields))
-            $fields = array($fields);
-        if (!is_array($required) && !empty($required))
-            $required = array($required);
-
-        $where = $and_where = array();
-        $mode = intval($mode);
-        $WS = ' ';
-        $AS = self::SEPARATOR;
-
-        foreach ($fields as $idx => $col) {
-            // direct ID search
-            if ($col == 'ID' || $col == $this->primary_key) {
-                $ids     = !is_array($value) ? explode(self::SEPARATOR, $value) : $value;
-                $ids     = $this->db->array2list($ids, 'integer');
-                $where[] = 'c.' . $this->primary_key.' IN ('.$ids.')';
-                continue;
-            }
-            // fulltext search in all fields
-            else if ($col == '*') {
-                $words = array();
-                foreach (explode($WS, rcube_utils::normalize_string($value)) as $word) {
-                    switch ($mode) {
-                    case 1: // strict
-                        $words[] = '(' . $this->db->ilike('words', $word . '%')
-                            . ' OR ' . $this->db->ilike('words', '%' . $WS . $word . $WS . '%')
-                            . ' OR ' . $this->db->ilike('words', '%' . $WS . $word) . ')';
-                        break;
-                    case 2: // prefix
-                        $words[] = '(' . $this->db->ilike('words', $word . '%')
-                            . ' OR ' . $this->db->ilike('words', '%' . $WS . $word . '%') . ')';
-                        break;
-                    default: // partial
-                        $words[] = $this->db->ilike('words', '%' . $word . '%');
-                    }
-                }
-                $where[] = '(' . join(' AND ', $words) . ')';
-            }
-            else {
-                $val = is_array($value) ? $value[$idx] : $value;
-                // table column
-                if (in_array($col, $this->table_cols)) {
-                    switch ($mode) {
-                    case 1: // strict
-                        $where[] = '(' . $this->db->quoteIdentifier($col) . ' = ' . $this->db->quote($val)
-                            . ' OR ' . $this->db->ilike($col, $val . $AS . '%')
-                            . ' OR ' . $this->db->ilike($col, '%' . $AS . $val . $AS . '%')
-                            . ' OR ' . $this->db->ilike($col, '%' . $AS . $val) . ')';
-                        break;
-                    case 2: // prefix
-                        $where[] = '(' . $this->db->ilike($col, $val . '%')
-                            . ' OR ' . $this->db->ilike($col, $AS . $val . '%') . ')';
-                        break;
-                    default: // partial
-                        $where[] = $this->db->ilike($col, '%' . $val . '%');
-                    }
-                }
-                // vCard field
-                else {
-                    if (in_array($col, $this->fulltext_cols)) {
-                        foreach (rcube_utils::normalize_string($val, true) as $word) {
-                            switch ($mode) {
-                            case 1: // strict
-                                $words[] = '(' . $this->db->ilike('words', $word . $WS . '%')
-                                    . ' OR ' . $this->db->ilike('words', '%' . $AS . $word . $WS .'%')
-                                    . ' OR ' . $this->db->ilike('words', '%' . $AS . $word) . ')';
-                                break;
-                            case 2: // prefix
-                                $words[] = '(' . $this->db->ilike('words', $word . '%')
-                                    . ' OR ' . $this->db->ilike('words', $AS . $word . '%') . ')';
-                                break;
-                            default: // partial
-                                $words[] = $this->db->ilike('words', '%' . $word . '%');
-                            }
-                        }
-                        $where[] = '(' . join(' AND ', $words) . ')';
-                    }
-                    if (is_array($value))
-                        $post_search[$col] = mb_strtolower($val);
-                }
-            }
-        }
-
-        foreach (array_intersect($required, $this->table_cols) as $col) {
-            $and_where[] = $this->db->quoteIdentifier($col).' <> '.$this->db->quote('');
-        }
-
-        if (!empty($where)) {
-            // use AND operator for advanced searches
-            $where = join(is_array($value) ? ' AND ' : ' OR ', $where);
-        }
-
-        if (!empty($and_where))
-            $where = ($where ? "($where) AND " : '') . join(' AND ', $and_where);
-
-        // Post-searching in vCard data fields
-        // we will search in all records and then build a where clause for their IDs
-        if (!empty($post_search)) {
-            $ids = array(0);
-            // build key name regexp
-            $regexp = '/^(' . implode(array_keys($post_search), '|') . ')(?:.*)$/';
-            // use initial WHERE clause, to limit records number if possible
-            if (!empty($where))
-                $this->set_search_set($where);
-
-            // count result pages
-            $cnt   = $this->count();
-            $pages = ceil($cnt / $this->page_size);
-            $scnt  = count($post_search);
-
-            // get (paged) result
-            for ($i=0; $i<$pages; $i++) {
-                $this->list_records(null, $i, true);
-                while ($row = $this->result->next()) {
-                    $id    = $row[$this->primary_key];
-                    $found = array();
-                    foreach (preg_grep($regexp, array_keys($row)) as $col) {
-                        $pos     = strpos($col, ':');
-                        $colname = $pos ? substr($col, 0, $pos) : $col;
-                        $search  = $post_search[$colname];
-                        foreach ((array)$row[$col] as $value) {
-                            if ($this->compare_search_value($colname, $value, $search, $mode)) {
-                                $found[$colname] = true;
-                                break 2;
-                            }
-                        }
-                    }
-                    // all fields match
-                    if (count($found) >= $scnt) {
-                        $ids[] = $id;
-                    }
-                }
-            }
-
-            // build WHERE clause
-            $ids = $this->db->array2list($ids, 'integer');
-            $where = 'c.' . $this->primary_key.' IN ('.$ids.')';
-            // reset counter
-            unset($this->cache['count']);
-
-            // when we know we have an empty result
-            if ($ids == '0') {
-                $this->set_search_set($where);
-                return ($this->result = new rcube_result_set(0, 0));
-            }
-        }
-
-        if (!empty($where)) {
-            $this->set_search_set($where);
-            if ($select)
-                $this->list_records(null, 0, $nocount);
-            else
-                $this->result = $this->count();
-        }
-
-        return $this->result;
-    }
-
-
-    /**
-     * Count number of available contacts in database
-     *
-     * @return rcube_result_set Result object
-     */
-    function count()
-    {
-        $count = isset($this->cache['count']) ? $this->cache['count'] : $this->_count();
-
-        return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
-    }
-
-
-    /**
-     * Count number of available contacts in database
-     *
-     * @return int Contacts count
-     */
-    private function _count()
-    {
-        if ($this->group_id)
-            $join = " LEFT JOIN ".$this->db->table_name($this->db_groupmembers)." AS m".
-                " ON (m.contact_id=c.".$this->primary_key.")";
-
-        // count contacts for this user
-        $sql_result = $this->db->query(
-            "SELECT COUNT(c.contact_id) AS rows".
-            " FROM ".$this->db->table_name($this->db_name)." AS c".
-                $join.
-            " WHERE c.del<>1".
-            " AND c.user_id=?".
-            ($this->group_id ? " AND m.contactgroup_id=?" : "").
-            ($this->filter ? " AND (".$this->filter.")" : ""),
-            $this->user_id,
-            $this->group_id
-        );
-
-        $sql_arr = $this->db->fetch_assoc($sql_result);
-
-        $this->cache['count'] = (int) $sql_arr['rows'];
-
-        return $this->cache['count'];
-    }
-
-
-    /**
-     * Return the last result set
-     *
-     * @return mixed Result array or NULL if nothing selected yet
-     */
-    function get_result()
-    {
-        return $this->result;
-    }
-
-
-    /**
-     * Get a specific contact record
-     *
-     * @param mixed record identifier(s)
-     * @return mixed Result object with all record fields or False if not found
-     */
-    function get_record($id, $assoc=false)
-    {
-        // return cached result
-        if ($this->result && ($first = $this->result->first()) && $first[$this->primary_key] == $id)
-            return $assoc ? $first : $this->result;
-
-        $this->db->query(
-            "SELECT * FROM ".$this->db->table_name($this->db_name).
-            " WHERE contact_id=?".
-                " AND user_id=?".
-                " AND del<>1",
-            $id,
-            $this->user_id
-        );
-
-        if ($sql_arr = $this->db->fetch_assoc()) {
-            $record = $this->convert_db_data($sql_arr);
-            $this->result = new rcube_result_set(1);
-            $this->result->add($record);
-        }
-
-        return $assoc && $record ? $record : $this->result;
-    }
-
-
-    /**
-     * Get group assignments of a specific contact record
-     *
-     * @param mixed Record identifier
-     * @return array List of assigned groups as ID=>Name pairs
-     */
-    function get_record_groups($id)
-    {
-      $results = array();
-
-      if (!$this->groups)
-          return $results;
-
-      $sql_result = $this->db->query(
-        "SELECT cgm.contactgroup_id, cg.name FROM " . $this->db->table_name($this->db_groupmembers) . " AS cgm" .
-        " LEFT JOIN " . $this->db->table_name($this->db_groups) . " AS cg ON (cgm.contactgroup_id = cg.contactgroup_id AND cg.del<>1)" .
-        " WHERE cgm.contact_id=?",
-        $id
-      );
-      while ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
-        $results[$sql_arr['contactgroup_id']] = $sql_arr['name'];
-      }
-
-      return $results;
-    }
-
-
-    /**
-     * Check the given data before saving.
-     * If input not valid, the message to display can be fetched using get_error()
-     *
-     * @param array Assoziative array with data to save
-     * @param boolean Try to fix/complete record automatically
-     * @return boolean True if input is valid, False if not.
-     */
-    public function validate(&$save_data, $autofix = false)
-    {
-        // validate e-mail addresses
-        $valid = parent::validate($save_data, $autofix);
-
-        // require at least one email address or a name
-        if ($valid && !strlen($save_data['firstname'].$save_data['surname'].$save_data['name']) && !array_filter($this->get_col_values('email', $save_data, true))) {
-            $this->set_error(self::ERROR_VALIDATE, 'noemailwarning');
-            $valid = false;
-        }
-
-        return $valid;
-    }
-
-
-    /**
-     * Create a new contact record
-     *
-     * @param array Associative array with save data
-     * @return integer|boolean The created record ID on success, False on error
-     */
-    function insert($save_data, $check=false)
-    {
-        if (!is_array($save_data))
-            return false;
-
-        $insert_id = $existing = false;
-
-        if ($check) {
-            foreach ($save_data as $col => $values) {
-                if (strpos($col, 'email') === 0) {
-                    foreach ((array)$values as $email) {
-                        if ($existing = $this->search('email', $email, false, false))
-                            break 2;
-                    }
-                }
-            }
-        }
-
-        $save_data = $this->convert_save_data($save_data);
-        $a_insert_cols = $a_insert_values = array();
-
-        foreach ($save_data as $col => $value) {
-            $a_insert_cols[]   = $this->db->quoteIdentifier($col);
-            $a_insert_values[] = $this->db->quote($value);
-        }
-
-        if (!$existing->count && !empty($a_insert_cols)) {
-            $this->db->query(
-                "INSERT INTO ".$this->db->table_name($this->db_name).
-                " (user_id, changed, del, ".join(', ', $a_insert_cols).")".
-                " VALUES (".intval($this->user_id).", ".$this->db->now().", 0, ".join(', ', $a_insert_values).")"
-            );
-
-            $insert_id = $this->db->insert_id($this->db_name);
-        }
-
-        $this->cache = null;
-
-        return $insert_id;
-    }
-
-
-    /**
-     * Update a specific contact record
-     *
-     * @param mixed Record identifier
-     * @param array Assoziative array with save data
-     * @return boolean True on success, False on error
-     */
-    function update($id, $save_cols)
-    {
-        $updated = false;
-        $write_sql = array();
-        $record = $this->get_record($id, true);
-        $save_cols = $this->convert_save_data($save_cols, $record);
-
-        foreach ($save_cols as $col => $value) {
-            $write_sql[] = sprintf("%s=%s", $this->db->quoteIdentifier($col), $this->db->quote($value));
-        }
-
-        if (!empty($write_sql)) {
-            $this->db->query(
-                "UPDATE ".$this->db->table_name($this->db_name).
-                " SET changed=".$this->db->now().", ".join(', ', $write_sql).
-                " WHERE contact_id=?".
-                    " AND user_id=?".
-                    " AND del<>1",
-                $id,
-                $this->user_id
-            );
-
-            $updated = $this->db->affected_rows();
-            $this->result = null;  // clear current result (from get_record())
-        }
-
-        return $updated;
-    }
-
-
-    private function convert_db_data($sql_arr)
-    {
-        $record = array();
-        $record['ID'] = $sql_arr[$this->primary_key];
-
-        if ($sql_arr['vcard']) {
-            unset($sql_arr['email']);
-            $vcard = new rcube_vcard($sql_arr['vcard'], RCUBE_CHARSET, false, $this->vcard_fieldmap);
-            $record += $vcard->get_assoc() + $sql_arr;
-        }
-        else {
-            $record += $sql_arr;
-            $record['email'] = explode(self::SEPARATOR, $record['email']);
-            $record['email'] = array_map('trim', $record['email']);
-        }
-
-        return $record;
-    }
-
-
-    private function convert_save_data($save_data, $record = array())
-    {
-        $out = array();
-        $words = '';
-
-        // copy values into vcard object
-        $vcard = new rcube_vcard($record['vcard'] ? $record['vcard'] : $save_data['vcard'], RCUBE_CHARSET, false, $this->vcard_fieldmap);
-        $vcard->reset();
-        foreach ($save_data as $key => $values) {
-            list($field, $section) = explode(':', $key);
-            $fulltext = in_array($field, $this->fulltext_cols);
-            // avoid casting DateTime objects to array
-            if (is_object($values) && is_a($values, 'DateTime')) {
-                $values = array(0 => $values);
-            }
-            foreach ((array)$values as $value) {
-                if (isset($value))
-                    $vcard->set($field, $value, $section);
-                if ($fulltext && is_array($value))
-                    $words .= ' ' . rcube_utils::normalize_string(join(" ", $value));
-                else if ($fulltext && strlen($value) >= 3)
-                    $words .= ' ' . rcube_utils::normalize_string($value);
-            }
-        }
-        $out['vcard'] = $vcard->export(false);
-
-        foreach ($this->table_cols as $col) {
-            $key = $col;
-            if (!isset($save_data[$key]))
-                $key .= ':home';
-            if (isset($save_data[$key])) {
-                if (is_array($save_data[$key]))
-                    $out[$col] = join(self::SEPARATOR, $save_data[$key]);
-                else
-                    $out[$col] = $save_data[$key];
-            }
-        }
-
-        // save all e-mails in database column
-        $out['email'] = join(self::SEPARATOR, $vcard->email);
-
-        // join words for fulltext search
-        $out['words'] = join(" ", array_unique(explode(" ", $words)));
-
-        return $out;
-    }
-
-
-    /**
-     * Mark one or more contact records as deleted
-     *
-     * @param array   Record identifiers
-     * @param boolean Remove record(s) irreversible (unsupported)
-     */
-    function delete($ids, $force=true)
-    {
-        if (!is_array($ids))
-            $ids = explode(self::SEPARATOR, $ids);
-
-        $ids = $this->db->array2list($ids, 'integer');
-
-        // flag record as deleted (always)
-        $this->db->query(
-            "UPDATE ".$this->db->table_name($this->db_name).
-            " SET del=1, changed=".$this->db->now().
-            " WHERE user_id=?".
-                " AND contact_id IN ($ids)",
-            $this->user_id
-        );
-
-        $this->cache = null;
-
-        return $this->db->affected_rows();
-    }
-
-
-    /**
-     * Undelete one or more contact records
-     *
-     * @param array  Record identifiers
-     */
-    function undelete($ids)
-    {
-        if (!is_array($ids))
-            $ids = explode(self::SEPARATOR, $ids);
-
-        $ids = $this->db->array2list($ids, 'integer');
-
-        // clear deleted flag
-        $this->db->query(
-            "UPDATE ".$this->db->table_name($this->db_name).
-            " SET del=0, changed=".$this->db->now().
-            " WHERE user_id=?".
-                " AND contact_id IN ($ids)",
-            $this->user_id
-        );
-
-        $this->cache = null;
-
-        return $this->db->affected_rows();
-    }
-
-
-    /**
-     * Remove all records from the database
-     */
-    function delete_all()
-    {
-        $this->cache = null;
-
-        $this->db->query("UPDATE ".$this->db->table_name($this->db_name).
-            " SET del=1, changed=".$this->db->now().
-            " WHERE user_id = ?", $this->user_id);
-
-        return $this->db->affected_rows();
-    }
-
-
-    /**
-     * Create a contact group with the given name
-     *
-     * @param string The group name
-     * @return mixed False on error, array with record props in success
-     */
-    function create_group($name)
-    {
-        $result = false;
-
-        // make sure we have a unique name
-        $name = $this->unique_groupname($name);
-
-        $this->db->query(
-            "INSERT INTO ".$this->db->table_name($this->db_groups).
-            " (user_id, changed, name)".
-            " VALUES (".intval($this->user_id).", ".$this->db->now().", ".$this->db->quote($name).")"
-        );
-
-        if ($insert_id = $this->db->insert_id($this->db_groups))
-            $result = array('id' => $insert_id, 'name' => $name);
-
-        return $result;
-    }
-
-
-    /**
-     * Delete the given group (and all linked group members)
-     *
-     * @param string Group identifier
-     * @return boolean True on success, false if no data was changed
-     */
-    function delete_group($gid)
-    {
-        // flag group record as deleted
-        $sql_result = $this->db->query(
-            "UPDATE ".$this->db->table_name($this->db_groups).
-            " SET del=1, changed=".$this->db->now().
-            " WHERE contactgroup_id=?".
-            " AND user_id=?",
-            $gid, $this->user_id
-        );
-
-        $this->cache = null;
-
-        return $this->db->affected_rows();
-    }
-
-
-    /**
-     * Rename a specific contact group
-     *
-     * @param string Group identifier
-     * @param string New name to set for this group
-     * @return boolean New name on success, false if no data was changed
-     */
-    function rename_group($gid, $newname, &$new_gid)
-    {
-        // make sure we have a unique name
-        $name = $this->unique_groupname($newname);
-
-        $sql_result = $this->db->query(
-            "UPDATE ".$this->db->table_name($this->db_groups).
-            " SET name=?, changed=".$this->db->now().
-            " WHERE contactgroup_id=?".
-            " AND user_id=?",
-            $name, $gid, $this->user_id
-        );
-
-        return $this->db->affected_rows() ? $name : false;
-    }
-
-
-    /**
-     * Add the given contact records the a certain group
-     *
-     * @param string       Group identifier
-     * @param array|string List of contact identifiers to be added
-     *
-     * @return int Number of contacts added
-     */
-    function add_to_group($group_id, $ids)
-    {
-        if (!is_array($ids))
-            $ids = explode(self::SEPARATOR, $ids);
-
-        $added = 0;
-        $exists = array();
-
-        // get existing assignments ...
-        $sql_result = $this->db->query(
-            "SELECT contact_id FROM ".$this->db->table_name($this->db_groupmembers).
-            " WHERE contactgroup_id=?".
-                " AND contact_id IN (".$this->db->array2list($ids, 'integer').")",
-            $group_id
-        );
-        while ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
-            $exists[] = $sql_arr['contact_id'];
-        }
-        // ... and remove them from the list
-        $ids = array_diff($ids, $exists);
-
-        foreach ($ids as $contact_id) {
-            $this->db->query(
-                "INSERT INTO ".$this->db->table_name($this->db_groupmembers).
-                " (contactgroup_id, contact_id, created)".
-                " VALUES (?, ?, ".$this->db->now().")",
-                $group_id,
-                $contact_id
-            );
-
-            if ($error = $this->db->is_error())
-                $this->set_error(self::ERROR_SAVING, $error);
-            else
-                $added++;
-        }
-
-        return $added;
-    }
-
-
-    /**
-     * Remove the given contact records from a certain group
-     *
-     * @param string       Group identifier
-     * @param array|string List of contact identifiers to be removed
-     *
-     * @return int Number of deleted group members
-     */
-    function remove_from_group($group_id, $ids)
-    {
-        if (!is_array($ids))
-            $ids = explode(self::SEPARATOR, $ids);
-
-        $ids = $this->db->array2list($ids, 'integer');
-
-        $sql_result = $this->db->query(
-            "DELETE FROM ".$this->db->table_name($this->db_groupmembers).
-            " WHERE contactgroup_id=?".
-                " AND contact_id IN ($ids)",
-            $group_id
-        );
-
-        return $this->db->affected_rows();
-    }
-
-
-    /**
-     * Check for existing groups with the same name
-     *
-     * @param string Name to check
-     * @return string A group name which is unique for the current use
-     */
-    private function unique_groupname($name)
-    {
-        $checkname = $name;
-        $num = 2; $hit = false;
-
-        do {
-            $sql_result = $this->db->query(
-                "SELECT 1 FROM ".$this->db->table_name($this->db_groups).
-                " WHERE del<>1".
-                    " AND user_id=?".
-                    " AND name=?",
-                $this->user_id,
-                $checkname);
-
-            // append number to make name unique
-            if ($hit = $this->db->fetch_array($sql_result)) {
-                $checkname = $name . ' ' . $num++;
-            }
-        } while ($hit);
-
-        return $checkname;
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_content_filter.php b/lib/ext/Roundcube/rcube_content_filter.php
deleted file mode 100644
index ae6617d..0000000
--- a/lib/ext/Roundcube/rcube_content_filter.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   PHP stream filter to detect evil content in mail attachments        |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * PHP stream filter to detect html/javascript code in attachments
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_content_filter extends php_user_filter
-{
-    private $buffer = '';
-    private $cutoff = 2048;
-
-    function onCreate()
-    {
-        $this->cutoff = rand(2048, 3027);
-        return true;
-    }
-
-    function filter($in, $out, &$consumed, $closing)
-    {
-        while ($bucket = stream_bucket_make_writeable($in)) {
-            $this->buffer .= $bucket->data;
-
-            // check for evil content and abort
-            if (preg_match('/<(script|iframe|object)/i', $this->buffer)) {
-                return PSFS_ERR_FATAL;
-            }
-
-            // keep buffer small enough
-            if (strlen($this->buffer) > 4096) {
-                $this->buffer = substr($this->buffer, $this->cutoff);
-            }
-
-            $consumed += $bucket->datalen;
-            stream_bucket_append($out, $bucket);
-        }
-
-        return PSFS_PASS_ON;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_csv2vcard.php b/lib/ext/Roundcube/rcube_csv2vcard.php
deleted file mode 100644
index 00e6d4e..0000000
--- a/lib/ext/Roundcube/rcube_csv2vcard.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   CSV to vCard data conversion                                        |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * CSV to vCard data converter
- *
- * @package    Framework
- * @subpackage Addressbook
- * @author     Aleksander Machniak <alec@alec.pl>
- */
-class rcube_csv2vcard
-{
-    /**
-     * CSV to vCard fields mapping
-     *
-     * @var array
-     */
-    protected $csv2vcard_map = array(
-        // MS Outlook 2010
-        'anniversary'           => 'anniversary',
-        'assistants_name'       => 'assistant',
-        'assistants_phone'      => 'phone:assistant',
-        'birthday'              => 'birthday',
-        'business_city'         => 'locality:work',
-        'business_countryregion' => 'country:work',
-        'business_fax'          => 'phone:work,fax',
-        'business_phone'        => 'phone:work',
-        'business_phone_2'      => 'phone:work2',
-        'business_postal_code'  => 'zipcode:work',
-        'business_state'        => 'region:work',
-        'business_street'       => 'street:work',
-        //'business_street_2'     => '',
-        //'business_street_3'     => '',
-        'car_phone'             => 'phone:car',
-        'categories'            => 'categories',
-        //'children'              => '',
-        'company'               => 'organization',
-        //'company_main_phone'    => '',
-        'department'            => 'department',
-        //'email_2_address'       => '', //@TODO
-        //'email_2_type'          => '',
-        //'email_3_address'       => '', //@TODO
-        //'email_3_type'          => '',
-        'email_address'         => 'email:main',
-        //'email_type'            => '',
-        'first_name'            => 'firstname',
-        'gender'                => 'gender',
-        'home_city'             => 'locality:home',
-        'home_countryregion'    => 'country:home',
-        'home_fax'              => 'phone:home,fax',
-        'home_phone'            => 'phone:home',
-        'home_phone_2'          => 'phone:home2',
-        'home_postal_code'      => 'zipcode:home',
-        'home_state'            => 'region:home',
-        'home_street'           => 'street:home',
-        //'home_street_2'         => '',
-        //'home_street_3'         => '',
-        //'initials'              => '',
-        //'isdn'                  => '',
-        'job_title'             => 'jobtitle',
-        //'keywords'              => '',
-        //'language'              => '',
-        'last_name'             => 'surname',
-        //'location'              => '',
-        'managers_name'         => 'manager',
-        'middle_name'           => 'middlename',
-        //'mileage'               => '',
-        'mobile_phone'          => 'phone:cell',
-        'notes'                 => 'notes',
-        //'office_location'       => '',
-        'other_city'            => 'locality:other',
-        'other_countryregion'   => 'country:other',
-        'other_fax'             => 'phone:other,fax',
-        'other_phone'           => 'phone:other',
-        'other_postal_code'     => 'zipcode:other',
-        'other_state'           => 'region:other',
-        'other_street'          => 'street:other',
-        //'other_street_2'        => '',
-        //'other_street_3'        => '',
-        'pager'                 => 'phone:pager',
-        'primary_phone'         => 'phone:pref',
-        //'profession'            => '',
-        //'radio_phone'           => '',
-        'spouse'                => 'spouse',
-        'suffix'                => 'suffix',
-        'title'                 => 'title',
-        'web_page'              => 'website:homepage',
-
-        // Thunderbird
-        'birth_day'             => 'birthday-d',
-        'birth_month'           => 'birthday-m',
-        'birth_year'            => 'birthday-y',
-        'display_name'          => 'displayname',
-        'fax_number'            => 'phone:fax',
-        'home_address'          => 'street:home',
-        //'home_address_2'        => '',
-        'home_country'          => 'country:home',
-        'home_zipcode'          => 'zipcode:home',
-        'mobile_number'         => 'phone:cell',
-        'nickname'              => 'nickname',
-        'organization'          => 'organization',
-        'pager_number'          => 'phone:pager',
-        'primary_email'         => 'email:pref',
-        'secondary_email'       => 'email:other',
-        'web_page_1'            => 'website:homepage',
-        'web_page_2'            => 'website:other',
-        'work_phone'            => 'phone:work',
-        'work_address'          => 'street:work',
-        //'work_address_2'        => '',
-        'work_country'          => 'country:work',
-        'work_zipcode'          => 'zipcode:work',
-        'last'                  => 'surname',
-        'first'                 => 'firstname',
-        'work_city'             => 'locality:work',
-        'work_state'            => 'region:work',
-        'home_city_short'       => 'locality:home',
-        'home_state_short'      => 'region:home',
-
-        // Atmail
-        'date_of_birth'         => 'birthday',
-        'email'                 => 'email:pref',
-        'home_mobile'           => 'phone:cell',
-        'home_zip'              => 'zipcode:home',
-        'info'                  => 'notes',
-        'user_photo'            => 'photo',
-        'url'                   => 'website:homepage',
-        'work_company'          => 'organization',
-        'work_dept'             => 'departament',
-        'work_fax'              => 'phone:work,fax',
-        'work_mobile'           => 'phone:work,cell',
-        'work_title'            => 'jobtitle',
-        'work_zip'              => 'zipcode:work',
-        'group'                 => 'groups',
-    );
-
-    /**
-     * CSV label to text mapping for English
-     *
-     * @var array
-     */
-    protected $label_map = array(
-        // MS Outlook 2010
-        'anniversary'       => "Anniversary",
-        'assistants_name'   => "Assistant's Name",
-        'assistants_phone'  => "Assistant's Phone",
-        'birthday'          => "Birthday",
-        'business_city'     => "Business City",
-        'business_countryregion' => "Business Country/Region",
-        'business_fax'      => "Business Fax",
-        'business_phone'    => "Business Phone",
-        'business_phone_2'  => "Business Phone 2",
-        'business_postal_code' => "Business Postal Code",
-        'business_state'    => "Business State",
-        'business_street'   => "Business Street",
-        //'business_street_2' => "Business Street 2",
-        //'business_street_3' => "Business Street 3",
-        'car_phone'         => "Car Phone",
-        'categories'        => "Categories",
-        //'children'          => "Children",
-        'company'           => "Company",
-        //'company_main_phone' => "Company Main Phone",
-        'department'        => "Department",
-        //'directory_server'  => "Directory Server",
-        //'email_2_address'   => "E-mail 2 Address",
-        //'email_2_type'      => "E-mail 2 Type",
-        //'email_3_address'   => "E-mail 3 Address",
-        //'email_3_type'      => "E-mail 3 Type",
-        'email_address'     => "E-mail Address",
-        //'email_type'        => "E-mail Type",
-        'first_name'        => "First Name",
-        'gender'            => "Gender",
-        'home_city'         => "Home City",
-        'home_countryregion' => "Home Country/Region",
-        'home_fax'          => "Home Fax",
-        'home_phone'        => "Home Phone",
-        'home_phone_2'      => "Home Phone 2",
-        'home_postal_code'  => "Home Postal Code",
-        'home_state'        => "Home State",
-        'home_street'       => "Home Street",
-        //'home_street_2'     => "Home Street 2",
-        //'home_street_3'     => "Home Street 3",
-        //'initials'          => "Initials",
-        //'isdn'              => "ISDN",
-        'job_title'         => "Job Title",
-        //'keywords'          => "Keywords",
-        //'language'          => "Language",
-        'last_name'         => "Last Name",
-        //'location'          => "Location",
-        'managers_name'     => "Manager's Name",
-        'middle_name'       => "Middle Name",
-        //'mileage'           => "Mileage",
-        'mobile_phone'      => "Mobile Phone",
-        'notes'             => "Notes",
-        //'office_location'   => "Office Location",
-        'other_city'        => "Other City",
-        'other_countryregion' => "Other Country/Region",
-        'other_fax'         => "Other Fax",
-        'other_phone'       => "Other Phone",
-        'other_postal_code' => "Other Postal Code",
-        'other_state'       => "Other State",
-        'other_street'      => "Other Street",
-        //'other_street_2'    => "Other Street 2",
-        //'other_street_3'    => "Other Street 3",
-        'pager'             => "Pager",
-        'primary_phone'     => "Primary Phone",
-        //'profession'        => "Profession",
-        //'radio_phone'       => "Radio Phone",
-        'spouse'            => "Spouse",
-        'suffix'            => "Suffix",
-        'title'             => "Title",
-        'web_page'          => "Web Page",
-
-        // Thunderbird
-        'birth_day'         => "Birth Day",
-        'birth_month'       => "Birth Month",
-        'birth_year'        => "Birth Year",
-        'display_name'      => "Display Name",
-        'fax_number'        => "Fax Number",
-        'home_address'      => "Home Address",
-        //'home_address_2'    => "Home Address 2",
-        'home_country'      => "Home Country",
-        'home_zipcode'      => "Home ZipCode",
-        'mobile_number'     => "Mobile Number",
-        'nickname'          => "Nickname",
-        'organization'      => "Organization",
-        'pager_number'      => "Pager Namber",
-        'primary_email'     => "Primary Email",
-        'secondary_email'   => "Secondary Email",
-        'web_page_1'        => "Web Page 1",
-        'web_page_2'        => "Web Page 2",
-        'work_phone'        => "Work Phone",
-        'work_address'      => "Work Address",
-        //'work_address_2'    => "Work Address 2",
-        'work_city'         => "Work City",
-        'work_country'      => "Work Country",
-        'work_state'        => "Work State",
-        'work_zipcode'      => "Work ZipCode",
-
-        // Atmail
-        'date_of_birth'     => "Date of Birth",
-        'email'             => "Email",
-        //'email_2'         => "Email2",
-        //'email_3'         => "Email3",
-        //'email_4'         => "Email4",
-        //'email_5'         => "Email5",
-        'home_mobile'       => "Home Mobile",
-        'home_zip'          => "Home Zip",
-        'info'              => "Info",
-        'user_photo'        => "User Photo",
-        'url'               => "URL",
-        'work_company'      => "Work Company",
-        'work_dept'         => "Work Dept",
-        'work_fax'          => "Work Fax",
-        'work_mobile'       => "Work Mobile",
-        'work_title'        => "Work Title",
-        'work_zip'          => "Work Zip",
-        'groups'            => "Group",
-    );
-
-    protected $local_label_map = array();
-    protected $vcards = array();
-    protected $map = array();
-
-
-    /**
-     * Class constructor
-     *
-     * @param string $lang File language
-     */
-    public function __construct($lang = 'en_US')
-    {
-        // Localize fields map
-        if ($lang && $lang != 'en_US') {
-            if (file_exists(RCUBE_LOCALIZATION_DIR . "$lang/csv2vcard.inc")) {
-                include RCUBE_LOCALIZATION_DIR . "$lang/csv2vcard.inc";
-            }
-
-            if (!empty($map)) {
-                $this->local_label_map = array_merge($this->label_map, $map);
-            }
-        }
-
-        $this->label_map = array_flip($this->label_map);
-        $this->local_label_map = array_flip($this->local_label_map);
-    }
-
-    /**
-     *
-     */
-    public function import($csv)
-    {
-        // convert to UTF-8
-        $head     = substr($csv, 0, 4096);
-        $charset  = rcube_charset::detect($head, RCUBE_CHARSET);
-        $csv      = rcube_charset::convert($csv, $charset);
-        $head     = '';
-
-        $this->map = array();
-
-        // Parse file
-        foreach (preg_split("/[\r\n]+/", $csv) as $line) {
-            $elements = $this->parse_line($line);
-            if (empty($elements)) {
-                continue;
-            }
-
-            // Parse header
-            if (empty($this->map)) {
-                $this->parse_header($elements);
-                if (empty($this->map)) {
-                    break;
-                }
-            }
-            // Parse data row
-            else {
-                $this->csv_to_vcard($elements);
-            }
-        }
-    }
-
-    /**
-     * @return array rcube_vcard List of vcards
-     */
-    public function export()
-    {
-        return $this->vcards;
-    }
-
-    /**
-     * Parse CSV file line
-     */
-    protected function parse_line($line)
-    {
-        $line = trim($line);
-        if (empty($line)) {
-            return null;
-        }
-
-        $fields = rcube_utils::explode_quoted_string(',', $line);
-
-        // remove quotes if needed
-        if (!empty($fields)) {
-            foreach ($fields as $idx => $value) {
-                if (($len = strlen($value)) > 1 && $value[0] == '"' && $value[$len-1] == '"') {
-                    // remove surrounding quotes
-                    $value = substr($value, 1, -1);
-                    // replace doubled quotes inside the string with single quote
-                    $value = str_replace('""', '"', $value);
-
-                    $fields[$idx] = $value;
-                }
-            }
-        }
-
-        return $fields;
-    }
-
-    /**
-     * Parse CSV header line, detect fields mapping
-     */
-    protected function parse_header($elements)
-    {
-        $map1 = array();
-        $map2 = array();
-        $size = count($elements);
-
-        // check English labels
-        for ($i = 0; $i < $size; $i++) {
-            $label = $this->label_map[$elements[$i]];
-            if ($label && !empty($this->csv2vcard_map[$label])) {
-                $map1[$i] = $this->csv2vcard_map[$label];
-            }
-        }
-        // check localized labels
-        if (!empty($this->local_label_map)) {
-            for ($i = 0; $i < $size; $i++) {
-                $label = $this->local_label_map[$elements[$i]];
-
-                // special localization label
-                if ($label && $label[0] == '_') {
-                    $label = substr($label, 1);
-                }
-
-                if ($label && !empty($this->csv2vcard_map[$label])) {
-                    $map2[$i] = $this->csv2vcard_map[$label];
-                }
-            }
-        }
-
-        $this->map = count($map1) >= count($map2) ? $map1 : $map2;
-    }
-
-    /**
-     * Convert CSV data row to vCard
-     */
-    protected function csv_to_vcard($data)
-    {
-        $contact = array();
-        foreach ($this->map as $idx => $name) {
-            $value = $data[$idx];
-            if ($value !== null && $value !== '') {
-                $contact[$name] = $value;
-            }
-        }
-
-        if (empty($contact)) {
-            return;
-        }
-
-        // Handle special values
-        if (!empty($contact['birthday-d']) && !empty($contact['birthday-m']) && !empty($contact['birthday-y'])) {
-            $contact['birthday'] = $contact['birthday-y'] .'-' .$contact['birthday-m'] . '-' . $contact['birthday-d'];
-        }
-
-        // Empty dates, e.g. "0/0/00", "0000-00-00 00:00:00"
-        foreach (array('birthday', 'anniversary') as $key) {
-            if (!empty($contact[$key])) {
-                $date = preg_replace('/[0[:^word:]]/', '', $contact[$key]);
-                if (empty($date)) {
-                    unset($contact[$key]);
-                }
-            }
-        }
-
-        if (!empty($contact['gender']) && ($gender = strtolower($contact['gender']))) {
-            if (!in_array($gender, array('male', 'female'))) {
-                unset($contact['gender']);
-            }
-        }
-
-        // Convert address(es) to rcube_vcard data
-        foreach ($contact as $idx => $value) {
-            $name = explode(':', $idx);
-            if (in_array($name[0], array('street', 'locality', 'region', 'zipcode', 'country'))) {
-                $contact['address:'.$name[1]][$name[0]] = $value;
-                unset($contact[$idx]);
-            }
-        }
-
-        // Create vcard object
-        $vcard = new rcube_vcard();
-        foreach ($contact as $name => $value) {
-            $name = explode(':', $name);
-            $vcard->set($name[0], $value, $name[1]);
-        }
-
-        // add to the list
-        $this->vcards[] = $vcard;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_db.php b/lib/ext/Roundcube/rcube_db.php
deleted file mode 100644
index 1e6a206..0000000
--- a/lib/ext/Roundcube/rcube_db.php
+++ /dev/null
@@ -1,1330 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Database wrapper class that implements PHP PDO functions            |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Database independent query interface.
- * This is a wrapper for the PHP PDO.
- *
- * @package   Framework
- * @subpackage Database
- */
-class rcube_db
-{
-    public $db_provider;
-
-    protected $db_dsnw;               // DSN for write operations
-    protected $db_dsnr;               // DSN for read operations
-    protected $db_connected = false;  // Already connected ?
-    protected $db_mode;               // Connection mode
-    protected $dbh;                   // Connection handle
-    protected $dbhs = array();
-    protected $table_connections = array();
-
-    protected $db_error     = false;
-    protected $db_error_msg = '';
-    protected $conn_failure = false;
-    protected $db_index     = 0;
-    protected $last_result;
-    protected $tables;
-    protected $variables;
-
-    protected $options = array(
-        // column/table quotes
-        'identifier_start' => '"',
-        'identifier_end'   => '"',
-    );
-
-    const DEBUG_LINE_LENGTH = 4096;
-    const DEFAULT_QUOTE     = '`';
-
-    /**
-     * Factory, returns driver-specific instance of the class
-     *
-     * @param string $db_dsnw DSN for read/write operations
-     * @param string $db_dsnr Optional DSN for read only operations
-     * @param bool   $pconn   Enables persistent connections
-     *
-     * @return rcube_db Object instance
-     */
-    public static function factory($db_dsnw, $db_dsnr = '', $pconn = false)
-    {
-        $driver     = strtolower(substr($db_dsnw, 0, strpos($db_dsnw, ':')));
-        $driver_map = array(
-            'sqlite2' => 'sqlite',
-            'sybase'  => 'mssql',
-            'dblib'   => 'mssql',
-            'mysqli'  => 'mysql',
-            'oci'     => 'oracle',
-            'oci8'    => 'oracle',
-        );
-
-        $driver = isset($driver_map[$driver]) ? $driver_map[$driver] : $driver;
-        $class  = "rcube_db_$driver";
-
-        if (!$driver || !class_exists($class)) {
-            rcube::raise_error(array('code' => 600, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => "Configuration error. Unsupported database driver: $driver"),
-                true, true);
-        }
-
-        return new $class($db_dsnw, $db_dsnr, $pconn);
-    }
-
-    /**
-     * Object constructor
-     *
-     * @param string $db_dsnw DSN for read/write operations
-     * @param string $db_dsnr Optional DSN for read only operations
-     * @param bool   $pconn   Enables persistent connections
-     */
-    public function __construct($db_dsnw, $db_dsnr = '', $pconn = false)
-    {
-        if (empty($db_dsnr)) {
-            $db_dsnr = $db_dsnw;
-        }
-
-        $this->db_dsnw  = $db_dsnw;
-        $this->db_dsnr  = $db_dsnr;
-        $this->db_pconn = $pconn;
-
-        $this->db_dsnw_array = self::parse_dsn($db_dsnw);
-        $this->db_dsnr_array = self::parse_dsn($db_dsnr);
-
-        $config = rcube::get_instance()->config;
-
-        $this->options['table_prefix']  = $config->get('db_prefix');
-        $this->options['dsnw_noread']   = $config->get('db_dsnw_noread', false);
-        $this->options['table_dsn_map'] = array_map(array($this, 'table_name'), $config->get('db_table_dsn', array()));
-    }
-
-    /**
-     * Connect to specific database
-     *
-     * @param array  $dsn  DSN for DB connections
-     * @param string $mode Connection mode (r|w)
-     */
-    protected function dsn_connect($dsn, $mode)
-    {
-        $this->db_error     = false;
-        $this->db_error_msg = null;
-
-        // return existing handle
-        if ($this->dbhs[$mode]) {
-            $this->dbh = $this->dbhs[$mode];
-            $this->db_mode = $mode;
-            return $this->dbh;
-        }
-
-        // connect to database
-        if ($dbh = $this->conn_create($dsn)) {
-            $this->dbh          = $dbh;
-            $this->dbhs[$mode]  = $dbh;
-            $this->db_mode      = $mode;
-            $this->db_connected = true;
-        }
-    }
-
-    /**
-     * Create PDO connection
-     */
-    protected function conn_create($dsn)
-    {
-        // Get database specific connection options
-        $dsn_string  = $this->dsn_string($dsn);
-        $dsn_options = $this->dsn_options($dsn);
-
-        if ($this->db_pconn) {
-            $dsn_options[PDO::ATTR_PERSISTENT] = true;
-        }
-
-        // Connect
-        try {
-            // with this check we skip fatal error on PDO object creation
-            if (!class_exists('PDO', false)) {
-                throw new Exception('PDO extension not loaded. See http://php.net/manual/en/intro.pdo.php');
-            }
-
-            $this->conn_prepare($dsn);
-
-            $dbh = new PDO($dsn_string, $dsn['username'], $dsn['password'], $dsn_options);
-
-            // don't throw exceptions or warnings
-            $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
-
-            $this->conn_configure($dsn, $dbh);
-        }
-        catch (Exception $e) {
-            $this->db_error     = true;
-            $this->db_error_msg = $e->getMessage();
-
-            rcube::raise_error(array('code' => 500, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => $this->db_error_msg), true, false);
-
-            return null;
-        }
-
-        return $dbh;
-    }
-
-    /**
-     * Driver-specific preparation of database connection
-     *
-     * @param array $dsn DSN for DB connections
-     */
-    protected function conn_prepare($dsn)
-    {
-    }
-
-    /**
-     * Driver-specific configuration of database connection
-     *
-     * @param array $dsn DSN for DB connections
-     * @param PDO   $dbh Connection handler
-     */
-    protected function conn_configure($dsn, $dbh)
-    {
-    }
-
-    /**
-     * Connect to appropriate database depending on the operation
-     *
-     * @param string $mode Connection mode (r|w)
-     * @param boolean $force Enforce using the given mode
-     */
-    public function db_connect($mode, $force = false)
-    {
-        // previous connection failed, don't attempt to connect again
-        if ($this->conn_failure) {
-            return;
-        }
-
-        // no replication
-        if ($this->db_dsnw == $this->db_dsnr) {
-            $mode = 'w';
-        }
-
-        // Already connected
-        if ($this->db_connected) {
-            // connected to db with the same or "higher" mode (if allowed)
-            if ($this->db_mode == $mode || $this->db_mode == 'w' && !$force && !$this->options['dsnw_noread']) {
-                return;
-            }
-        }
-
-        $dsn = ($mode == 'r') ? $this->db_dsnr_array : $this->db_dsnw_array;
-        $this->dsn_connect($dsn, $mode);
-
-        // use write-master when read-only fails
-        if (!$this->db_connected && $mode == 'r' && $this->is_replicated()) {
-            $this->dsn_connect($this->db_dsnw_array, 'w');
-        }
-
-        $this->conn_failure = !$this->db_connected;
-    }
-
-    /**
-     * Analyze the given SQL statement and select the appropriate connection to use
-     */
-    protected function dsn_select($query)
-    {
-        // no replication
-        if ($this->db_dsnw == $this->db_dsnr) {
-            return 'w';
-        }
-
-        // Read or write ?
-        $mode = preg_match('/^(select|show|set)/i', $query) ? 'r' : 'w';
-
-        $start = '[' . $this->options['identifier_start'] . self::DEFAULT_QUOTE . ']';
-        $end   = '[' . $this->options['identifier_end']   . self::DEFAULT_QUOTE . ']';
-        $regex = '/(?:^|\s)(from|update|into|join)\s+'.$start.'?([a-z0-9._]+)'.$end.'?\s+/i';
-
-        // find tables involved in this query
-        if (preg_match_all($regex, $query, $matches, PREG_SET_ORDER)) {
-            foreach ($matches as $m) {
-                $table = $m[2];
-
-                // always use direct mapping
-                if ($this->options['table_dsn_map'][$table]) {
-                    $mode = $this->options['table_dsn_map'][$table];
-                    break;  // primary table rules
-                }
-                else if ($mode == 'r') {
-                    // connected to db with the same or "higher" mode for this table
-                    $db_mode = $this->table_connections[$table];
-                    if ($db_mode == 'w' && !$this->options['dsnw_noread']) {
-                        $mode = $db_mode;
-                    }
-                }
-            }
-
-            // remember mode chosen (for primary table)
-            $table = $matches[0][2];
-            $this->table_connections[$table] = $mode;
-        }
-
-        return $mode;
-    }
-
-    /**
-     * Activate/deactivate debug mode
-     *
-     * @param boolean $dbg True if SQL queries should be logged
-     */
-    public function set_debug($dbg = true)
-    {
-        $this->options['debug_mode'] = $dbg;
-    }
-
-    /**
-     * Writes debug information/query to 'sql' log file
-     *
-     * @param string $query SQL query
-     */
-    protected function debug($query)
-    {
-        if ($this->options['debug_mode']) {
-            if (($len = strlen($query)) > self::DEBUG_LINE_LENGTH) {
-                $diff  = $len - self::DEBUG_LINE_LENGTH;
-                $query = substr($query, 0, self::DEBUG_LINE_LENGTH)
-                    . "... [truncated $diff bytes]";
-            }
-            rcube::write_log('sql', '[' . (++$this->db_index) . '] ' . $query . ';');
-        }
-    }
-
-    /**
-     * Getter for error state
-     *
-     * @param mixed $result Optional query result
-     *
-     * @return string Error message
-     */
-    public function is_error($result = null)
-    {
-        if ($result !== null) {
-            return $result === false ? $this->db_error_msg : null;
-        }
-
-        return $this->db_error ? $this->db_error_msg : null;
-    }
-
-    /**
-     * Connection state checker
-     *
-     * @return boolean True if in connected state
-     */
-    public function is_connected()
-    {
-        return !is_object($this->dbh) ? false : $this->db_connected;
-    }
-
-    /**
-     * Is database replication configured?
-     *
-     * @return bool Returns true if dsnw != dsnr
-     */
-    public function is_replicated()
-    {
-      return !empty($this->db_dsnr) && $this->db_dsnw != $this->db_dsnr;
-    }
-
-    /**
-     * Get database runtime variables
-     *
-     * @param string $varname Variable name
-     * @param mixed  $default Default value if variable is not set
-     *
-     * @return mixed Variable value or default
-     */
-    public function get_variable($varname, $default = null)
-    {
-        // to be implemented by driver class
-        return $default;
-    }
-
-    /**
-     * Execute a SQL query
-     *
-     * @param string SQL query to execute
-     * @param mixed  Values to be inserted in query
-     *
-     * @return number  Query handle identifier
-     */
-    public function query()
-    {
-        $params = func_get_args();
-        $query = array_shift($params);
-
-        // Support one argument of type array, instead of n arguments
-        if (count($params) == 1 && is_array($params[0])) {
-            $params = $params[0];
-        }
-
-        return $this->_query($query, 0, 0, $params);
-    }
-
-    /**
-     * Execute a SQL query with limits
-     *
-     * @param string SQL query to execute
-     * @param int    Offset for LIMIT statement
-     * @param int    Number of rows for LIMIT statement
-     * @param mixed  Values to be inserted in query
-     *
-     * @return PDOStatement|bool Query handle or False on error
-     */
-    public function limitquery()
-    {
-        $params  = func_get_args();
-        $query   = array_shift($params);
-        $offset  = array_shift($params);
-        $numrows = array_shift($params);
-
-        return $this->_query($query, $offset, $numrows, $params);
-    }
-
-    /**
-     * Execute a SQL query with limits
-     *
-     * @param string $query   SQL query to execute
-     * @param int    $offset  Offset for LIMIT statement
-     * @param int    $numrows Number of rows for LIMIT statement
-     * @param array  $params  Values to be inserted in query
-     *
-     * @return PDOStatement|bool Query handle or False on error
-     */
-    protected function _query($query, $offset, $numrows, $params)
-    {
-        $query = ltrim($query);
-
-        $this->db_connect($this->dsn_select($query), true);
-
-        // check connection before proceeding
-        if (!$this->is_connected()) {
-            return $this->last_result = false;
-        }
-
-        if ($numrows || $offset) {
-            $query = $this->set_limit($query, $numrows, $offset);
-        }
-
-        // replace self::DEFAULT_QUOTE with driver-specific quoting
-        $query = $this->query_parse($query);
-
-        // Because in Roundcube we mostly use queries that are
-        // executed only once, we will not use prepared queries
-        $pos = 0;
-        $idx = 0;
-
-        if (count($params)) {
-            while ($pos = strpos($query, '?', $pos)) {
-                if ($query[$pos+1] == '?') {  // skip escaped '?'
-                    $pos += 2;
-                }
-                else {
-                    $val = $this->quote($params[$idx++]);
-                    unset($params[$idx-1]);
-                    $query = substr_replace($query, $val, $pos, 1);
-                    $pos += strlen($val);
-                }
-            }
-        }
-
-        // replace escaped '?' back to normal, see self::quote()
-        $query = str_replace('??', '?', $query);
-        $query = rtrim($query, " \t\n\r\0\x0B;");
-
-        // log query
-        $this->debug($query);
-
-        return $this->query_execute($query);
-    }
-
-    /**
-     * Query execution
-     */
-    protected function query_execute($query)
-    {
-        // destroy reference to previous result, required for SQLite driver (#1488874)
-        $this->last_result  = null;
-        $this->db_error_msg = null;
-
-        // send query
-        $result = $this->dbh->query($query);
-
-        if ($result === false) {
-            $result = $this->handle_error($query);
-        }
-
-        return $this->last_result = $result;
-    }
-
-    /**
-     * Parse SQL query and replace identifier quoting
-     *
-     * @param string $query SQL query
-     *
-     * @return string SQL query
-     */
-    protected function query_parse($query)
-    {
-        $start = $this->options['identifier_start'];
-        $end   = $this->options['identifier_end'];
-        $quote = self::DEFAULT_QUOTE;
-
-        if ($start == $quote) {
-            return $query;
-        }
-
-        $pos = 0;
-        $in  = false;
-
-        while ($pos = strpos($query, $quote, $pos)) {
-            if ($query[$pos+1] == $quote) {  // skip escaped quote
-                $pos += 2;
-            }
-            else {
-                if ($in) {
-                    $q  = $end;
-                    $in = false;
-                }
-                else {
-                    $q  = $start;
-                    $in = true;
-                }
-
-                $query = substr_replace($query, $q, $pos, 1);
-                $pos++;
-            }
-        }
-
-        // replace escaped quote back to normal, see self::quote()
-        $query = str_replace($quote.$quote, $quote, $query);
-
-        return $query;
-    }
-
-    /**
-     * Helper method to handle DB errors.
-     * This by default logs the error but could be overriden by a driver implementation
-     *
-     * @param string Query that triggered the error
-     * @return mixed Result to be stored and returned
-     */
-    protected function handle_error($query)
-    {
-        $error = $this->dbh->errorInfo();
-
-        if (empty($this->options['ignore_key_errors']) || !in_array($error[0], array('23000', '23505'))) {
-            $this->db_error = true;
-            $this->db_error_msg = sprintf('[%s] %s', $error[1], $error[2]);
-
-            rcube::raise_error(array('code' => 500, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => $this->db_error_msg . " (SQL Query: $query)"
-                ), true, false);
-        }
-
-        return false;
-    }
-
-    /**
-     * Get number of affected rows for the last query
-     *
-     * @param mixed $result Optional query handle
-     *
-     * @return int Number of (matching) rows
-     */
-    public function affected_rows($result = null)
-    {
-        if ($result || ($result === null && ($result = $this->last_result))) {
-            if ($result !== true) {
-                return $result->rowCount();
-            }
-        }
-
-        return 0;
-    }
-
-    /**
-     * Get number of rows for a SQL query
-     * If no query handle is specified, the last query will be taken as reference
-     *
-     * @param mixed $result Optional query handle
-     * @return mixed   Number of rows or false on failure
-     * @deprecated This method shows very poor performance and should be avoided.
-     */
-    public function num_rows($result = null)
-    {
-        if (($result || ($result === null && ($result = $this->last_result))) && $result !== true) {
-            // repeat query with SELECT COUNT(*) ...
-            if (preg_match('/^SELECT\s+(?:ALL\s+|DISTINCT\s+)?(?:.*?)\s+FROM\s+(.*)$/ims', $result->queryString, $m)) {
-                $query = $this->dbh->query('SELECT COUNT(*) FROM ' . $m[1], PDO::FETCH_NUM);
-                return $query ? intval($query->fetchColumn(0)) : false;
-            }
-            else {
-                $num = count($result->fetchAll());
-                $result->execute();  // re-execute query because there's no seek(0)
-                return $num;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get last inserted record ID
-     *
-     * @param string $table Table name (to find the incremented sequence)
-     *
-     * @return mixed ID or false on failure
-     */
-    public function insert_id($table = '')
-    {
-        if (!$this->db_connected || $this->db_mode == 'r') {
-            return false;
-        }
-
-        if ($table) {
-            // resolve table name
-            $table = $this->table_name($table);
-        }
-
-        $id = $this->dbh->lastInsertId($table);
-
-        return $id;
-    }
-
-    /**
-     * Get an associative array for one row
-     * If no query handle is specified, the last query will be taken as reference
-     *
-     * @param mixed $result Optional query handle
-     *
-     * @return mixed Array with col values or false on failure
-     */
-    public function fetch_assoc($result = null)
-    {
-        return $this->_fetch_row($result, PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * Get an index array for one row
-     * If no query handle is specified, the last query will be taken as reference
-     *
-     * @param mixed $result Optional query handle
-     *
-     * @return mixed Array with col values or false on failure
-     */
-    public function fetch_array($result = null)
-    {
-        return $this->_fetch_row($result, PDO::FETCH_NUM);
-    }
-
-    /**
-     * Get col values for a result row
-     *
-     * @param mixed $result Optional query handle
-     * @param int   $mode   Fetch mode identifier
-     *
-     * @return mixed Array with col values or false on failure
-     */
-    protected function _fetch_row($result, $mode)
-    {
-        if ($result || ($result === null && ($result = $this->last_result))) {
-            if ($result !== true) {
-                return $result->fetch($mode);
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Adds LIMIT,OFFSET clauses to the query
-     *
-     * @param string $query  SQL query
-     * @param int    $limit  Number of rows
-     * @param int    $offset Offset
-     *
-     * @return string SQL query
-     */
-    protected function set_limit($query, $limit = 0, $offset = 0)
-    {
-        if ($limit) {
-            $query .= ' LIMIT ' . intval($limit);
-        }
-
-        if ($offset) {
-            $query .= ' OFFSET ' . intval($offset);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Returns list of tables in a database
-     *
-     * @return array List of all tables of the current database
-     */
-    public function list_tables()
-    {
-        // get tables if not cached
-        if ($this->tables === null) {
-            $q = $this->query('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES ORDER BY TABLE_NAME');
-
-            if ($q) {
-                $this->tables = $q->fetchAll(PDO::FETCH_COLUMN, 0);
-            }
-            else {
-                $this->tables = array();
-            }
-        }
-
-        return $this->tables;
-    }
-
-    /**
-     * Returns list of columns in database table
-     *
-     * @param string $table Table name
-     *
-     * @return array List of table cols
-     */
-    public function list_cols($table)
-    {
-        $q = $this->query('SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ?',
-            array($table));
-
-        if ($q) {
-            return $q->fetchAll(PDO::FETCH_COLUMN, 0);
-        }
-
-        return array();
-    }
-
-    /**
-     * Start transaction
-     *
-     * @return bool True on success, False on failure
-     */
-    public function startTransaction()
-    {
-        $this->db_connect('w', true);
-
-        // check connection before proceeding
-        if (!$this->is_connected()) {
-            return $this->last_result = false;
-        }
-
-        $this->debug('BEGIN TRANSACTION');
-
-        return $this->last_result = $this->dbh->beginTransaction();
-    }
-
-    /**
-     * Commit transaction
-     *
-     * @return bool True on success, False on failure
-     */
-    public function endTransaction()
-    {
-        $this->db_connect('w', true);
-
-        // check connection before proceeding
-        if (!$this->is_connected()) {
-            return $this->last_result = false;
-        }
-
-        $this->debug('COMMIT TRANSACTION');
-
-        return $this->last_result = $this->dbh->commit();
-    }
-
-    /**
-     * Rollback transaction
-     *
-     * @return bool True on success, False on failure
-     */
-    public function rollbackTransaction()
-    {
-        $this->db_connect('w', true);
-
-        // check connection before proceeding
-        if (!$this->is_connected()) {
-            return $this->last_result = false;
-        }
-
-        $this->debug('ROLLBACK TRANSACTION');
-
-        return $this->last_result = $this->dbh->rollBack();
-    }
-
-    /**
-     * Formats input so it can be safely used in a query
-     *
-     * @param mixed  $input Value to quote
-     * @param string $type  Type of data (integer, bool, ident)
-     *
-     * @return string Quoted/converted string for use in query
-     */
-    public function quote($input, $type = null)
-    {
-        // handle int directly for better performance
-        if ($type == 'integer' || $type == 'int') {
-            return intval($input);
-        }
-
-        if (is_null($input)) {
-            return 'NULL';
-        }
-
-        if ($type == 'ident') {
-            return $this->quote_identifier($input);
-        }
-
-        // create DB handle if not available
-        if (!$this->dbh) {
-            $this->db_connect('r');
-        }
-
-        if ($this->dbh) {
-            $map = array(
-                'bool'    => PDO::PARAM_BOOL,
-                'integer' => PDO::PARAM_INT,
-            );
-
-            $type = isset($map[$type]) ? $map[$type] : PDO::PARAM_STR;
-
-            return strtr($this->dbh->quote($input, $type),
-                // escape ? and `
-                array('?' => '??', self::DEFAULT_QUOTE => self::DEFAULT_QUOTE.self::DEFAULT_QUOTE)
-            );
-        }
-
-        return 'NULL';
-    }
-
-    /**
-     * Escapes a string so it can be safely used in a query
-     *
-     * @param string $str A string to escape
-     *
-     * @return string Escaped string for use in a query
-     */
-    public function escape($str)
-    {
-        if (is_null($str)) {
-            return 'NULL';
-        }
-
-        return substr($this->quote($str), 1, -1);
-    }
-
-    /**
-     * Quotes a string so it can be safely used as a table or column name
-     *
-     * @param string $str Value to quote
-     *
-     * @return string Quoted string for use in query
-     * @deprecated    Replaced by rcube_db::quote_identifier
-     * @see           rcube_db::quote_identifier
-     */
-    public function quoteIdentifier($str)
-    {
-        return $this->quote_identifier($str);
-    }
-
-    /**
-     * Escapes a string so it can be safely used in a query
-     *
-     * @param string $str A string to escape
-     *
-     * @return string Escaped string for use in a query
-     * @deprecated    Replaced by rcube_db::escape
-     * @see           rcube_db::escape
-     */
-    public function escapeSimple($str)
-    {
-        return $this->escape($str);
-    }
-
-    /**
-     * Quotes a string so it can be safely used as a table or column name
-     *
-     * @param string $str Value to quote
-     *
-     * @return string Quoted string for use in query
-     */
-    public function quote_identifier($str)
-    {
-        $start = $this->options['identifier_start'];
-        $end   = $this->options['identifier_end'];
-        $name  = array();
-
-        foreach (explode('.', $str) as $elem) {
-            $elem = str_replace(array($start, $end), '', $elem);
-            $name[] = $start . $elem . $end;
-        }
-
-        return implode($name, '.');
-    }
-
-    /**
-     * Return SQL function for current time and date
-     *
-     * @param int $interval Optional interval (in seconds) to add/subtract
-     *
-     * @return string SQL function to use in query
-     */
-    public function now($interval = 0)
-    {
-        if ($interval) {
-            $add = ' ' . ($interval > 0 ? '+' : '-') . ' INTERVAL ';
-            $add .= $interval > 0 ? intval($interval) : intval($interval) * -1;
-            $add .= ' SECOND';
-        }
-
-        return "now()" . $add;
-    }
-
-    /**
-     * Return list of elements for use with SQL's IN clause
-     *
-     * @param array  $arr  Input array
-     * @param string $type Type of data (integer, bool, ident)
-     *
-     * @return string Comma-separated list of quoted values for use in query
-     */
-    public function array2list($arr, $type = null)
-    {
-        if (!is_array($arr)) {
-            return $this->quote($arr, $type);
-        }
-
-        foreach ($arr as $idx => $item) {
-            $arr[$idx] = $this->quote($item, $type);
-        }
-
-        return implode(',', $arr);
-    }
-
-    /**
-     * Return SQL statement to convert a field value into a unix timestamp
-     *
-     * This method is deprecated and should not be used anymore due to limitations
-     * of timestamp functions in Mysql (year 2038 problem)
-     *
-     * @param string $field Field name
-     *
-     * @return string  SQL statement to use in query
-     * @deprecated
-     */
-    public function unixtimestamp($field)
-    {
-        return "UNIX_TIMESTAMP($field)";
-    }
-
-    /**
-     * Return SQL statement to convert from a unix timestamp
-     *
-     * @param int $timestamp Unix timestamp
-     *
-     * @return string Date string in db-specific format
-     */
-    public function fromunixtime($timestamp)
-    {
-        return date("'Y-m-d H:i:s'", $timestamp);
-    }
-
-    /**
-     * Return SQL statement for case insensitive LIKE
-     *
-     * @param string $column Field name
-     * @param string $value  Search value
-     *
-     * @return string SQL statement to use in query
-     */
-    public function ilike($column, $value)
-    {
-        return $this->quote_identifier($column).' LIKE '.$this->quote($value);
-    }
-
-    /**
-     * Abstract SQL statement for value concatenation
-     *
-     * @return string SQL statement to be used in query
-     */
-    public function concat(/* col1, col2, ... */)
-    {
-        $args = func_get_args();
-        if (is_array($args[0])) {
-            $args = $args[0];
-        }
-
-        return '(' . join(' || ', $args) . ')';
-    }
-
-    /**
-     * Encodes non-UTF-8 characters in string/array/object (recursive)
-     *
-     * @param mixed $input      Data to fix
-     * @param bool  $serialized Enable serialization
-     *
-     * @return mixed Properly UTF-8 encoded data
-     */
-    public static function encode($input, $serialized = false)
-    {
-        // use Base64 encoding to workaround issues with invalid
-        // or null characters in serialized string (#1489142)
-        if ($serialized) {
-            return base64_encode(serialize($input));
-        }
-
-        if (is_object($input)) {
-            foreach (get_object_vars($input) as $idx => $value) {
-                $input->$idx = self::encode($value);
-            }
-            return $input;
-        }
-        else if (is_array($input)) {
-            foreach ($input as $idx => $value) {
-                $input[$idx] = self::encode($value);
-            }
-
-            return $input;
-        }
-
-        return utf8_encode($input);
-    }
-
-    /**
-     * Decodes encoded UTF-8 string/object/array (recursive)
-     *
-     * @param mixed $input      Input data
-     * @param bool  $serialized Enable serialization
-     *
-     * @return mixed Decoded data
-     */
-    public static function decode($input, $serialized = false)
-    {
-        // use Base64 encoding to workaround issues with invalid
-        // or null characters in serialized string (#1489142)
-        if ($serialized) {
-            // Keep backward compatybility where base64 wasn't used
-            if (strpos(substr($input, 0, 16), ':') !== false) {
-                return self::decode(@unserialize($input));
-            }
-
-            return @unserialize(base64_decode($input));
-        }
-
-        if (is_object($input)) {
-            foreach (get_object_vars($input) as $idx => $value) {
-                $input->$idx = self::decode($value);
-            }
-            return $input;
-        }
-        else if (is_array($input)) {
-            foreach ($input as $idx => $value) {
-                $input[$idx] = self::decode($value);
-            }
-            return $input;
-        }
-
-        return utf8_decode($input);
-    }
-
-    /**
-     * Return correct name for a specific database table
-     *
-     * @param string $table  Table name
-     * @param bool   $quoted Quote table identifier
-     *
-     * @return string Translated table name
-     */
-    public function table_name($table, $quoted = false)
-    {
-        // add prefix to the table name if configured
-        if (($prefix = $this->options['table_prefix']) && strpos($table, $prefix) !== 0) {
-            $table = $prefix . $table;
-        }
-
-        if ($quoted) {
-            $table = $this->quote_identifier($table);
-        }
-
-        return $table;
-    }
-
-    /**
-     * Set class option value
-     *
-     * @param string $name  Option name
-     * @param mixed  $value Option value
-     */
-    public function set_option($name, $value)
-    {
-        $this->options[$name] = $value;
-    }
-
-    /**
-     * Set DSN connection to be used for the given table
-     *
-     * @param string Table name
-     * @param string DSN connection ('r' or 'w') to be used
-     */
-    public function set_table_dsn($table, $mode)
-    {
-        $this->options['table_dsn_map'][$this->table_name($table)] = $mode;
-    }
-
-    /**
-     * MDB2 DSN string parser
-     *
-     * @param string $sequence Secuence name
-     *
-     * @return array DSN parameters
-     */
-    public static function parse_dsn($dsn)
-    {
-        if (empty($dsn)) {
-            return null;
-        }
-
-        // Find phptype and dbsyntax
-        if (($pos = strpos($dsn, '://')) !== false) {
-            $str = substr($dsn, 0, $pos);
-            $dsn = substr($dsn, $pos + 3);
-        }
-        else {
-            $str = $dsn;
-            $dsn = null;
-        }
-
-        // Get phptype and dbsyntax
-        // $str => phptype(dbsyntax)
-        if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
-            $parsed['phptype']  = $arr[1];
-            $parsed['dbsyntax'] = !$arr[2] ? $arr[1] : $arr[2];
-        }
-        else {
-            $parsed['phptype']  = $str;
-            $parsed['dbsyntax'] = $str;
-        }
-
-        if (empty($dsn)) {
-            return $parsed;
-        }
-
-        // Get (if found): username and password
-        // $dsn => username:password@protocol+hostspec/database
-        if (($at = strrpos($dsn,'@')) !== false) {
-            $str = substr($dsn, 0, $at);
-            $dsn = substr($dsn, $at + 1);
-            if (($pos = strpos($str, ':')) !== false) {
-                $parsed['username'] = rawurldecode(substr($str, 0, $pos));
-                $parsed['password'] = rawurldecode(substr($str, $pos + 1));
-            }
-            else {
-                $parsed['username'] = rawurldecode($str);
-            }
-        }
-
-        // Find protocol and hostspec
-
-        // $dsn => proto(proto_opts)/database
-        if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
-            $proto       = $match[1];
-            $proto_opts  = $match[2] ? $match[2] : false;
-            $dsn         = $match[3];
-        }
-        // $dsn => protocol+hostspec/database (old format)
-        else {
-            if (strpos($dsn, '+') !== false) {
-                list($proto, $dsn) = explode('+', $dsn, 2);
-            }
-            if (   strpos($dsn, '//') === 0
-                && strpos($dsn, '/', 2) !== false
-                && $parsed['phptype'] == 'oci8'
-            ) {
-                //oracle's "Easy Connect" syntax:
-                //"username/password@[//]host[:port][/service_name]"
-                //e.g. "scott/tiger@//mymachine:1521/oracle"
-                $proto_opts = $dsn;
-                $pos = strrpos($proto_opts, '/');
-                $dsn = substr($proto_opts, $pos + 1);
-                $proto_opts = substr($proto_opts, 0, $pos);
-            }
-            else if (strpos($dsn, '/') !== false) {
-                list($proto_opts, $dsn) = explode('/', $dsn, 2);
-            }
-            else {
-                $proto_opts = $dsn;
-                $dsn = null;
-            }
-        }
-
-        // process the different protocol options
-        $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
-        $proto_opts = rawurldecode($proto_opts);
-        if (strpos($proto_opts, ':') !== false) {
-            list($proto_opts, $parsed['port']) = explode(':', $proto_opts);
-        }
-        if ($parsed['protocol'] == 'tcp') {
-            $parsed['hostspec'] = $proto_opts;
-        }
-        else if ($parsed['protocol'] == 'unix') {
-            $parsed['socket'] = $proto_opts;
-        }
-
-        // Get dabase if any
-        // $dsn => database
-        if ($dsn) {
-            // /database
-            if (($pos = strpos($dsn, '?')) === false) {
-                $parsed['database'] = rawurldecode($dsn);
-            // /database?param1=value1&param2=value2
-            }
-            else {
-                $parsed['database'] = rawurldecode(substr($dsn, 0, $pos));
-                $dsn = substr($dsn, $pos + 1);
-                if (strpos($dsn, '&') !== false) {
-                    $opts = explode('&', $dsn);
-                }
-                else { // database?param1=value1
-                    $opts = array($dsn);
-                }
-                foreach ($opts as $opt) {
-                    list($key, $value) = explode('=', $opt);
-                    if (!array_key_exists($key, $parsed) || false === $parsed[$key]) {
-                        // don't allow params overwrite
-                        $parsed[$key] = rawurldecode($value);
-                    }
-                }
-            }
-        }
-
-        return $parsed;
-    }
-
-    /**
-     * Returns PDO DSN string from DSN array
-     *
-     * @param array $dsn DSN parameters
-     *
-     * @return string DSN string
-     */
-    protected function dsn_string($dsn)
-    {
-        $params = array();
-        $result = $dsn['phptype'] . ':';
-
-        if ($dsn['hostspec']) {
-            $params[] = 'host=' . $dsn['hostspec'];
-        }
-
-        if ($dsn['port']) {
-            $params[] = 'port=' . $dsn['port'];
-        }
-
-        if ($dsn['database']) {
-            $params[] = 'dbname=' . $dsn['database'];
-        }
-
-        if (!empty($params)) {
-            $result .= implode(';', $params);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns driver-specific connection options
-     *
-     * @param array $dsn DSN parameters
-     *
-     * @return array Connection options
-     */
-    protected function dsn_options($dsn)
-    {
-        $result = array();
-
-        return $result;
-    }
-
-    /**
-     * Execute the given SQL script
-     *
-     * @param string SQL queries to execute
-     *
-     * @return boolen True on success, False on error
-     */
-    public function exec_script($sql)
-    {
-        $sql  = $this->fix_table_names($sql);
-        $buff = '';
-
-        foreach (explode("\n", $sql) as $line) {
-            if (preg_match('/^--/', $line) || trim($line) == '')
-                continue;
-
-            $buff .= $line . "\n";
-            if (preg_match('/(;|^GO)$/', trim($line))) {
-                $this->query($buff);
-                $buff = '';
-                if ($this->db_error) {
-                    break;
-                }
-            }
-        }
-
-        return !$this->db_error;
-    }
-
-    /**
-     * Parse SQL file and fix table names according to table prefix
-     */
-    protected function fix_table_names($sql)
-    {
-        if (!$this->options['table_prefix']) {
-            return $sql;
-        }
-
-        $sql = preg_replace_callback(
-            '/((TABLE|TRUNCATE|(?<!ON )UPDATE|INSERT INTO|FROM'
-            . '| ON(?! (DELETE|UPDATE))|REFERENCES|CONSTRAINT|FOREIGN KEY|INDEX)'
-            . '\s+(IF (NOT )?EXISTS )?[`"]*)([^`"\( \r\n]+)/',
-            array($this, 'fix_table_names_callback'),
-            $sql
-        );
-
-        return $sql;
-    }
-
-    /**
-     * Preg_replace callback for fix_table_names()
-     */
-    protected function fix_table_names_callback($matches)
-    {
-        return $matches[1] . $this->options['table_prefix'] . $matches[count($matches)-1];
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_db_mssql.php b/lib/ext/Roundcube/rcube_db_mssql.php
deleted file mode 100644
index 726e4b4..0000000
--- a/lib/ext/Roundcube/rcube_db_mssql.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Database wrapper class that implements PHP PDO functions            |
- |   for MS SQL Server database                                          |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Database independent query interface
- * This is a wrapper for the PHP PDO
- *
- * @package    Framework
- * @subpackage Database
- */
-class rcube_db_mssql extends rcube_db
-{
-    public $db_provider = 'mssql';
-
-    /**
-     * Object constructor
-     *
-     * @param string $db_dsnw DSN for read/write operations
-     * @param string $db_dsnr Optional DSN for read only operations
-     * @param bool   $pconn   Enables persistent connections
-     */
-    public function __construct($db_dsnw, $db_dsnr = '', $pconn = false)
-    {
-        parent::__construct($db_dsnw, $db_dsnr, $pconn);
-
-        $this->options['identifier_start'] = '[';
-        $this->options['identifier_end'] = ']';
-    }
-
-    /**
-     * Driver-specific configuration of database connection
-     *
-     * @param array $dsn DSN for DB connections
-     * @param PDO   $dbh Connection handler
-     */
-    protected function conn_configure($dsn, $dbh)
-    {
-        // Set date format in case of non-default language (#1488918)
-        $dbh->query("SET DATEFORMAT ymd");
-    }
-
-    /**
-     * Return SQL function for current time and date
-     *
-     * @param int $interval Optional interval (in seconds) to add/subtract
-     *
-     * @return string SQL function to use in query
-     */
-    public function now($interval = 0)
-    {
-        if ($interval) {
-            $interval = intval($interval);
-            return "dateadd(second, $interval, getdate())";
-        }
-
-        return "getdate()";
-    }
-
-    /**
-     * Return SQL statement to convert a field value into a unix timestamp
-     *
-     * @param string $field Field name
-     *
-     * @return string SQL statement to use in query
-     * @deprecated
-     */
-    public function unixtimestamp($field)
-    {
-        return "DATEDIFF(second, '19700101', $field) + DATEDIFF(second, GETDATE(), GETUTCDATE())";
-    }
-
-    /**
-     * Abstract SQL statement for value concatenation
-     *
-     * @return string SQL statement to be used in query
-     */
-    public function concat(/* col1, col2, ... */)
-    {
-        $args = func_get_args();
-
-        if (is_array($args[0])) {
-            $args = $args[0];
-        }
-
-        return '(' . join('+', $args) . ')';
-    }
-
-    /**
-     * Adds TOP (LIMIT,OFFSET) clause to the query
-     *
-     * @param string $query  SQL query
-     * @param int    $limit  Number of rows
-     * @param int    $offset Offset
-     *
-     * @return string SQL query
-     */
-    protected function set_limit($query, $limit = 0, $offset = 0)
-    {
-        $limit  = intval($limit);
-        $offset = intval($offset);
-        $end    = $offset + $limit;
-
-        // query without OFFSET
-        if (!$offset) {
-            $query = preg_replace('/^SELECT\s/i', "SELECT TOP $limit ", $query);
-            return $query;
-        }
-
-        $orderby = stristr($query, 'ORDER BY');
-        $offset += 1;
-
-        if ($orderby !== false) {
-            $query = trim(substr($query, 0, -1 * strlen($orderby)));
-        }
-        else {
-            // it shouldn't happen, paging without sorting has not much sense
-            // @FIXME: I don't know how to build paging query without ORDER BY
-            $orderby = "ORDER BY 1";
-        }
-
-        $query = preg_replace('/^SELECT\s/i', '', $query);
-        $query = "WITH paging AS (SELECT ROW_NUMBER() OVER ($orderby) AS [RowNumber], $query)"
-            . " SELECT * FROM paging WHERE [RowNumber] BETWEEN $offset AND $end ORDER BY [RowNumber]";
-
-        return $query;
-    }
-
-    /**
-     * Returns PDO DSN string from DSN array
-     */
-    protected function dsn_string($dsn)
-    {
-        $params = array();
-        $result = $dsn['phptype'] . ':';
-
-        if ($dsn['hostspec']) {
-            $host = $dsn['hostspec'];
-            if ($dsn['port']) {
-                $host .= ',' . $dsn['port'];
-            }
-            $params[] = 'host=' . $host;
-        }
-
-        if ($dsn['database']) {
-            $params[] = 'dbname=' . $dsn['database'];
-        }
-
-        if (!empty($params)) {
-            $result .= implode(';', $params);
-        }
-
-        return $result;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_db_mysql.php b/lib/ext/Roundcube/rcube_db_mysql.php
deleted file mode 100644
index 400813d..0000000
--- a/lib/ext/Roundcube/rcube_db_mysql.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Database wrapper class that implements PHP PDO functions            |
- |   for MySQL database                                                  |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Database independent query interface
- *
- * This is a wrapper for the PHP PDO
- *
- * @package    Framework
- * @subpackage Database
- */
-class rcube_db_mysql extends rcube_db
-{
-    public $db_provider = 'mysql';
-
-    /**
-     * Object constructor
-     *
-     * @param string $db_dsnw DSN for read/write operations
-     * @param string $db_dsnr Optional DSN for read only operations
-     * @param bool   $pconn   Enables persistent connections
-     */
-    public function __construct($db_dsnw, $db_dsnr = '', $pconn = false)
-    {
-        parent::__construct($db_dsnw, $db_dsnr, $pconn);
-
-        // SQL identifiers quoting
-        $this->options['identifier_start'] = '`';
-        $this->options['identifier_end'] = '`';
-    }
-
-    /**
-     * Driver-specific configuration of database connection
-     *
-     * @param array $dsn DSN for DB connections
-     * @param PDO   $dbh Connection handler
-     */
-    protected function conn_configure($dsn, $dbh)
-    {
-        $dbh->query("SET NAMES 'utf8'");
-    }
-
-    /**
-     * Abstract SQL statement for value concatenation
-     *
-     * @return string SQL statement to be used in query
-     */
-    public function concat(/* col1, col2, ... */)
-    {
-        $args = func_get_args();
-
-        if (is_array($args[0])) {
-            $args = $args[0];
-        }
-
-        return 'CONCAT(' . join(', ', $args) . ')';
-    }
-
-    /**
-     * Returns PDO DSN string from DSN array
-     *
-     * @param array $dsn DSN parameters
-     *
-     * @return string Connection string
-     */
-    protected function dsn_string($dsn)
-    {
-        $params = array();
-        $result = 'mysql:';
-
-        if ($dsn['database']) {
-            $params[] = 'dbname=' . $dsn['database'];
-        }
-
-        if ($dsn['hostspec']) {
-            $params[] = 'host=' . $dsn['hostspec'];
-        }
-
-        if ($dsn['port']) {
-            $params[] = 'port=' . $dsn['port'];
-        }
-
-        if ($dsn['socket']) {
-            $params[] = 'unix_socket=' . $dsn['socket'];
-        }
-
-        $params[] = 'charset=utf8';
-
-        if (!empty($params)) {
-            $result .= implode(';', $params);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns driver-specific connection options
-     *
-     * @param array $dsn DSN parameters
-     *
-     * @return array Connection options
-     */
-    protected function dsn_options($dsn)
-    {
-        $result = array();
-
-        if (!empty($dsn['key'])) {
-            $result[PDO::MYSQL_ATTR_SSL_KEY] = $dsn['key'];
-        }
-
-        if (!empty($dsn['cipher'])) {
-            $result[PDO::MYSQL_ATTR_SSL_CIPHER] = $dsn['cipher'];
-        }
-
-        if (!empty($dsn['cert'])) {
-            $result[PDO::MYSQL_ATTR_SSL_CERT] = $dsn['cert'];
-        }
-
-        if (!empty($dsn['capath'])) {
-            $result[PDO::MYSQL_ATTR_SSL_CAPATH] = $dsn['capath'];
-        }
-
-        if (!empty($dsn['ca'])) {
-            $result[PDO::MYSQL_ATTR_SSL_CA] = $dsn['ca'];
-        }
-
-        // Always return matching (not affected only) rows count
-        $result[PDO::MYSQL_ATTR_FOUND_ROWS] = true;
-
-        // Enable AUTOCOMMIT mode (#1488902)
-        $result[PDO::ATTR_AUTOCOMMIT] = true;
-
-        return $result;
-    }
-
-    /**
-     * Get database runtime variables
-     *
-     * @param string $varname Variable name
-     * @param mixed  $default Default value if variable is not set
-     *
-     * @return mixed Variable value or default
-     */
-    public function get_variable($varname, $default = null)
-    {
-        if (!isset($this->variables)) {
-            $this->variables = array();
-
-            $result = $this->query('SHOW VARIABLES');
-
-            while ($row = $this->fetch_array($result)) {
-                $this->variables[$row[0]] = $row[1];
-            }
-        }
-
-        return isset($this->variables[$varname]) ? $this->variables[$varname] : $default;
-    }
-
-    /**
-     * Handle DB errors, re-issue the query on deadlock errors from InnoDB row-level locking
-     *
-     * @param string Query that triggered the error
-     * @return mixed Result to be stored and returned
-     */
-    protected function handle_error($query)
-    {
-        $error = $this->dbh->errorInfo();
-
-        // retry after "Deadlock found when trying to get lock" errors
-        $retries = 2;
-        while ($error[1] == 1213 && $retries >= 0) {
-            usleep(50000);  // wait 50 ms
-            $result = $this->dbh->query($query);
-            if ($result !== false) {
-                return $result;
-            }
-            $error = $this->dbh->errorInfo();
-            $retries--;
-        }
-
-        return parent::handle_error($query);
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_db_oracle.php b/lib/ext/Roundcube/rcube_db_oracle.php
deleted file mode 100644
index 338eb2e..0000000
--- a/lib/ext/Roundcube/rcube_db_oracle.php
+++ /dev/null
@@ -1,599 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011-2014, Kolab Systems AG                             |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Database wrapper class that implements database functions           |
- |   for Oracle database using OCI8 extension                            |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Database independent query interface
- *
- * @package    Framework
- * @subpackage Database
- */
-class rcube_db_oracle extends rcube_db
-{
-    public $db_provider = 'oracle';
-
-
-    /**
-     * Create connection instance
-     */
-    protected function conn_create($dsn)
-    {
-        // Get database specific connection options
-        $dsn_options = $this->dsn_options($dsn);
-
-        $function = $this->db_pconn ? 'oci_pconnect' : 'oci_connect';
-
-        if (!function_exists($function)) {
-            $this->db_error     = true;
-            $this->db_error_msg = 'OCI8 extension not loaded. See http://php.net/manual/en/book.oci8.php';
-
-            rcube::raise_error(array('code' => 500, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => $this->db_error_msg), true, false);
-
-            return;
-        }
-
-        // connect
-        $dbh = @$function($dsn['username'], $dsn['password'], $dsn_options['database'], $dsn_options['charset']);
-
-        if (!$dbh) {
-            $error              = oci_error();
-            $this->db_error     = true;
-            $this->db_error_msg = $error['message'];
-
-            rcube::raise_error(array('code' => 500, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => $this->db_error_msg), true, false);
-
-            return;
-        }
-
-        // configure session
-        $this->conn_configure($dsn, $dbh);
-
-        return $dbh;
-    }
-
-    /**
-     * Driver-specific configuration of database connection
-     *
-     * @param array $dsn DSN for DB connections
-     * @param PDO   $dbh Connection handler
-     */
-    protected function conn_configure($dsn, $dbh)
-    {
-        $init_queries = array(
-            "ALTER SESSION SET nls_date_format = 'YYYY-MM-DD'",
-            "ALTER SESSION SET nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS'",
-        );
-
-        foreach ($init_queries as $query) {
-            $stmt = oci_parse($dbh, $query);
-            oci_execute($stmt);
-        }
-    }
-
-    /**
-     * Connection state checker
-     *
-     * @return boolean True if in connected state
-     */
-    public function is_connected()
-    {
-        return empty($this->dbh) ? false : $this->db_connected;
-    }
-
-    /**
-     * Execute a SQL query with limits
-     *
-     * @param string $query   SQL query to execute
-     * @param int    $offset  Offset for LIMIT statement
-     * @param int    $numrows Number of rows for LIMIT statement
-     * @param array  $params  Values to be inserted in query
-     *
-     * @return PDOStatement|bool Query handle or False on error
-     */
-    protected function _query($query, $offset, $numrows, $params)
-    {
-        $query = ltrim($query);
-
-        $this->db_connect($this->dsn_select($query), true);
-
-        // check connection before proceeding
-        if (!$this->is_connected()) {
-            return $this->last_result = false;
-        }
-
-        if ($numrows || $offset) {
-            $query = $this->set_limit($query, $numrows, $offset);
-        }
-
-        // replace self::DEFAULT_QUOTE with driver-specific quoting
-        $query = $this->query_parse($query);
-
-        // Because in Roundcube we mostly use queries that are
-        // executed only once, we will not use prepared queries
-        $pos  = 0;
-        $idx  = 0;
-        $args = array();
-
-        if (count($params)) {
-            while ($pos = strpos($query, '?', $pos)) {
-                if ($query[$pos+1] == '?') {  // skip escaped '?'
-                    $pos += 2;
-                }
-                else {
-                    $val = $this->quote($params[$idx++]);
-
-                    // long strings are not allowed inline, need to be parametrized
-                    if (strlen($val) > 4000) {
-                        $key = ':param' . (count($args) + 1);
-                        $args[$key] = $params[$idx-1];
-                        $val = $key;
-                    }
-
-                    unset($params[$idx-1]);
-                    $query = substr_replace($query, $val, $pos, 1);
-                    $pos += strlen($val);
-                }
-            }
-        }
-
-        // replace escaped '?' back to normal, see self::quote()
-        $query = str_replace('??', '?', $query);
-        $query = rtrim($query, " \t\n\r\0\x0B;");
-
-        // log query
-        $this->debug($query);
-
-        // destroy reference to previous result
-        $this->last_result  = null;
-        $this->db_error_msg = null;
-
-        // prepare query
-        $result = @oci_parse($this->dbh, $query);
-        $mode   = $this->in_transaction ? OCI_NO_AUTO_COMMIT : OCI_COMMIT_ON_SUCCESS;
-
-        if ($result) {
-            foreach ($args as $param => $arg) {
-                oci_bind_by_name($result, $param, $args[$param], -1, SQLT_LNG);
-            }
-        }
-
-        // execute query
-        if (!$result || !@oci_execute($result, $mode)) {
-            $result = $this->handle_error($query, $result);
-        }
-
-        return $this->last_result = $result;
-    }
-
-    /**
-     * Helper method to handle DB errors.
-     * This by default logs the error but could be overriden by a driver implementation
-     *
-     * @param string Query that triggered the error
-     * @return mixed Result to be stored and returned
-     */
-    protected function handle_error($query, $result = null)
-    {
-        $error = oci_error(is_resource($result) ? $result : $this->dbh);
-
-        // @TODO: Find error codes for key errors
-        if (empty($this->options['ignore_key_errors']) || !in_array($error['code'], array('23000', '23505'))) {
-            $this->db_error = true;
-            $this->db_error_msg = sprintf('[%s] %s', $error['code'], $error['message']);
-
-            rcube::raise_error(array('code' => 500, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => $this->db_error_msg . " (SQL Query: $query)"
-                ), true, false);
-        }
-
-        return false;
-    }
-
-    /**
-     * Get last inserted record ID
-     *
-     * @param string $table Table name (to find the incremented sequence)
-     *
-     * @return mixed ID or false on failure
-     */
-    public function insert_id($table = null)
-    {
-        if (!$this->db_connected || $this->db_mode == 'r' || empty($table)) {
-            return false;
-        }
-
-        $sequence = $this->quote_identifier($this->sequence_name($table));
-        $result   = $this->query("SELECT $sequence.currval FROM dual");
-        $result   = $this->fetch_array($result);
-
-        return $result[0] ?: false;
-    }
-
-    /**
-     * Get number of affected rows for the last query
-     *
-     * @param mixed $result Optional query handle
-     *
-     * @return int Number of (matching) rows
-     */
-    public function affected_rows($result = null)
-    {
-        if ($result || ($result === null && ($result = $this->last_result))) {
-            return oci_num_rows($result);
-        }
-
-        return 0;
-    }
-
-    /**
-     * Get number of rows for a SQL query
-     * If no query handle is specified, the last query will be taken as reference
-     *
-     * @param mixed $result Optional query handle
-     * @return mixed   Number of rows or false on failure
-     * @deprecated This method shows very poor performance and should be avoided.
-     */
-    public function num_rows($result = null)
-    {
-        // not implemented
-        return false;
-    }
-
-    /**
-     * Get an associative array for one row
-     * If no query handle is specified, the last query will be taken as reference
-     *
-     * @param mixed $result Optional query handle
-     *
-     * @return mixed Array with col values or false on failure
-     */
-    public function fetch_assoc($result = null)
-    {
-        return $this->_fetch_row($result, OCI_ASSOC);
-    }
-
-    /**
-     * Get an index array for one row
-     * If no query handle is specified, the last query will be taken as reference
-     *
-     * @param mixed $result Optional query handle
-     *
-     * @return mixed Array with col values or false on failure
-     */
-    public function fetch_array($result = null)
-    {
-        return $this->_fetch_row($result, OCI_NUM);
-    }
-
-    /**
-     * Get col values for a result row
-     *
-     * @param mixed $result Optional query handle
-     * @param int   $mode   Fetch mode identifier
-     *
-     * @return mixed Array with col values or false on failure
-     */
-    protected function _fetch_row($result, $mode)
-    {
-        if ($result || ($result === null && ($result = $this->last_result))) {
-            return oci_fetch_array($result, $mode + OCI_RETURN_NULLS + OCI_RETURN_LOBS);
-        }
-
-        return false;
-    }
-
-    /**
-     * Formats input so it can be safely used in a query
-     * PDO_OCI does not implement quote() method
-     *
-     * @param mixed  $input Value to quote
-     * @param string $type  Type of data (integer, bool, ident)
-     *
-     * @return string Quoted/converted string for use in query
-     */
-    public function quote($input, $type = null)
-    {
-        // handle int directly for better performance
-        if ($type == 'integer' || $type == 'int') {
-            return intval($input);
-        }
-
-        if (is_null($input)) {
-            return 'NULL';
-        }
-
-        if ($type == 'ident') {
-            return $this->quote_identifier($input);
-        }
-
-        switch ($type) {
-        case 'bool':
-        case 'integer':
-            return intval($input);
-        default:
-            return "'" . strtr($input, array(
-                    '?' => '??',
-                    "'" => "''",
-                    rcube_db::DEFAULT_QUOTE => rcube_db::DEFAULT_QUOTE . rcube_db::DEFAULT_QUOTE
-            )) . "'";
-        }
-    }
-
-    /**
-     * Return correct name for a specific database sequence
-     *
-     * @param string $table Table name
-     *
-     * @return string Translated sequence name
-     */
-    protected function sequence_name($table)
-    {
-        // Note: we support only one sequence per table
-        // Note: The sequence name must be <table_name>_seq
-        $sequence = $table . '_seq';
-
-        // modify sequence name if prefix is configured
-        if ($prefix = $this->options['table_prefix']) {
-            return $prefix . $sequence;
-        }
-
-        return $sequence;
-    }
-
-    /**
-     * Return SQL statement for case insensitive LIKE
-     *
-     * @param string $column Field name
-     * @param string $value  Search value
-     *
-     * @return string SQL statement to use in query
-     */
-    public function ilike($column, $value)
-    {
-        return 'UPPER(' . $this->quote_identifier($column) . ') LIKE UPPER(' . $this->quote($value) . ')';
-    }
-
-    /**
-     * Return SQL function for current time and date
-     *
-     * @param int $interval Optional interval (in seconds) to add/subtract
-     *
-     * @return string SQL function to use in query
-     */
-    public function now($interval = 0)
-    {
-        if ($interval) {
-            $interval = intval($interval);
-            return "current_timestamp + INTERVAL '$interval' SECOND";
-        }
-
-        return "current_timestamp";
-    }
-
-    /**
-     * Return SQL statement to convert a field value into a unix timestamp
-     *
-     * @param string $field Field name
-     *
-     * @return string SQL statement to use in query
-     * @deprecated
-     */
-    public function unixtimestamp($field)
-    {
-        return "(($field - to_date('1970-01-01','YYYY-MM-DD')) * 60 * 60 * 24)";
-    }
-
-    /**
-     * Adds TOP (LIMIT,OFFSET) clause to the query
-     *
-     * @param string $query  SQL query
-     * @param int    $limit  Number of rows
-     * @param int    $offset Offset
-     *
-     * @return string SQL query
-     */
-    protected function set_limit($query, $limit = 0, $offset = 0)
-    {
-        $limit  = intval($limit);
-        $offset = intval($offset);
-        $end    = $offset + $limit;
-
-        // @TODO: Oracle 12g has better OFFSET support
-
-        if (!$offset) {
-            $query = "SELECT * FROM ($query) a WHERE rownum <= $end";
-        }
-        else {
-            $query = "SELECT * FROM (SELECT a.*, rownum as rn FROM ($query) a WHERE rownum <= $end) b WHERE rn > $offset";
-        }
-
-        return $query;
-    }
-
-    /**
-     * Parse SQL file and fix table names according to table prefix
-     */
-    protected function fix_table_names($sql)
-    {
-        if (!$this->options['table_prefix']) {
-            return $sql;
-        }
-
-        $sql = parent::fix_table_names($sql);
-
-        // replace sequence names, and other Oracle-specific commands
-        $sql = preg_replace_callback('/((SEQUENCE ["]?)([^" \r\n]+)/',
-            array($this, 'fix_table_names_callback'),
-            $sql
-        );
-
-        $sql = preg_replace_callback(
-            '/([ \r\n]+["]?)([^"\' \r\n\.]+)(["]?\.nextval)/',
-            array($this, 'fix_table_names_seq_callback'),
-            $sql
-        );
-
-        return $sql;
-    }
-
-    /**
-     * Preg_replace callback for fix_table_names()
-     */
-    protected function fix_table_names_seq_callback($matches)
-    {
-        return $matches[1] . $this->options['table_prefix'] . $matches[2] . $matches[3];
-    }
-
-    /**
-     * Returns connection options from DSN array
-     */
-    protected function dsn_options($dsn)
-    {
-        $params = array();
-
-        if ($dsn['hostspec']) {
-            $host = $dsn['hostspec'];
-            if ($dsn['port']) {
-                $host .= ':' . $dsn['port'];
-            }
-
-            $params['database'] = $host . '/' . $dsn['database'];
-        }
-
-        $params['charset'] = 'UTF8';
-
-        return $params;
-    }
-
-    /**
-     * Execute the given SQL script
-     *
-     * @param string SQL queries to execute
-     *
-     * @return boolen True on success, False on error
-     */
-    public function exec_script($sql)
-    {
-        $sql  = $this->fix_table_names($sql);
-        $buff = '';
-        $body = false;
-
-        foreach (explode("\n", $sql) as $line) {
-            $tok = strtolower(trim($line));
-            if (preg_match('/^--/', $line) || $tok == '') {
-                continue;
-            }
-
-            $buff .= $line . "\n";
-
-            // detect PL/SQL function bodies, don't break on semicolon
-            if ($body && $tok == 'end;') {
-                $body = false;
-            }
-            else if (!$body && $tok == 'begin') {
-                $body = true;
-            }
-
-            if (!$body && substr($tok, -1) == ';') {
-                $this->query($buff);
-                $buff = '';
-                if ($this->db_error) {
-                    break;
-                }
-            }
-        }
-
-        return !$this->db_error;
-    }
-
-    /**
-     * Start transaction
-     *
-     * @return bool True on success, False on failure
-     */
-    public function startTransaction()
-    {
-        $this->db_connect('w', true);
-
-        // check connection before proceeding
-        if (!$this->is_connected()) {
-            return $this->last_result = false;
-        }
-
-        $this->debug('BEGIN TRANSACTION');
-
-        return $this->last_result = $this->in_transaction = true;
-    }
-
-    /**
-     * Commit transaction
-     *
-     * @return bool True on success, False on failure
-     */
-    public function endTransaction()
-    {
-        $this->db_connect('w', true);
-
-        // check connection before proceeding
-        if (!$this->is_connected()) {
-            return $this->last_result = false;
-        }
-
-        $this->debug('COMMIT TRANSACTION');
-
-        if ($result = @oci_commit($this->dbh)) {
-            $this->in_transaction = true;
-        }
-        else {
-            $this->handle_error('COMMIT');
-        }
-
-        return $this->last_result = $result;
-    }
-
-    /**
-     * Rollback transaction
-     *
-     * @return bool True on success, False on failure
-     */
-    public function rollbackTransaction()
-    {
-        $this->db_connect('w', true);
-
-        // check connection before proceeding
-        if (!$this->is_connected()) {
-            return $this->last_result = false;
-        }
-
-        $this->debug('ROLLBACK TRANSACTION');
-
-        if ($result = @oci_rollback($this->dbh)) {
-            $this->in_transaction = false;
-        }
-        else {
-            $this->handle_error('ROLLBACK');
-        }
-
-        return $this->last_result = $this->dbh->rollBack();
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_db_pgsql.php b/lib/ext/Roundcube/rcube_db_pgsql.php
deleted file mode 100644
index 68bf6d8..0000000
--- a/lib/ext/Roundcube/rcube_db_pgsql.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Database wrapper class that implements PHP PDO functions            |
- |   for PostgreSQL database                                             |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Database independent query interface
- * This is a wrapper for the PHP PDO
- *
- * @package    Framework
- * @subpackage Database
- */
-class rcube_db_pgsql extends rcube_db
-{
-    public $db_provider = 'postgres';
-
-    /**
-     * Driver-specific configuration of database connection
-     *
-     * @param array $dsn DSN for DB connections
-     * @param PDO   $dbh Connection handler
-     */
-    protected function conn_configure($dsn, $dbh)
-    {
-        $dbh->query("SET NAMES 'utf8'");
-    }
-
-    /**
-     * Get last inserted record ID
-     *
-     * @param string $table Table name (to find the incremented sequence)
-     *
-     * @return mixed ID or false on failure
-     */
-    public function insert_id($table = null)
-    {
-        if (!$this->db_connected || $this->db_mode == 'r') {
-            return false;
-        }
-
-        if ($table) {
-            $table = $this->sequence_name($table);
-        }
-
-        $id = $this->dbh->lastInsertId($table);
-
-        return $id;
-    }
-
-    /**
-     * Return correct name for a specific database sequence
-     *
-     * @param string $table Table name
-     *
-     * @return string Translated sequence name
-     */
-    protected function sequence_name($table)
-    {
-        // Note: we support only one sequence per table
-        // Note: The sequence name must be <table_name>_seq
-        $sequence = $table . '_seq';
-        $rcube    = rcube::get_instance();
-
-        // return sequence name if configured
-        if ($prefix = $rcube->config->get('db_prefix')) {
-            return $prefix . $sequence;
-        }
-
-        return $sequence;
-    }
-
-    /**
-     * Return SQL statement to convert a field value into a unix timestamp
-     *
-     * @param string $field Field name
-     *
-     * @return string SQL statement to use in query
-     * @deprecated
-     */
-    public function unixtimestamp($field)
-    {
-        return "EXTRACT (EPOCH FROM $field)";
-    }
-
-    /**
-     * Return SQL function for current time and date
-     *
-     * @param int $interval Optional interval (in seconds) to add/subtract
-     *
-     * @return string SQL function to use in query
-     */
-    public function now($interval = 0)
-    {
-        if ($interval) {
-            $add = ' ' . ($interval > 0 ? '+' : '-') . " interval '";
-            $add .= $interval > 0 ? intval($interval) : intval($interval) * -1;
-            $add .= " seconds'";
-        }
-
-        return "now()" . $add;
-    }
-
-    /**
-     * Return SQL statement for case insensitive LIKE
-     *
-     * @param string $column Field name
-     * @param string $value  Search value
-     *
-     * @return string SQL statement to use in query
-     */
-    public function ilike($column, $value)
-    {
-        return $this->quote_identifier($column) . ' ILIKE ' . $this->quote($value);
-    }
-
-    /**
-     * Get database runtime variables
-     *
-     * @param string $varname Variable name
-     * @param mixed  $default Default value if variable is not set
-     *
-     * @return mixed Variable value or default
-     */
-    public function get_variable($varname, $default = null)
-    {
-        // There's a known case when max_allowed_packet is queried
-        // PostgreSQL doesn't have such limit, return immediately
-        if ($varname == 'max_allowed_packet') {
-            return $default;
-        }
-
-        if (!isset($this->variables)) {
-            $this->variables = array();
-
-            $result = $this->query('SHOW ALL');
-
-            while ($row = $this->fetch_array($result)) {
-                $this->variables[$row[0]] = $row[1];
-            }
-        }
-
-        return isset($this->variables[$varname]) ? $this->variables[$varname] : $default;
-    }
-
-    /**
-     * Returns PDO DSN string from DSN array
-     *
-     * @param array $dsn DSN parameters
-     *
-     * @return string DSN string
-     */
-    protected function dsn_string($dsn)
-    {
-        $params = array();
-        $result = 'pgsql:';
-
-        if ($dsn['hostspec']) {
-            $params[] = 'host=' . $dsn['hostspec'];
-        }
-        else if ($dsn['socket']) {
-            $params[] = 'host=' . $dsn['socket'];
-        }
-
-        if ($dsn['port']) {
-            $params[] = 'port=' . $dsn['port'];
-        }
-
-        if ($dsn['database']) {
-            $params[] = 'dbname=' . $dsn['database'];
-        }
-
-        if (!empty($params)) {
-            $result .= implode(';', $params);
-        }
-
-        return $result;
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_db_sqlite.php b/lib/ext/Roundcube/rcube_db_sqlite.php
deleted file mode 100644
index b66c560..0000000
--- a/lib/ext/Roundcube/rcube_db_sqlite.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Database wrapper class that implements PHP PDO functions            |
- |   for SQLite database                                                 |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Database independent query interface
- * This is a wrapper for the PHP PDO
- *
- * @package    Framework
- * @subpackage Database
- */
-class rcube_db_sqlite extends rcube_db
-{
-    public $db_provider = 'sqlite';
-
-    /**
-     * Prepare connection
-     */
-    protected function conn_prepare($dsn)
-    {
-        // Create database file, required by PDO to exist on connection
-        if (!empty($dsn['database']) && !file_exists($dsn['database'])) {
-            $created = touch($dsn['database']);
-
-            // File mode setting, for compat. with MDB2
-            if (!empty($dsn['mode']) && $created) {
-                chmod($dsn['database'], octdec($dsn['mode']));
-            }
-        }
-    }
-
-    /**
-     * Configure connection, create database if not exists
-     */
-    protected function conn_configure($dsn, $dbh)
-    {
-        // Initialize database structure in file is empty
-        if (!empty($dsn['database']) && !filesize($dsn['database'])) {
-            $data = file_get_contents(RCUBE_INSTALL_PATH . 'SQL/sqlite.initial.sql');
-
-            if (strlen($data)) {
-                $this->debug('INITIALIZE DATABASE');
-
-                $q = $dbh->exec($data);
-
-                if ($q === false) {
-                    $error = $dbh->errorInfo();
-                    $this->db_error = true;
-                    $this->db_error_msg = sprintf('[%s] %s', $error[1], $error[2]);
-
-                    rcube::raise_error(array('code' => 500, 'type' => 'db',
-                        'line' => __LINE__, 'file' => __FILE__,
-                        'message' => $this->db_error_msg), true, false);
-                }
-            }
-        }
-    }
-
-    /**
-     * Return SQL statement to convert a field value into a unix timestamp
-     *
-     * @param string $field Field name
-     *
-     * @return string  SQL statement to use in query
-     * @deprecated
-     */
-    public function unixtimestamp($field)
-    {
-        return "strftime('%s', $field)";
-    }
-
-    /**
-     * Return SQL function for current time and date
-     *
-     * @param int $interval Optional interval (in seconds) to add/subtract
-     *
-     * @return string SQL function to use in query
-     */
-    public function now($interval = 0)
-    {
-        if ($interval) {
-            $add = ($interval > 0 ? '+' : '') . intval($interval) . ' seconds';
-        }
-
-        return "datetime('now'" . ($add ? ",'$add'" : "") . ")";
-    }
-
-    /**
-     * Returns list of tables in database
-     *
-     * @return array List of all tables of the current database
-     */
-    public function list_tables()
-    {
-        if ($this->tables === null) {
-            $q = $this->query('SELECT name FROM sqlite_master'
-                .' WHERE type = \'table\' ORDER BY name');
-
-            $this->tables = $q ? $q->fetchAll(PDO::FETCH_COLUMN, 0) : array();
-        }
-
-        return $this->tables;
-    }
-
-    /**
-     * Returns list of columns in database table
-     *
-     * @param string $table Table name
-     *
-     * @return array List of table cols
-     */
-    public function list_cols($table)
-    {
-        $q = $this->query('SELECT sql FROM sqlite_master WHERE type = ? AND name = ?',
-            array('table', $table));
-
-        $columns = array();
-
-        if ($sql = $this->fetch_array($q)) {
-            $sql       = $sql[0];
-            $start_pos = strpos($sql, '(');
-            $end_pos   = strrpos($sql, ')');
-            $sql       = substr($sql, $start_pos+1, $end_pos-$start_pos-1);
-            $lines     = explode(',', $sql);
-
-            foreach ($lines as $line) {
-                $line = explode(' ', trim($line));
-
-                if ($line[0] && strpos($line[0], '--') !== 0) {
-                    $column = $line[0];
-                    $columns[] = trim($column, '"');
-                }
-            }
-        }
-
-        return $columns;
-    }
-
-    /**
-     * Build DSN string for PDO constructor
-     */
-    protected function dsn_string($dsn)
-    {
-        return $dsn['phptype'] . ':' . $dsn['database'];
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_db_sqlsrv.php b/lib/ext/Roundcube/rcube_db_sqlsrv.php
deleted file mode 100644
index 4339f3d..0000000
--- a/lib/ext/Roundcube/rcube_db_sqlsrv.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Database wrapper class that implements PHP PDO functions            |
- |   for MS SQL Server database                                          |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Database independent query interface
- * This is a wrapper for the PHP PDO
- *
- * @package    Framework
- * @subpackage Database
- */
-class rcube_db_sqlsrv extends rcube_db
-{
-    public $db_provider = 'mssql';
-
-    /**
-     * Object constructor
-     *
-     * @param string $db_dsnw DSN for read/write operations
-     * @param string $db_dsnr Optional DSN for read only operations
-     * @param bool   $pconn   Enables persistent connections
-     */
-    public function __construct($db_dsnw, $db_dsnr = '', $pconn = false)
-    {
-        parent::__construct($db_dsnw, $db_dsnr, $pconn);
-
-        $this->options['identifier_start'] = '[';
-        $this->options['identifier_end'] = ']';
-    }
-
-    /**
-     * Driver-specific configuration of database connection
-     *
-     * @param array $dsn DSN for DB connections
-     * @param PDO   $dbh Connection handler
-     */
-    protected function conn_configure($dsn, $dbh)
-    {
-        // Set date format in case of non-default language (#1488918)
-        $dbh->query("SET DATEFORMAT ymd");
-    }
-
-    /**
-     * Return SQL function for current time and date
-     *
-     * @param int $interval Optional interval (in seconds) to add/subtract
-     *
-     * @return string SQL function to use in query
-     */
-    public function now($interval = 0)
-    {
-        if ($interval) {
-            $interval = intval($interval);
-            return "dateadd(second, $interval, getdate())";
-        }
-
-        return "getdate()";
-    }
-
-    /**
-     * Return SQL statement to convert a field value into a unix timestamp
-     *
-     * This method is deprecated and should not be used anymore due to limitations
-     * of timestamp functions in Mysql (year 2038 problem)
-     *
-     * @param string $field Field name
-     *
-     * @return string SQL statement to use in query
-     * @deprecated
-     */
-    public function unixtimestamp($field)
-    {
-        return "DATEDIFF(second, '19700101', $field) + DATEDIFF(second, GETDATE(), GETUTCDATE())";
-    }
-
-    /**
-     * Abstract SQL statement for value concatenation
-     *
-     * @return string SQL statement to be used in query
-     */
-    public function concat(/* col1, col2, ... */)
-    {
-        $args = func_get_args();
-
-        if (is_array($args[0])) {
-            $args = $args[0];
-        }
-
-        return '(' . join('+', $args) . ')';
-    }
-
-    /**
-     * Adds TOP (LIMIT,OFFSET) clause to the query
-     *
-     * @param string $query  SQL query
-     * @param int    $limit  Number of rows
-     * @param int    $offset Offset
-     *
-     * @return string SQL query
-     */
-    protected function set_limit($query, $limit = 0, $offset = 0)
-    {
-        $limit  = intval($limit);
-        $offset = intval($offset);
-        $end    = $offset + $limit;
-
-        // query without OFFSET
-        if (!$offset) {
-            $query = preg_replace('/^SELECT\s/i', "SELECT TOP $limit ", $query);
-            return $query;
-        }
-
-        $orderby = stristr($query, 'ORDER BY');
-        $offset += 1;
-
-        if ($orderby !== false) {
-            $query = trim(substr($query, 0, -1 * strlen($orderby)));
-        }
-        else {
-            // it shouldn't happen, paging without sorting has not much sense
-            // @FIXME: I don't know how to build paging query without ORDER BY
-            $orderby = "ORDER BY 1";
-        }
-
-        $query = preg_replace('/^SELECT\s/i', '', $query);
-        $query = "WITH paging AS (SELECT ROW_NUMBER() OVER ($orderby) AS [RowNumber], $query)"
-            . " SELECT * FROM paging WHERE [RowNumber] BETWEEN $offset AND $end ORDER BY [RowNumber]";
-
-        return $query;
-    }
-
-    /**
-     * Returns PDO DSN string from DSN array
-     */
-    protected function dsn_string($dsn)
-    {
-        $params = array();
-        $result = 'sqlsrv:';
-
-        if ($dsn['hostspec']) {
-            $host = $dsn['hostspec'];
-
-            if ($dsn['port']) {
-                $host .= ',' . $dsn['port'];
-            }
-            $params[] = 'Server=' . $host;
-        }
-
-        if ($dsn['database']) {
-            $params[] = 'Database=' . $dsn['database'];
-        }
-
-        if (!empty($params)) {
-            $result .= implode(';', $params);
-        }
-
-        return $result;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_enriched.php b/lib/ext/Roundcube/rcube_enriched.php
deleted file mode 100644
index 12deb33..0000000
--- a/lib/ext/Roundcube/rcube_enriched.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Helper class to convert Enriched to HTML format (RFC 1523, 1896)    |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- | Author: Ryo Chijiiwa (IlohaMail)                                      |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Class for Enriched to HTML conversion
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_enriched
-{
-    protected static function convert_newlines($body)
-    {
-        // remove single newlines, convert N newlines to N-1
-        $body = str_replace("\r\n", "\n", $body);
-        $len  = strlen($body);
-        $nl   = 0;
-        $out  = '';
-
-        for ($i=0; $i<$len; $i++) {
-            $c = $body[$i];
-            if (ord($c) == 10)
-                $nl++;
-            if ($nl && ord($c) != 10)
-                $nl = 0;
-            if ($nl != 1)
-                $out .= $c;
-            else
-                $out .= ' ';
-        }
-
-        return $out;
-    }
-
-    protected static function convert_formatting($body)
-    {
-        $replace = array(
-            '<bold>'        => '<b>',            '</bold>'   => '</b>',
-            '<italic>'      => '<i>',            '</italic>' => '</i>',
-            '<fixed>'       => '<tt>',           '</fixed>'  => '</tt>',
-            '<smaller>'     => '<font size=-1>', '</smaller>'=> '</font>',
-            '<bigger>'      => '<font size=+1>', '</bigger>' => '</font>',
-            '<underline>'   => '<span style="text-decoration: underline">', '</underline>'   => '</span>',
-            '<flushleft>'   => '<span style="text-align: left">',           '</flushleft>'   => '</span>',
-            '<flushright>'  => '<span style="text-align: right">',          '</flushright>'  => '</span>',
-            '<flushboth>'   => '<span style="text-align: justified">',      '</flushboth>'   => '</span>',
-            '<indent>'      => '<span style="padding-left: 20px">',         '</indent>'      => '</span>',
-            '<indentright>' => '<span style="padding-right: 20px">',        '</indentright>' => '</span>',
-        );
-
-        return str_ireplace(array_keys($replace), array_values($replace), $body);
-    }
-
-    protected static function convert_font($body)
-    {
-        $pattern = '/(.*)\<fontfamily\>\<param\>(.*)\<\/param\>(.*)\<\/fontfamily\>(.*)/ims';
-
-        while (preg_match($pattern, $body, $a)) {
-            if (count($a) != 5)
-                continue;
-
-            $body = $a[1].'<span style="font-family: '.$a[2].'">'.$a[3].'</span>'.$a[4];
-        }
-
-        return $body;
-    }
-
-    protected static function convert_color($body)
-    {
-        $pattern = '/(.*)\<color\>\<param\>(.*)\<\/param\>(.*)\<\/color\>(.*)/ims';
-
-        while (preg_match($pattern, $body, $a)) {
-            if (count($a) != 5)
-                continue;
-
-            // extract color (either by name, or ####,####,####)
-            if (strpos($a[2],',')) {
-                $rgb   = explode(',',$a[2]);
-                $color = '#';
-                for ($i=0; $i<3; $i++)
-                    $color .= substr($rgb[$i], 0, 2); // just take first 2 bytes
-            }
-            else {
-                $color = $a[2];
-            }
-
-            // put it all together
-            $body = $a[1].'<span style="color: '.$color.'">'.$a[3].'</span>'.$a[4];
-        }
-
-        return $body;
-    }
-
-    protected static function convert_excerpt($body)
-    {
-        $pattern = '/(.*)\<excerpt\>(.*)\<\/excerpt\>(.*)/i';
-
-        while (preg_match($pattern, $body, $a)) {
-            if (count($a) != 4)
-                continue;
-
-            $quoted = '';
-            $lines  = explode('<br>', $a[2]);
-
-            foreach ($lines as $line)
-                $quoted .= '&gt;'.$line.'<br>';
-
-            $body = $a[1].'<span class="quotes">'.$quoted.'</span>'.$a[3];
-        }
-
-        return $body;
-    }
-
-    public static function to_html($body)
-    {
-        $body = str_replace('<<','&lt;',$body);
-        $body = self::convert_newlines($body);
-        $body = str_replace("\n", '<br>', $body);
-        $body = self::convert_formatting($body);
-        $body = self::convert_color($body);
-        $body = self::convert_font($body);
-        $body = self::convert_excerpt($body);
-        //$body = nl2br($body);
-
-        return $body;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_html2text.php b/lib/ext/Roundcube/rcube_html2text.php
deleted file mode 100644
index 01362e6..0000000
--- a/lib/ext/Roundcube/rcube_html2text.php
+++ /dev/null
@@ -1,704 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
- | Copyright (c) 2005-2007, Jon Abernathy <jon@chuggnutt.com>            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Converts HTML to formatted plain text (based on html2text class)    |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- | Author: Jon Abernathy <jon@chuggnutt.com>                             |
- +-----------------------------------------------------------------------+
- */
-
-/**
- *  Takes HTML and converts it to formatted, plain text.
- *
- *  Thanks to Alexander Krug (http://www.krugar.de/) to pointing out and
- *  correcting an error in the regexp search array. Fixed 7/30/03.
- *
- *  Updated set_html() function's file reading mechanism, 9/25/03.
- *
- *  Thanks to Joss Sanglier (http://www.dancingbear.co.uk/) for adding
- *  several more HTML entity codes to the $search and $replace arrays.
- *  Updated 11/7/03.
- *
- *  Thanks to Darius Kasperavicius (http://www.dar.dar.lt/) for
- *  suggesting the addition of $allowed_tags and its supporting function
- *  (which I slightly modified). Updated 3/12/04.
- *
- *  Thanks to Justin Dearing for pointing out that a replacement for the
- *  <TH> tag was missing, and suggesting an appropriate fix.
- *  Updated 8/25/04.
- *
- *  Thanks to Mathieu Collas (http://www.myefarm.com/) for finding a
- *  display/formatting bug in the _build_link_list() function: email
- *  readers would show the left bracket and number ("[1") as part of the
- *  rendered email address.
- *  Updated 12/16/04.
- *
- *  Thanks to Wojciech Bajon (http://histeria.pl/) for submitting code
- *  to handle relative links, which I hadn't considered. I modified his
- *  code a bit to handle normal HTTP links and MAILTO links. Also for
- *  suggesting three additional HTML entity codes to search for.
- *  Updated 03/02/05.
- *
- *  Thanks to Jacob Chandler for pointing out another link condition
- *  for the _build_link_list() function: "https".
- *  Updated 04/06/05.
- *
- *  Thanks to Marc Bertrand (http://www.dresdensky.com/) for
- *  suggesting a revision to the word wrapping functionality; if you
- *  specify a $width of 0 or less, word wrapping will be ignored.
- *  Updated 11/02/06.
- *
- *  *** Big housecleaning updates below:
- *
- *  Thanks to Colin Brown (http://www.sparkdriver.co.uk/) for
- *  suggesting the fix to handle </li> and blank lines (whitespace).
- *  Christian Basedau (http://www.movetheweb.de/) also suggested the
- *  blank lines fix.
- *
- *  Special thanks to Marcus Bointon (http://www.synchromedia.co.uk/),
- *  Christian Basedau, Norbert Laposa (http://ln5.co.uk/),
- *  Bas van de Weijer, and Marijn van Butselaar
- *  for pointing out my glaring error in the <th> handling. Marcus also
- *  supplied a host of fixes.
- *
- *  Thanks to Jeffrey Silverman (http://www.newtnotes.com/) for pointing
- *  out that extra spaces should be compressed--a problem addressed with
- *  Marcus Bointon's fixes but that I had not yet incorporated.
- *
- *  Thanks to Daniel Schledermann (http://www.typoconsult.dk/) for
- *  suggesting a valuable fix with <a> tag handling.
- *
- *  Thanks to Wojciech Bajon (again!) for suggesting fixes and additions,
- *  including the <a> tag handling that Daniel Schledermann pointed
- *  out but that I had not yet incorporated. I haven't (yet)
- *  incorporated all of Wojciech's changes, though I may at some
- *  future time.
- *
- *  *** End of the housecleaning updates. Updated 08/08/07.
- */
-
-/**
- * Converts HTML to formatted plain text
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_html2text
-{
-    /**
-     * Contains the HTML content to convert.
-     *
-     * @var string $html
-     */
-    protected $html;
-
-    /**
-     * Contains the converted, formatted text.
-     *
-     * @var string $text
-     */
-    protected $text;
-
-    /**
-     * Maximum width of the formatted text, in columns.
-     *
-     * Set this value to 0 (or less) to ignore word wrapping
-     * and not constrain text to a fixed-width column.
-     *
-     * @var integer $width
-     */
-    protected $width = 70;
-
-    /**
-     * Target character encoding for output text
-     *
-     * @var string $charset
-     */
-    protected $charset = 'UTF-8';
-
-    /**
-     * List of preg* regular expression patterns to search for,
-     * used in conjunction with $replace.
-     *
-     * @var array $search
-     * @see $replace
-     */
-    protected $search = array(
-        "/\r/",                                  // Non-legal carriage return
-        "/[\n\t]+/",                             // Newlines and tabs
-        '/<head[^>]*>.*?<\/head>/i',             // <head>
-        '/<script[^>]*>.*?<\/script>/i',         // <script>s -- which strip_tags supposedly has problems with
-        '/<style[^>]*>.*?<\/style>/i',           // <style>s -- which strip_tags supposedly has problems with
-        '/<p[^>]*>/i',                           // <P>
-        '/<br[^>]*>/i',                          // <br>
-        '/<i[^>]*>(.*?)<\/i>/i',                 // <i>
-        '/<em[^>]*>(.*?)<\/em>/i',               // <em>
-        '/(<ul[^>]*>|<\/ul>)/i',                 // <ul> and </ul>
-        '/(<ol[^>]*>|<\/ol>)/i',                 // <ol> and </ol>
-        '/<li[^>]*>(.*?)<\/li>/i',               // <li> and </li>
-        '/<li[^>]*>/i',                          // <li>
-        '/<hr[^>]*>/i',                          // <hr>
-        '/<div[^>]*>/i',                         // <div>
-        '/(<table[^>]*>|<\/table>)/i',           // <table> and </table>
-        '/(<tr[^>]*>|<\/tr>)/i',                 // <tr> and </tr>
-        '/<td[^>]*>(.*?)<\/td>/i',               // <td> and </td>
-    );
-
-    /**
-     * List of pattern replacements corresponding to patterns searched.
-     *
-     * @var array $replace
-     * @see $search
-     */
-    protected $replace = array(
-        '',                                     // Non-legal carriage return
-        ' ',                                    // Newlines and tabs
-        '',                                     // <head>
-        '',                                     // <script>s -- which strip_tags supposedly has problems with
-        '',                                     // <style>s -- which strip_tags supposedly has problems with
-        "\n\n",                                 // <P>
-        "\n",                                   // <br>
-        '_\\1_',                                // <i>
-        '_\\1_',                                // <em>
-        "\n\n",                                 // <ul> and </ul>
-        "\n\n",                                 // <ol> and </ol>
-        "\t* \\1\n",                            // <li> and </li>
-        "\n\t* ",                               // <li>
-        "\n-------------------------\n",        // <hr>
-        "<div>\n",                              // <div>
-        "\n\n",                                 // <table> and </table>
-        "\n",                                   // <tr> and </tr>
-        "\t\t\\1\n",                            // <td> and </td>
-    );
-
-    /**
-     * List of preg* regular expression patterns to search for,
-     * used in conjunction with $ent_replace.
-     *
-     * @var array $ent_search
-     * @see $ent_replace
-     */
-    protected $ent_search = array(
-        '/&(nbsp|#160);/i',                      // Non-breaking space
-        '/&(quot|rdquo|ldquo|#8220|#8221|#147|#148);/i',
-                                         // Double quotes
-        '/&(apos|rsquo|lsquo|#8216|#8217);/i',   // Single quotes
-        '/&gt;/i',                               // Greater-than
-        '/&lt;/i',                               // Less-than
-        '/&(copy|#169);/i',                      // Copyright
-        '/&(trade|#8482|#153);/i',               // Trademark
-        '/&(reg|#174);/i',                       // Registered
-        '/&(mdash|#151|#8212);/i',               // mdash
-        '/&(ndash|minus|#8211|#8722);/i',        // ndash
-        '/&(bull|#149|#8226);/i',                // Bullet
-        '/&(pound|#163);/i',                     // Pound sign
-        '/&(euro|#8364);/i',                     // Euro sign
-        '/&(amp|#38);/i',                        // Ampersand: see _converter()
-        '/[ ]{2,}/',                             // Runs of spaces, post-handling
-    );
-
-    /**
-     * List of pattern replacements corresponding to patterns searched.
-     *
-     * @var array $ent_replace
-     * @see $ent_search
-     */
-    protected $ent_replace = array(
-        ' ',                                    // Non-breaking space
-        '"',                                    // Double quotes
-        "'",                                    // Single quotes
-        '>',
-        '<',
-        '(c)',
-        '(tm)',
-        '(R)',
-        '--',
-        '-',
-        '*',
-        '£',
-        'EUR',                                  // Euro sign. � ?
-        '|+|amp|+|',                            // Ampersand: see _converter()
-        ' ',                                    // Runs of spaces, post-handling
-    );
-
-    /**
-     * List of preg* regular expression patterns to search for
-     * and replace using callback function.
-     *
-     * @var array $callback_search
-     */
-    protected $callback_search = array(
-        '/<(a) [^>]*href=("|\')([^"\']+)\2[^>]*>(.*?)<\/a>/i', // <a href="">
-        '/<(h)[123456]( [^>]*)?>(.*?)<\/h[123456]>/i',         // h1 - h6
-        '/<(b)( [^>]*)?>(.*?)<\/b>/i',                         // <b>
-        '/<(strong)( [^>]*)?>(.*?)<\/strong>/i',               // <strong>
-        '/<(th)( [^>]*)?>(.*?)<\/th>/i',                       // <th> and </th>
-    );
-
-   /**
-    * List of preg* regular expression patterns to search for in PRE body,
-    * used in conjunction with $pre_replace.
-    *
-    * @var array $pre_search
-    * @see $pre_replace
-    */
-    protected $pre_search = array(
-        "/\n/",
-        "/\t/",
-        '/ /',
-        '/<pre[^>]*>/',
-        '/<\/pre>/'
-    );
-
-    /**
-     * List of pattern replacements corresponding to patterns searched for PRE body.
-     *
-     * @var array $pre_replace
-     * @see $pre_search
-     */
-    protected $pre_replace = array(
-        '<br>',
-        '&nbsp;&nbsp;&nbsp;&nbsp;',
-        '&nbsp;',
-        '',
-        ''
-    );
-
-    /**
-     * Contains a list of HTML tags to allow in the resulting text.
-     *
-     * @var string $allowed_tags
-     * @see set_allowed_tags()
-     */
-    protected $allowed_tags = '';
-
-    /**
-     * Contains the base URL that relative links should resolve to.
-     *
-     * @var string $url
-     */
-    protected $url;
-
-    /**
-     * Indicates whether content in the $html variable has been converted yet.
-     *
-     * @var boolean $_converted
-     * @see $html, $text
-     */
-    protected $_converted = false;
-
-    /**
-     * Contains URL addresses from links to be rendered in plain text.
-     *
-     * @var array $_link_list
-     * @see _build_link_list()
-     */
-    protected $_link_list = array();
-
-    /**
-     * Boolean flag, true if a table of link URLs should be listed after the text.
-     *
-     * @var boolean $_do_links
-     * @see __construct()
-     */
-    protected $_do_links = true;
-
-    /**
-     * Constructor.
-     *
-     * If the HTML source string (or file) is supplied, the class
-     * will instantiate with that source propagated, all that has
-     * to be done it to call get_text().
-     *
-     * @param string $source HTML content
-     * @param boolean $from_file Indicates $source is a file to pull content from
-     * @param boolean $do_links Indicate whether a table of link URLs is desired
-     * @param integer $width Maximum width of the formatted text, 0 for no limit
-     */
-    function __construct($source = '', $from_file = false, $do_links = true, $width = 75, $charset = 'UTF-8')
-    {
-        if (!empty($source)) {
-            $this->set_html($source, $from_file);
-        }
-
-        $this->set_base_url();
-
-        $this->_do_links = $do_links;
-        $this->width     = $width;
-        $this->charset   = $charset;
-    }
-
-    /**
-     * Loads source HTML into memory, either from $source string or a file.
-     *
-     * @param string $source HTML content
-     * @param boolean $from_file Indicates $source is a file to pull content from
-     */
-    function set_html($source, $from_file = false)
-    {
-        if ($from_file && file_exists($source)) {
-            $this->html = file_get_contents($source);
-        }
-        else {
-            $this->html = $source;
-        }
-
-        $this->_converted = false;
-    }
-
-    /**
-     * Returns the text, converted from HTML.
-     *
-     * @return string Plain text
-     */
-    function get_text()
-    {
-        if (!$this->_converted) {
-            $this->_convert();
-        }
-
-        return $this->text;
-    }
-
-    /**
-     * Prints the text, converted from HTML.
-     */
-    function print_text()
-    {
-        print $this->get_text();
-    }
-
-    /**
-     * Sets the allowed HTML tags to pass through to the resulting text.
-     *
-     * Tags should be in the form "<p>", with no corresponding closing tag.
-     */
-    function set_allowed_tags($allowed_tags = '')
-    {
-        if (!empty($allowed_tags)) {
-            $this->allowed_tags = $allowed_tags;
-        }
-    }
-
-    /**
-     * Sets a base URL to handle relative links.
-     */
-    function set_base_url($url = '')
-    {
-        if (empty($url)) {
-            if (!empty($_SERVER['HTTP_HOST'])) {
-                $this->url = 'http://' . $_SERVER['HTTP_HOST'];
-            }
-            else {
-                $this->url = '';
-            }
-        }
-        else {
-            // Strip any trailing slashes for consistency (relative
-            // URLs may already start with a slash like "/file.html")
-            if (substr($url, -1) == '/') {
-                $url = substr($url, 0, -1);
-            }
-            $this->url = $url;
-        }
-    }
-
-    /**
-     * Workhorse function that does actual conversion (calls _converter() method).
-     */
-    protected function _convert()
-    {
-        // Variables used for building the link list
-        $this->_link_list = array();
-
-        $text = trim(stripslashes($this->html));
-
-        // Convert HTML to TXT
-        $this->_converter($text);
-
-        // Add link list
-        if (!empty($this->_link_list)) {
-            $text .= "\n\nLinks:\n------\n";
-            foreach ($this->_link_list as $idx => $url) {
-                $text .= '[' . ($idx+1) . '] ' . $url . "\n";
-            }
-        }
-
-        $this->text       = $text;
-        $this->_converted = true;
-    }
-
-    /**
-     * Workhorse function that does actual conversion.
-     *
-     * First performs custom tag replacement specified by $search and
-     * $replace arrays. Then strips any remaining HTML tags, reduces whitespace
-     * and newlines to a readable format, and word wraps the text to
-     * $width characters.
-     *
-     * @param string Reference to HTML content string
-     */
-    protected function _converter(&$text)
-    {
-        // Convert <BLOCKQUOTE> (before PRE!)
-        $this->_convert_blockquotes($text);
-
-        // Convert <PRE>
-        $this->_convert_pre($text);
-
-        // Run our defined tags search-and-replace
-        $text = preg_replace($this->search, $this->replace, $text);
-
-        // Run our defined tags search-and-replace with callback
-        $text = preg_replace_callback($this->callback_search, array($this, 'tags_preg_callback'), $text);
-
-        // Strip any other HTML tags
-        $text = strip_tags($text, $this->allowed_tags);
-
-        // Run our defined entities/characters search-and-replace
-        $text = preg_replace($this->ent_search, $this->ent_replace, $text);
-
-        // Replace known html entities
-        $text = html_entity_decode($text, ENT_QUOTES, $this->charset);
-
-        // Remove unknown/unhandled entities (this cannot be done in search-and-replace block)
-        $text = preg_replace('/&([a-zA-Z0-9]{2,6}|#[0-9]{2,4});/', '', $text);
-
-        // Convert "|+|amp|+|" into "&", need to be done after handling of unknown entities
-        // This properly handles situation of "&amp;quot;" in input string
-        $text = str_replace('|+|amp|+|', '&', $text);
-
-        // Bring down number of empty lines to 2 max
-        $text = preg_replace("/\n\s+\n/", "\n\n", $text);
-        $text = preg_replace("/[\n]{3,}/", "\n\n", $text);
-
-        // remove leading empty lines (can be produced by eg. P tag on the beginning)
-        $text = ltrim($text, "\n");
-
-        // Wrap the text to a readable format
-        // for PHP versions >= 4.0.2. Default width is 75
-        // If width is 0 or less, don't wrap the text.
-        if ( $this->width > 0 ) {
-            $text = wordwrap($text, $this->width);
-        }
-    }
-
-    /**
-     * Helper function called by preg_replace() on link replacement.
-     *
-     * Maintains an internal list of links to be displayed at the end of the
-     * text, with numeric indices to the original point in the text they
-     * appeared. Also makes an effort at identifying and handling absolute
-     * and relative links.
-     *
-     * @param string $link URL of the link
-     * @param string $display Part of the text to associate number with
-     */
-    protected function _build_link_list( $link, $display )
-    {
-        if (!$this->_do_links || empty($link)) {
-            return $display;
-        }
-
-        // Ignored link types
-        if (preg_match('!^(javascript:|mailto:|#)!i', $link)) {
-            return $display;
-        }
-
-        if (preg_match('!^([a-z][a-z0-9.+-]+:)!i', $link)) {
-            $url = $link;
-        }
-        else {
-            $url = $this->url;
-            if (substr($link, 0, 1) != '/') {
-                $url .= '/';
-            }
-            $url .= "$link";
-        }
-
-        if (($index = array_search($url, $this->_link_list)) === false) {
-            $index = count($this->_link_list);
-            $this->_link_list[] = $url;
-        }
-
-        return $display . ' [' . ($index+1) . ']';
-    }
-
-    /**
-     * Helper function for PRE body conversion.
-     *
-     * @param string HTML content
-     */
-    protected function _convert_pre(&$text)
-    {
-        // get the content of PRE element
-        while (preg_match('/<pre[^>]*>(.*)<\/pre>/ismU', $text, $matches)) {
-            $this->pre_content = $matches[1];
-
-            // Run our defined tags search-and-replace with callback
-            $this->pre_content = preg_replace_callback($this->callback_search,
-                array($this, 'tags_preg_callback'), $this->pre_content);
-
-            // convert the content
-            $this->pre_content = sprintf('<div><br>%s<br></div>',
-                preg_replace($this->pre_search, $this->pre_replace, $this->pre_content));
-
-            // replace the content (use callback because content can contain $0 variable)
-            $text = preg_replace_callback('/<pre[^>]*>.*<\/pre>/ismU',
-                array($this, 'pre_preg_callback'), $text, 1);
-
-            // free memory
-            $this->pre_content = '';
-        }
-    }
-
-    /**
-     * Helper function for BLOCKQUOTE body conversion.
-     *
-     * @param string HTML content
-     */
-    protected function _convert_blockquotes(&$text)
-    {
-        $level = 0;
-        $offset = 0;
-        while (($start = strpos($text, '<blockquote', $offset)) !== false) {
-            $offset = $start + 12;
-            do {
-                $end = strpos($text, '</blockquote>', $offset);
-                $next = strpos($text, '<blockquote', $offset);
-
-                // nested <blockquote>, skip
-                if ($next !== false && $next < $end) {
-                    $offset = $next + 12;
-                    $level++;
-                }
-                // nested </blockquote> tag
-                if ($end !== false && $level > 0) {
-                    $offset = $end + 12;
-                    $level--;
-                }
-                // found matching end tag
-                else if ($end !== false && $level == 0) {
-                    $taglen = strpos($text, '>', $start) - $start;
-                    $startpos = $start + $taglen + 1;
-
-                    // get blockquote content
-                    $body = trim(substr($text, $startpos, $end - $startpos));
-
-                    // adjust text wrapping width
-                    $p_width = $this->width;
-                    if ($this->width > 0) $this->width -= 2;
-
-                    // replace content with inner blockquotes
-                    $this->_converter($body);
-
-                    // resore text width
-                    $this->width = $p_width;
-
-                    // Add citation markers and create <pre> block
-                    $body = preg_replace_callback('/((?:^|\n)>*)([^\n]*)/', array($this, 'blockquote_citation_callback'), trim($body));
-                    $body = '<pre>' . htmlspecialchars($body) . '</pre>';
-
-                    $text = substr_replace($text, $body . "\n", $start, $end + 13 - $start);
-                    $offset = 0;
-
-                    break;
-                }
-            }
-            while ($end || $next);
-        }
-    }
-
-    /**
-     * Callback function to correctly add citation markers for blockquote contents
-     */
-    public function blockquote_citation_callback($m)
-    {
-        $line  = ltrim($m[2]);
-        $space = $line[0] == '>' ? '' : ' ';
-
-        return $m[1] . '>' . $space . $line;
-    }
-
-    /**
-     * Callback function for preg_replace_callback use.
-     *
-     * @param  array PREG matches
-     * @return string
-     */
-    public function tags_preg_callback($matches)
-    {
-        switch (strtolower($matches[1])) {
-        case 'b':
-        case 'strong':
-            return $this->_toupper($matches[3]);
-        case 'th':
-            return $this->_toupper("\t\t". $matches[3] ."\n");
-        case 'h':
-            return $this->_toupper("\n\n". $matches[3] ."\n\n");
-        case 'a':
-            // Remove spaces in URL (#1487805)
-            $url = str_replace(' ', '', $matches[3]);
-            return $this->_build_link_list($url, $matches[4]);
-        }
-    }
-
-    /**
-     * Callback function for preg_replace_callback use in PRE content handler.
-     *
-     * @param array PREG matches
-     * @return string
-     */
-    public function pre_preg_callback($matches)
-    {
-        return $this->pre_content;
-    }
-
-    /**
-     * Strtoupper function with HTML tags and entities handling.
-     *
-     * @param string $str Text to convert
-     * @return string Converted text
-     */
-    private function _toupper($str)
-    {
-        // string can containg HTML tags
-        $chunks = preg_split('/(<[^>]*>)/', $str, null, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-
-        // convert toupper only the text between HTML tags
-        foreach ($chunks as $idx => $chunk) {
-            if ($chunk[0] != '<') {
-                $chunks[$idx] = $this->_strtoupper($chunk);
-            }
-        }
-
-        return implode($chunks);
-    }
-
-    /**
-     * Strtoupper multibyte wrapper function with HTML entities handling.
-     *
-     * @param string $str Text to convert
-     * @return string Converted text
-     */
-    private function _strtoupper($str)
-    {
-        $str = html_entity_decode($str, ENT_COMPAT, $this->charset);
-        $str = mb_strtoupper($str);
-        $str = htmlspecialchars($str, ENT_COMPAT, $this->charset);
-
-        return $str;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_image.php b/lib/ext/Roundcube/rcube_image.php
deleted file mode 100644
index 4e4caae..0000000
--- a/lib/ext/Roundcube/rcube_image.php
+++ /dev/null
@@ -1,321 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Image resizer and converter                                         |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Image resizer and converter
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_image
-{
-    private $image_file;
-
-    const TYPE_GIF = 1;
-    const TYPE_JPG = 2;
-    const TYPE_PNG = 3;
-    const TYPE_TIF = 4;
-
-    public static $extensions = array(
-        self::TYPE_GIF => 'gif',
-        self::TYPE_JPG => 'jpg',
-        self::TYPE_PNG => 'png',
-        self::TYPE_TIF => 'tif',
-    );
-
-
-    function __construct($filename)
-    {
-        $this->image_file = $filename;
-    }
-
-    /**
-     * Get image properties.
-     *
-     * @return mixed Hash array with image props like type, width, height
-     */
-    public function props()
-    {
-        // use GD extension
-        if (function_exists('getimagesize') && ($imsize = @getimagesize($this->image_file))) {
-            $width   = $imsize[0];
-            $height  = $imsize[1];
-            $gd_type = $imsize['2'];
-            $type    = image_type_to_extension($imsize['2'], false);
-        }
-
-        // use ImageMagick
-        if (!$type && ($data = $this->identify())) {
-            list($type, $width, $height) = $data;
-        }
-
-        if ($type) {
-            return array(
-                'type'    => $type,
-                'gd_type' => $gd_type,
-                'width'   => $width,
-                'height'  => $height,
-            );
-        }
-    }
-
-    /**
-     * Resize image to a given size. Use only to shrink an image.
-     * If an image is smaller than specified size it will be not resized.
-     *
-     * @param int    $size      Max width/height size
-     * @param string $filename  Output filename
-     * @param boolean $browser_compat  Convert to image type displayable by any browser
-     *
-     * @return mixed Output type on success, False on failure
-     */
-    public function resize($size, $filename = null, $browser_compat = false)
-    {
-        $result  = false;
-        $rcube   = rcube::get_instance();
-        $convert = $rcube->config->get('im_convert_path', false);
-        $props   = $this->props();
-
-        if (empty($props)) {
-            return false;
-        }
-
-        if (!$filename) {
-            $filename = $this->image_file;
-        }
-
-        // use Imagemagick
-        if ($convert) {
-            $p['out']  = $filename;
-            $p['in']   = $this->image_file;
-            $type      = $props['type'];
-
-            if (!$type && ($data = $this->identify())) {
-                $type = $data[0];
-            }
-
-            $type = strtr($type, array("jpeg" => "jpg", "tiff" => "tif", "ps" => "eps", "ept" => "eps"));
-            $p['intype'] = $type;
-
-            // convert to an image format every browser can display
-            if ($browser_compat && !in_array($type, array('jpg','gif','png'))) {
-                $type = 'jpg';
-            }
-
-            // If only one dimension is greater than the limit convert doesn't
-            // work as expected, we need to calculate new dimensions
-            $scale = $size / max($props['width'], $props['height']);
-
-            // if file is smaller than the limit, we do nothing
-            // but copy original file to destination file
-            if ($scale >= 1 && $p['intype'] == $type) {
-                $result = ($this->image_file == $filename || copy($this->image_file, $filename)) ? '' : false;
-            }
-            else {
-                if ($scale >= 1) {
-                    $width  = $props['width'];
-                    $height = $props['height'];
-                }
-                else {
-                    $width  = intval($props['width']  * $scale);
-                    $height = intval($props['height'] * $scale);
-                }
-
-                $valid_types = "bmp,eps,gif,jp2,jpg,png,svg,tif";
-
-                $p += array(
-                    'type'    => $type,
-                    'quality' => 75,
-                    'size'    => $width . 'x' . $height,
-                );
-
-                if (in_array($type, explode(',', $valid_types))) { // Valid type?
-                    $result = rcube::exec($convert . ' 2>&1 -flatten -auto-orient -colorspace sRGB -strip'
-                        . ' -quality {quality} -resize {size} {intype}:{in} {type}:{out}', $p);
-                }
-            }
-
-            if ($result === '') {
-                @chmod($filename, 0600);
-                return $type;
-            }
-        }
-
-        // use GD extension
-        if ($props['gd_type']) {
-            if ($props['gd_type'] == IMAGETYPE_JPEG && function_exists('imagecreatefromjpeg')) {
-                $image = imagecreatefromjpeg($this->image_file);
-                $type  = 'jpg';
-            }
-            else if($props['gd_type'] == IMAGETYPE_GIF && function_exists('imagecreatefromgif')) {
-                $image = imagecreatefromgif($this->image_file);
-                $type  = 'gid';
-            }
-            else if($props['gd_type'] == IMAGETYPE_PNG && function_exists('imagecreatefrompng')) {
-                $image = imagecreatefrompng($this->image_file);
-                $type  = 'png';
-            }
-            else {
-                // @TODO: print error to the log?
-                return false;
-            }
-
-            if ($image === false) {
-                return false;
-            }
-
-            $scale = $size / max($props['width'], $props['height']);
-
-            // Imagemagick resize is implemented in shrinking mode (see -resize argument above)
-            // we do the same here, if an image is smaller than specified size
-            // we do nothing but copy original file to destination file
-            if ($scale >= 1) {
-                $result = $this->image_file == $filename || copy($this->image_file, $filename);
-            }
-            else {
-                $width     = intval($props['width']  * $scale);
-                $height    = intval($props['height'] * $scale);
-                $new_image = imagecreatetruecolor($width, $height);
-
-                // Fix transparency of gif/png image
-                if ($props['gd_type'] != IMAGETYPE_JPEG) {
-                    imagealphablending($new_image, false);
-                    imagesavealpha($new_image, true);
-                    $transparent = imagecolorallocatealpha($new_image, 255, 255, 255, 127);
-                    imagefilledrectangle($new_image, 0, 0, $width, $height, $transparent);
-                }
-
-                imagecopyresampled($new_image, $image, 0, 0, 0, 0, $width, $height, $props['width'], $props['height']);
-                $image = $new_image;
-
-                if ($props['gd_type'] == IMAGETYPE_JPEG) {
-                    $result = imagejpeg($image, $filename, 75);
-                }
-                elseif($props['gd_type'] == IMAGETYPE_GIF) {
-                    $result = imagegif($image, $filename);
-                }
-                elseif($props['gd_type'] == IMAGETYPE_PNG) {
-                    $result = imagepng($image, $filename, 6, PNG_ALL_FILTERS);
-                }
-            }
-
-            if ($result) {
-                @chmod($filename, 0600);
-                return $type;
-            }
-        }
-
-        // @TODO: print error to the log?
-        return false;
-    }
-
-    /**
-     * Convert image to a given type
-     *
-     * @param int    $type      Destination file type (see class constants)
-     * @param string $filename  Output filename (if empty, original file will be used
-     *                          and filename extension will be modified)
-     *
-     * @return bool True on success, False on failure
-     */
-    public function convert($type, $filename = null)
-    {
-        $rcube   = rcube::get_instance();
-        $convert = $rcube->config->get('im_convert_path', false);
-
-        if (!$filename) {
-            $filename = $this->image_file;
-
-            // modify extension
-            if ($extension = self::$extensions[$type]) {
-                $filename = preg_replace('/\.[^.]+$/', '', $filename) . '.' . $extension;
-            }
-        }
-
-        // use ImageMagick
-        if ($convert) {
-            $p['in']   = $this->image_file;
-            $p['out']  = $filename;
-            $p['type'] = self::$extensions[$type];
-
-            $result = rcube::exec($convert . ' 2>&1 -colorspace sRGB -strip -quality 75 {in} {type}:{out}', $p);
-
-            if ($result === '') {
-                @chmod($filename, 0600);
-                return true;
-            }
-        }
-
-        // use GD extension (TIFF isn't supported)
-        $props = $this->props();
-
-        if ($props['gd_type']) {
-            if ($props['gd_type'] == IMAGETYPE_JPEG && function_exists('imagecreatefromjpeg')) {
-                $image = imagecreatefromjpeg($this->image_file);
-            }
-            else if ($props['gd_type'] == IMAGETYPE_GIF && function_exists('imagecreatefromgif')) {
-                $image = imagecreatefromgif($this->image_file);
-            }
-            else if ($props['gd_type'] == IMAGETYPE_PNG && function_exists('imagecreatefrompng')) {
-                $image = imagecreatefrompng($this->image_file);
-            }
-            else {
-                // @TODO: print error to the log?
-                return false;
-            }
-
-            if ($type == self::TYPE_JPG) {
-                $result = imagejpeg($image, $filename, 75);
-            }
-            else if ($type == self::TYPE_GIF) {
-                $result = imagegif($image, $filename);
-            }
-            else if ($type == self::TYPE_PNG) {
-                $result = imagepng($image, $filename, 6, PNG_ALL_FILTERS);
-            }
-
-            if ($result) {
-                @chmod($filename, 0600);
-                return true;
-            }
-        }
-
-        // @TODO: print error to the log?
-        return false;
-    }
-
-    /**
-     * Identify command handler.
-     */
-    private function identify()
-    {
-        $rcube = rcube::get_instance();
-
-        if ($cmd = $rcube->config->get('im_identify_path')) {
-            $args = array('in' => $this->image_file, 'format' => "%m %[fx:w] %[fx:h]");
-            $id   = rcube::exec($cmd. ' 2>/dev/null -format {format} {in}', $args);
-
-            if ($id) {
-                return explode(' ', strtolower($id));
-            }
-        }
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_imap.php b/lib/ext/Roundcube/rcube_imap.php
deleted file mode 100644
index 9faf1bb..0000000
--- a/lib/ext/Roundcube/rcube_imap.php
+++ /dev/null
@@ -1,4200 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   IMAP Storage Engine                                                 |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Interface class for accessing an IMAP server
- *
- * @package    Framework
- * @subpackage Storage
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- */
-class rcube_imap extends rcube_storage
-{
-    /**
-     * Instance of rcube_imap_generic
-     *
-     * @var rcube_imap_generic
-     */
-    public $conn;
-
-    /**
-     * Instance of rcube_imap_cache
-     *
-     * @var rcube_imap_cache
-     */
-    protected $mcache;
-
-    /**
-     * Instance of rcube_cache
-     *
-     * @var rcube_cache
-     */
-    protected $cache;
-
-    /**
-     * Internal (in-memory) cache
-     *
-     * @var array
-     */
-    protected $icache = array();
-
-    protected $list_page = 1;
-    protected $delimiter;
-    protected $namespace;
-    protected $sort_field = '';
-    protected $sort_order = 'DESC';
-    protected $struct_charset;
-    protected $uid_id_map = array();
-    protected $msg_headers = array();
-    protected $search_set;
-    protected $search_string = '';
-    protected $search_charset = '';
-    protected $search_sort_field = '';
-    protected $search_threads = false;
-    protected $search_sorted = false;
-    protected $options = array('auth_type' => 'check');
-    protected $caching = false;
-    protected $messages_caching = false;
-    protected $threading = false;
-
-
-    /**
-     * Object constructor.
-     */
-    public function __construct()
-    {
-        $this->conn = new rcube_imap_generic();
-
-        // Set namespace and delimiter from session,
-        // so some methods would work before connection
-        if (isset($_SESSION['imap_namespace'])) {
-            $this->namespace = $_SESSION['imap_namespace'];
-        }
-        if (isset($_SESSION['imap_delimiter'])) {
-            $this->delimiter = $_SESSION['imap_delimiter'];
-        }
-    }
-
-
-    /**
-     * Magic getter for backward compat.
-     *
-     * @deprecated.
-     */
-    public function __get($name)
-    {
-        if (isset($this->{$name})) {
-            return $this->{$name};
-        }
-    }
-
-
-    /**
-     * Connect to an IMAP server
-     *
-     * @param  string   $host    Host to connect
-     * @param  string   $user    Username for IMAP account
-     * @param  string   $pass    Password for IMAP account
-     * @param  integer  $port    Port to connect to
-     * @param  string   $use_ssl SSL schema (either ssl or tls) or null if plain connection
-     *
-     * @return boolean  TRUE on success, FALSE on failure
-     */
-    public function connect($host, $user, $pass, $port=143, $use_ssl=null)
-    {
-        // check for OpenSSL support in PHP build
-        if ($use_ssl && extension_loaded('openssl')) {
-            $this->options['ssl_mode'] = $use_ssl == 'imaps' ? 'ssl' : $use_ssl;
-        }
-        else if ($use_ssl) {
-            rcube::raise_error(array('code' => 403, 'type' => 'imap',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "OpenSSL not available"), true, false);
-            $port = 143;
-        }
-
-        $this->options['port'] = $port;
-
-        if ($this->options['debug']) {
-            $this->set_debug(true);
-
-            $this->options['ident'] = array(
-                'name'    => 'Roundcube',
-                'version' => RCUBE_VERSION,
-                'php'     => PHP_VERSION,
-                'os'      => PHP_OS,
-                'command' => $_SERVER['REQUEST_URI'],
-            );
-        }
-
-        $attempt = 0;
-        do {
-            $data = rcube::get_instance()->plugins->exec_hook('storage_connect',
-                array_merge($this->options, array('host' => $host, 'user' => $user,
-                    'attempt' => ++$attempt)));
-
-            if (!empty($data['pass'])) {
-                $pass = $data['pass'];
-            }
-
-            $this->conn->connect($data['host'], $data['user'], $pass, $data);
-        } while(!$this->conn->connected() && $data['retry']);
-
-        $config = array(
-            'host'     => $data['host'],
-            'user'     => $data['user'],
-            'password' => $pass,
-            'port'     => $port,
-            'ssl'      => $use_ssl,
-        );
-
-        $this->options      = array_merge($this->options, $config);
-        $this->connect_done = true;
-
-        if ($this->conn->connected()) {
-            // get namespace and delimiter
-            $this->set_env();
-            return true;
-        }
-        // write error log
-        else if ($this->conn->error) {
-            if ($pass && $user) {
-                $message = sprintf("Login failed for %s from %s. %s",
-                    $user, rcube_utils::remote_ip(), $this->conn->error);
-
-                rcube::raise_error(array('code' => 403, 'type' => 'imap',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => $message), true, false);
-            }
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Close IMAP connection.
-     * Usually done on script shutdown
-     */
-    public function close()
-    {
-        $this->conn->closeConnection();
-        if ($this->mcache) {
-            $this->mcache->close();
-        }
-    }
-
-
-    /**
-     * Check connection state, connect if not connected.
-     *
-     * @return bool Connection state.
-     */
-    public function check_connection()
-    {
-        // Establish connection if it wasn't done yet
-        if (!$this->connect_done && !empty($this->options['user'])) {
-            return $this->connect(
-                $this->options['host'],
-                $this->options['user'],
-                $this->options['password'],
-                $this->options['port'],
-                $this->options['ssl']
-            );
-        }
-
-        return $this->is_connected();
-    }
-
-
-    /**
-     * Checks IMAP connection.
-     *
-     * @return boolean  TRUE on success, FALSE on failure
-     */
-    public function is_connected()
-    {
-        return $this->conn->connected();
-    }
-
-
-    /**
-     * Returns code of last error
-     *
-     * @return int Error code
-     */
-    public function get_error_code()
-    {
-        return $this->conn->errornum;
-    }
-
-
-    /**
-     * Returns text of last error
-     *
-     * @return string Error string
-     */
-    public function get_error_str()
-    {
-        return $this->conn->error;
-    }
-
-
-    /**
-     * Returns code of last command response
-     *
-     * @return int Response code
-     */
-    public function get_response_code()
-    {
-        switch ($this->conn->resultcode) {
-            case 'NOPERM':
-                return self::NOPERM;
-            case 'READ-ONLY':
-                return self::READONLY;
-            case 'TRYCREATE':
-                return self::TRYCREATE;
-            case 'INUSE':
-                return self::INUSE;
-            case 'OVERQUOTA':
-                return self::OVERQUOTA;
-            case 'ALREADYEXISTS':
-                return self::ALREADYEXISTS;
-            case 'NONEXISTENT':
-                return self::NONEXISTENT;
-            case 'CONTACTADMIN':
-                return self::CONTACTADMIN;
-            default:
-                return self::UNKNOWN;
-        }
-    }
-
-
-    /**
-     * Activate/deactivate debug mode
-     *
-     * @param boolean $dbg True if IMAP conversation should be logged
-     */
-    public function set_debug($dbg = true)
-    {
-        $this->options['debug'] = $dbg;
-        $this->conn->setDebug($dbg, array($this, 'debug_handler'));
-    }
-
-
-    /**
-     * Set internal folder reference.
-     * All operations will be perfomed on this folder.
-     *
-     * @param  string $folder Folder name
-     */
-    public function set_folder($folder)
-    {
-        $this->folder = $folder;
-    }
-
-
-    /**
-     * Save a search result for future message listing methods
-     *
-     * @param  array  $set  Search set, result from rcube_imap::get_search_set():
-     *                      0 - searching criteria, string
-     *                      1 - search result, rcube_result_index|rcube_result_thread
-     *                      2 - searching character set, string
-     *                      3 - sorting field, string
-     *                      4 - true if sorted, bool
-     */
-    public function set_search_set($set)
-    {
-        $set = (array)$set;
-
-        $this->search_string     = $set[0];
-        $this->search_set        = $set[1];
-        $this->search_charset    = $set[2];
-        $this->search_sort_field = $set[3];
-        $this->search_sorted     = $set[4];
-        $this->search_threads    = is_a($this->search_set, 'rcube_result_thread');
-    }
-
-
-    /**
-     * Return the saved search set as hash array
-     *
-     * @return array Search set
-     */
-    public function get_search_set()
-    {
-        if (empty($this->search_set)) {
-            return null;
-        }
-
-        return array(
-            $this->search_string,
-            $this->search_set,
-            $this->search_charset,
-            $this->search_sort_field,
-            $this->search_sorted,
-        );
-    }
-
-
-    /**
-     * Returns the IMAP server's capability.
-     *
-     * @param   string  $cap Capability name
-     *
-     * @return  mixed   Capability value or TRUE if supported, FALSE if not
-     */
-    public function get_capability($cap)
-    {
-        $cap      = strtoupper($cap);
-        $sess_key = "STORAGE_$cap";
-
-        if (!isset($_SESSION[$sess_key])) {
-            if (!$this->check_connection()) {
-                return false;
-            }
-
-            $_SESSION[$sess_key] = $this->conn->getCapability($cap);
-        }
-
-        return $_SESSION[$sess_key];
-    }
-
-
-    /**
-     * Checks the PERMANENTFLAGS capability of the current folder
-     * and returns true if the given flag is supported by the IMAP server
-     *
-     * @param   string  $flag Permanentflag name
-     *
-     * @return  boolean True if this flag is supported
-     */
-    public function check_permflag($flag)
-    {
-        $flag       = strtoupper($flag);
-        $perm_flags = $this->get_permflags($this->folder);
-        $imap_flag  = $this->conn->flags[$flag];
-
-        return $imap_flag && !empty($perm_flags) && in_array_nocase($imap_flag, $perm_flags);
-    }
-
-
-    /**
-     * Returns PERMANENTFLAGS of the specified folder
-     *
-     * @param  string $folder Folder name
-     *
-     * @return array Flags
-     */
-    public function get_permflags($folder)
-    {
-        if (!strlen($folder)) {
-            return array();
-        }
-
-        if (!$this->check_connection()) {
-            return array();
-        }
-
-        if ($this->conn->select($folder)) {
-            $permflags = $this->conn->data['PERMANENTFLAGS'];
-        }
-        else {
-            return array();
-        }
-
-        if (!is_array($permflags)) {
-            $permflags = array();
-        }
-
-        return $permflags;
-    }
-
-
-    /**
-     * Returns the delimiter that is used by the IMAP server for folder separation
-     *
-     * @return  string  Delimiter string
-     * @access  public
-     */
-    public function get_hierarchy_delimiter()
-    {
-        return $this->delimiter;
-    }
-
-
-    /**
-     * Get namespace
-     *
-     * @param string $name Namespace array index: personal, other, shared, prefix
-     *
-     * @return  array  Namespace data
-     */
-    public function get_namespace($name = null)
-    {
-        $ns = $this->namespace;
-
-        if ($name) {
-            return isset($ns[$name]) ? $ns[$name] : null;
-        }
-
-        unset($ns['prefix']);
-        return $ns;
-    }
-
-
-    /**
-     * Sets delimiter and namespaces
-     */
-    protected function set_env()
-    {
-        if ($this->delimiter !== null && $this->namespace !== null) {
-            return;
-        }
-
-        $config = rcube::get_instance()->config;
-        $imap_personal  = $config->get('imap_ns_personal');
-        $imap_other     = $config->get('imap_ns_other');
-        $imap_shared    = $config->get('imap_ns_shared');
-        $imap_delimiter = $config->get('imap_delimiter');
-
-        if (!$this->check_connection()) {
-            return;
-        }
-
-        $ns = $this->conn->getNamespace();
-
-        // Set namespaces (NAMESPACE supported)
-        if (is_array($ns)) {
-            $this->namespace = $ns;
-        }
-        else {
-            $this->namespace = array(
-                'personal' => NULL,
-                'other'    => NULL,
-                'shared'   => NULL,
-            );
-        }
-
-        if ($imap_delimiter) {
-            $this->delimiter = $imap_delimiter;
-        }
-        if (empty($this->delimiter)) {
-            $this->delimiter = $this->namespace['personal'][0][1];
-        }
-        if (empty($this->delimiter)) {
-            $this->delimiter = $this->conn->getHierarchyDelimiter();
-        }
-        if (empty($this->delimiter)) {
-            $this->delimiter = '/';
-        }
-
-        // Overwrite namespaces
-        if ($imap_personal !== null) {
-            $this->namespace['personal'] = NULL;
-            foreach ((array)$imap_personal as $dir) {
-                $this->namespace['personal'][] = array($dir, $this->delimiter);
-            }
-        }
-        if ($imap_other !== null) {
-            $this->namespace['other'] = NULL;
-            foreach ((array)$imap_other as $dir) {
-                if ($dir) {
-                    $this->namespace['other'][] = array($dir, $this->delimiter);
-                }
-            }
-        }
-        if ($imap_shared !== null) {
-            $this->namespace['shared'] = NULL;
-            foreach ((array)$imap_shared as $dir) {
-                if ($dir) {
-                    $this->namespace['shared'][] = array($dir, $this->delimiter);
-                }
-            }
-        }
-
-        // Find personal namespace prefix for mod_folder()
-        // Prefix can be removed when there is only one personal namespace
-        if (is_array($this->namespace['personal']) && count($this->namespace['personal']) == 1) {
-            $this->namespace['prefix'] = $this->namespace['personal'][0][0];
-        }
-
-        $_SESSION['imap_namespace'] = $this->namespace;
-        $_SESSION['imap_delimiter'] = $this->delimiter;
-    }
-
-
-    /**
-     * Get message count for a specific folder
-     *
-     * @param  string  $folder  Folder name
-     * @param  string  $mode    Mode for count [ALL|THREADS|UNSEEN|RECENT|EXISTS]
-     * @param  boolean $force   Force reading from server and update cache
-     * @param  boolean $status  Enables storing folder status info (max UID/count),
-     *                          required for folder_status()
-     *
-     * @return int     Number of messages
-     */
-    public function count($folder='', $mode='ALL', $force=false, $status=true)
-    {
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        return $this->countmessages($folder, $mode, $force, $status);
-    }
-
-
-    /**
-     * protected method for getting nr of messages
-     *
-     * @param string  $folder  Folder name
-     * @param string  $mode    Mode for count [ALL|THREADS|UNSEEN|RECENT|EXISTS]
-     * @param boolean $force   Force reading from server and update cache
-     * @param boolean $status  Enables storing folder status info (max UID/count),
-     *                         required for folder_status()
-     *
-     * @return int Number of messages
-     * @see rcube_imap::count()
-     */
-    protected function countmessages($folder, $mode='ALL', $force=false, $status=true)
-    {
-        $mode = strtoupper($mode);
-
-        // count search set, assume search set is always up-to-date (don't check $force flag)
-        if ($this->search_string && $folder == $this->folder && ($mode == 'ALL' || $mode == 'THREADS')) {
-            if ($mode == 'ALL') {
-                return $this->search_set->count_messages();
-            }
-            else {
-                return $this->search_set->count();
-            }
-        }
-
-        // EXISTS is a special alias for ALL, it allows to get the number
-        // of all messages in a folder also when search is active and with
-        // any skip_deleted setting
-
-        $a_folder_cache = $this->get_cache('messagecount');
-
-        // return cached value
-        if (!$force && is_array($a_folder_cache[$folder]) && isset($a_folder_cache[$folder][$mode])) {
-            return $a_folder_cache[$folder][$mode];
-        }
-
-        if (!is_array($a_folder_cache[$folder])) {
-            $a_folder_cache[$folder] = array();
-        }
-
-        if ($mode == 'THREADS') {
-            $res   = $this->threads($folder);
-            $count = $res->count();
-
-            if ($status) {
-                $msg_count = $res->count_messages();
-                $this->set_folder_stats($folder, 'cnt', $msg_count);
-                $this->set_folder_stats($folder, 'maxuid', $msg_count ? $this->id2uid($msg_count, $folder) : 0);
-            }
-        }
-        // Need connection here
-        else if (!$this->check_connection()) {
-            return 0;
-        }
-        // RECENT count is fetched a bit different
-        else if ($mode == 'RECENT') {
-            $count = $this->conn->countRecent($folder);
-        }
-        // use SEARCH for message counting
-        else if ($mode != 'EXISTS' && !empty($this->options['skip_deleted'])) {
-            $search_str = "ALL UNDELETED";
-            $keys       = array('COUNT');
-
-            if ($mode == 'UNSEEN') {
-                $search_str .= " UNSEEN";
-            }
-            else {
-                if ($this->messages_caching) {
-                    $keys[] = 'ALL';
-                }
-                if ($status) {
-                    $keys[] = 'MAX';
-                }
-            }
-
-            // @TODO: if $mode == 'ALL' we could try to use cache index here
-
-            // get message count using (E)SEARCH
-            // not very performant but more precise (using UNDELETED)
-            $index = $this->conn->search($folder, $search_str, true, $keys);
-            $count = $index->count();
-
-            if ($mode == 'ALL') {
-                // Cache index data, will be used in index_direct()
-                $this->icache['undeleted_idx'] = $index;
-
-                if ($status) {
-                    $this->set_folder_stats($folder, 'cnt', $count);
-                    $this->set_folder_stats($folder, 'maxuid', $index->max());
-                }
-            }
-        }
-        else {
-            if ($mode == 'UNSEEN') {
-                $count = $this->conn->countUnseen($folder);
-            }
-            else {
-                $count = $this->conn->countMessages($folder);
-                if ($status && $mode == 'ALL') {
-                    $this->set_folder_stats($folder, 'cnt', $count);
-                    $this->set_folder_stats($folder, 'maxuid', $count ? $this->id2uid($count, $folder) : 0);
-                }
-            }
-        }
-
-        $a_folder_cache[$folder][$mode] = (int)$count;
-
-        // write back to cache
-        $this->update_cache('messagecount', $a_folder_cache);
-
-        return (int)$count;
-    }
-
-
-    /**
-     * Public method for listing headers
-     *
-     * @param   string   $folder     Folder name
-     * @param   int      $page       Current page to list
-     * @param   string   $sort_field Header field to sort by
-     * @param   string   $sort_order Sort order [ASC|DESC]
-     * @param   int      $slice      Number of slice items to extract from result array
-     *
-     * @return  array    Indexed array with message header objects
-     */
-    public function list_messages($folder='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
-    {
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        return $this->_list_messages($folder, $page, $sort_field, $sort_order, $slice);
-    }
-
-
-    /**
-     * protected method for listing message headers
-     *
-     * @param   string   $folder     Folder name
-     * @param   int      $page       Current page to list
-     * @param   string   $sort_field Header field to sort by
-     * @param   string   $sort_order Sort order [ASC|DESC]
-     * @param   int      $slice      Number of slice items to extract from result array
-     *
-     * @return  array    Indexed array with message header objects
-     * @see     rcube_imap::list_messages
-     */
-    protected function _list_messages($folder='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
-    {
-        if (!strlen($folder)) {
-            return array();
-        }
-
-        $this->set_sort_order($sort_field, $sort_order);
-        $page = $page ? $page : $this->list_page;
-
-        // use saved message set
-        if ($this->search_string && $folder == $this->folder) {
-            return $this->list_search_messages($folder, $page, $slice);
-        }
-
-        if ($this->threading) {
-            return $this->list_thread_messages($folder, $page, $slice);
-        }
-
-        // get UIDs of all messages in the folder, sorted
-        $index = $this->index($folder, $this->sort_field, $this->sort_order);
-
-        if ($index->is_empty()) {
-            return array();
-        }
-
-        $from = ($page-1) * $this->page_size;
-        $to   = $from + $this->page_size;
-
-        $index->slice($from, $to - $from);
-
-        if ($slice) {
-            $index->slice(-$slice, $slice);
-        }
-
-        // fetch reqested messages headers
-        $a_index = $index->get();
-        $a_msg_headers = $this->fetch_headers($folder, $a_index);
-
-        return array_values($a_msg_headers);
-    }
-
-
-    /**
-     * protected method for listing message headers using threads
-     *
-     * @param   string   $folder     Folder name
-     * @param   int      $page       Current page to list
-     * @param   int      $slice      Number of slice items to extract from result array
-     *
-     * @return  array    Indexed array with message header objects
-     * @see     rcube_imap::list_messages
-     */
-    protected function list_thread_messages($folder, $page, $slice=0)
-    {
-        // get all threads (not sorted)
-        if ($mcache = $this->get_mcache_engine()) {
-            $threads = $mcache->get_thread($folder);
-        }
-        else {
-            $threads = $this->threads($folder);
-        }
-
-        return $this->fetch_thread_headers($folder, $threads, $page, $slice);
-    }
-
-    /**
-     * Method for fetching threads data
-     *
-     * @param  string $folder Folder name
-     *
-     * @return rcube_imap_thread Thread data object
-     */
-    function threads($folder)
-    {
-        if ($mcache = $this->get_mcache_engine()) {
-            // don't store in self's internal cache, cache has it's own internal cache
-            return $mcache->get_thread($folder);
-        }
-
-        if (!empty($this->icache['threads'])) {
-            if ($this->icache['threads']->get_parameters('MAILBOX') == $folder) {
-                return $this->icache['threads'];
-            }
-        }
-
-        // get all threads
-        $result = $this->threads_direct($folder);
-
-        // add to internal (fast) cache
-        return $this->icache['threads'] = $result;
-    }
-
-
-    /**
-     * Method for direct fetching of threads data
-     *
-     * @param  string $folder Folder name
-     *
-     * @return rcube_imap_thread Thread data object
-     */
-    function threads_direct($folder)
-    {
-        if (!$this->check_connection()) {
-            return new rcube_result_thread();
-        }
-
-        // get all threads
-        return $this->conn->thread($folder, $this->threading,
-            $this->options['skip_deleted'] ? 'UNDELETED' : '', true);
-    }
-
-
-    /**
-     * protected method for fetching threaded messages headers
-     *
-     * @param string              $folder     Folder name
-     * @param rcube_result_thread $threads    Threads data object
-     * @param int                 $page       List page number
-     * @param int                 $slice      Number of threads to slice
-     *
-     * @return array  Messages headers
-     */
-    protected function fetch_thread_headers($folder, $threads, $page, $slice=0)
-    {
-        // Sort thread structure
-        $this->sort_threads($threads);
-
-        $from = ($page-1) * $this->page_size;
-        $to   = $from + $this->page_size;
-
-        $threads->slice($from, $to - $from);
-
-        if ($slice) {
-            $threads->slice(-$slice, $slice);
-        }
-
-        // Get UIDs of all messages in all threads
-        $a_index = $threads->get();
-
-        // fetch reqested headers from server
-        $a_msg_headers = $this->fetch_headers($folder, $a_index);
-
-        unset($a_index);
-
-        // Set depth, has_children and unread_children fields in headers
-        $this->set_thread_flags($a_msg_headers, $threads);
-
-        return array_values($a_msg_headers);
-    }
-
-
-    /**
-     * protected method for setting threaded messages flags:
-     * depth, has_children and unread_children
-     *
-     * @param  array               $headers  Reference to headers array indexed by message UID
-     * @param  rcube_result_thread $threads  Threads data object
-     *
-     * @return array Message headers array indexed by message UID
-     */
-    protected function set_thread_flags(&$headers, $threads)
-    {
-        $parents = array();
-
-        list ($msg_depth, $msg_children) = $threads->get_thread_data();
-
-        foreach ($headers as $uid => $header) {
-            $depth = $msg_depth[$uid];
-            $parents = array_slice($parents, 0, $depth);
-
-            if (!empty($parents)) {
-                $headers[$uid]->parent_uid = end($parents);
-                if (empty($header->flags['SEEN']))
-                    $headers[$parents[0]]->unread_children++;
-            }
-            array_push($parents, $uid);
-
-            $headers[$uid]->depth = $depth;
-            $headers[$uid]->has_children = $msg_children[$uid];
-        }
-    }
-
-
-    /**
-     * protected method for listing a set of message headers (search results)
-     *
-     * @param   string   $folder   Folder name
-     * @param   int      $page     Current page to list
-     * @param   int      $slice    Number of slice items to extract from result array
-     *
-     * @return  array    Indexed array with message header objects
-     */
-    protected function list_search_messages($folder, $page, $slice=0)
-    {
-        if (!strlen($folder) || empty($this->search_set) || $this->search_set->is_empty()) {
-            return array();
-        }
-
-        // use saved messages from searching
-        if ($this->threading) {
-            return $this->list_search_thread_messages($folder, $page, $slice);
-        }
-
-        // search set is threaded, we need a new one
-        if ($this->search_threads) {
-            $this->search('', $this->search_string, $this->search_charset, $this->sort_field);
-        }
-
-        $index = clone $this->search_set;
-        $from  = ($page-1) * $this->page_size;
-        $to    = $from + $this->page_size;
-
-        // return empty array if no messages found
-        if ($index->is_empty()) {
-            return array();
-        }
-
-        // quickest method (default sorting)
-        if (!$this->search_sort_field && !$this->sort_field) {
-            $got_index = true;
-        }
-        // sorted messages, so we can first slice array and then fetch only wanted headers
-        else if ($this->search_sorted) { // SORT searching result
-            $got_index = true;
-            // reset search set if sorting field has been changed
-            if ($this->sort_field && $this->search_sort_field != $this->sort_field) {
-                $this->search('', $this->search_string, $this->search_charset, $this->sort_field);
-
-                $index = clone $this->search_set;
-
-                // return empty array if no messages found
-                if ($index->is_empty()) {
-                    return array();
-                }
-            }
-        }
-
-        if ($got_index) {
-            if ($this->sort_order != $index->get_parameters('ORDER')) {
-                $index->revert();
-            }
-
-            // get messages uids for one page
-            $index->slice($from, $to-$from);
-
-            if ($slice) {
-                $index->slice(-$slice, $slice);
-            }
-
-            // fetch headers
-            $a_index       = $index->get();
-            $a_msg_headers = $this->fetch_headers($folder, $a_index);
-
-            return array_values($a_msg_headers);
-        }
-
-        // SEARCH result, need sorting
-        $cnt = $index->count();
-
-        // 300: experimantal value for best result
-        if (($cnt > 300 && $cnt > $this->page_size) || !$this->sort_field) {
-            // use memory less expensive (and quick) method for big result set
-            $index = clone $this->index('', $this->sort_field, $this->sort_order);
-            // get messages uids for one page...
-            $index->slice($from, min($cnt-$from, $this->page_size));
-
-            if ($slice) {
-                $index->slice(-$slice, $slice);
-            }
-
-            // ...and fetch headers
-            $a_index       = $index->get();
-            $a_msg_headers = $this->fetch_headers($folder, $a_index);
-
-            return array_values($a_msg_headers);
-        }
-        else {
-            // for small result set we can fetch all messages headers
-            $a_index       = $index->get();
-            $a_msg_headers = $this->fetch_headers($folder, $a_index, false);
-
-            // return empty array if no messages found
-            if (!is_array($a_msg_headers) || empty($a_msg_headers)) {
-                return array();
-            }
-
-            if (!$this->check_connection()) {
-                return array();
-            }
-
-            // if not already sorted
-            $a_msg_headers = $this->conn->sortHeaders(
-                $a_msg_headers, $this->sort_field, $this->sort_order);
-
-            // only return the requested part of the set
-            $slice_length  = min($this->page_size, $cnt - ($to > $cnt ? $from : $to));
-            $a_msg_headers = array_slice(array_values($a_msg_headers), $from, $slice_length);
-
-            if ($slice) {
-                $a_msg_headers = array_slice($a_msg_headers, -$slice, $slice);
-            }
-
-            return $a_msg_headers;
-        }
-    }
-
-
-    /**
-     * protected method for listing a set of threaded message headers (search results)
-     *
-     * @param   string   $folder     Folder name
-     * @param   int      $page       Current page to list
-     * @param   int      $slice      Number of slice items to extract from result array
-     *
-     * @return  array    Indexed array with message header objects
-     * @see rcube_imap::list_search_messages()
-     */
-    protected function list_search_thread_messages($folder, $page, $slice=0)
-    {
-        // update search_set if previous data was fetched with disabled threading
-        if (!$this->search_threads) {
-            if ($this->search_set->is_empty()) {
-                return array();
-            }
-            $this->search('', $this->search_string, $this->search_charset, $this->sort_field);
-        }
-
-        return $this->fetch_thread_headers($folder, clone $this->search_set, $page, $slice);
-    }
-
-
-    /**
-     * Fetches messages headers (by UID)
-     *
-     * @param  string  $folder   Folder name
-     * @param  array   $msgs     Message UIDs
-     * @param  bool    $sort     Enables result sorting by $msgs
-     * @param  bool    $force    Disables cache use
-     *
-     * @return array Messages headers indexed by UID
-     */
-    function fetch_headers($folder, $msgs, $sort = true, $force = false)
-    {
-        if (empty($msgs)) {
-            return array();
-        }
-
-        if (!$force && ($mcache = $this->get_mcache_engine())) {
-            $headers = $mcache->get_messages($folder, $msgs);
-        }
-        else if (!$this->check_connection()) {
-            return array();
-        }
-        else {
-            // fetch reqested headers from server
-            $headers = $this->conn->fetchHeaders(
-                $folder, $msgs, true, false, $this->get_fetch_headers());
-        }
-
-        if (empty($headers)) {
-            return array();
-        }
-
-        foreach ($headers as $h) {
-            $a_msg_headers[$h->uid] = $h;
-        }
-
-        if ($sort) {
-            // use this class for message sorting
-            $sorter = new rcube_message_header_sorter();
-            $sorter->set_index($msgs);
-            $sorter->sort_headers($a_msg_headers);
-        }
-
-        return $a_msg_headers;
-    }
-
-
-    /**
-     * Returns current status of a folder (compared to the last time use)
-     *
-     * We compare the maximum UID to determine the number of
-     * new messages because the RECENT flag is not reliable.
-     *
-     * @param string $folder Folder name
-     * @param array  $diff   Difference data
-     *
-     * @return int Folder status
-     */
-    public function folder_status($folder = null, &$diff = array())
-    {
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-        $old = $this->get_folder_stats($folder);
-
-        // refresh message count -> will update
-        $this->countmessages($folder, 'ALL', true);
-
-        $result = 0;
-
-        if (empty($old)) {
-            return $result;
-        }
-
-        $new = $this->get_folder_stats($folder);
-
-        // got new messages
-        if ($new['maxuid'] > $old['maxuid']) {
-            $result += 1;
-            // get new message UIDs range, that can be used for example
-            // to get the data of these messages
-            $diff['new'] = ($old['maxuid'] + 1 < $new['maxuid'] ? ($old['maxuid']+1).':' : '') . $new['maxuid'];
-        }
-        // some messages has been deleted
-        if ($new['cnt'] < $old['cnt']) {
-            $result += 2;
-        }
-
-        // @TODO: optional checking for messages flags changes (?)
-        // @TODO: UIDVALIDITY checking
-
-        return $result;
-    }
-
-
-    /**
-     * Stores folder statistic data in session
-     * @TODO: move to separate DB table (cache?)
-     *
-     * @param string $folder  Folder name
-     * @param string $name    Data name
-     * @param mixed  $data    Data value
-     */
-    protected function set_folder_stats($folder, $name, $data)
-    {
-        $_SESSION['folders'][$folder][$name] = $data;
-    }
-
-
-    /**
-     * Gets folder statistic data
-     *
-     * @param string $folder Folder name
-     *
-     * @return array Stats data
-     */
-    protected function get_folder_stats($folder)
-    {
-        if ($_SESSION['folders'][$folder]) {
-            return (array) $_SESSION['folders'][$folder];
-        }
-
-        return array();
-    }
-
-
-    /**
-     * Return sorted list of message UIDs
-     *
-     * @param string $folder     Folder to get index from
-     * @param string $sort_field Sort column
-     * @param string $sort_order Sort order [ASC, DESC]
-     * @param bool   $no_threads Get not threaded index
-     * @param bool   $no_search  Get index not limited to search result (optionally)
-     *
-     * @return rcube_result_index|rcube_result_thread List of messages (UIDs)
-     */
-    public function index($folder = '', $sort_field = NULL, $sort_order = NULL,
-        $no_threads = false, $no_search = false
-    ) {
-        if (!$no_threads && $this->threading) {
-            return $this->thread_index($folder, $sort_field, $sort_order);
-        }
-
-        $this->set_sort_order($sort_field, $sort_order);
-
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        // we have a saved search result, get index from there
-        if ($this->search_string) {
-            if ($this->search_set->is_empty()) {
-                return new rcube_result_index($folder, '* SORT');
-            }
-
-            // search result is an index with the same sorting?
-            if (($this->search_set instanceof rcube_result_index)
-                && ((!$this->sort_field && !$this->search_sorted) ||
-                    ($this->search_sorted && $this->search_sort_field == $this->sort_field))
-            ) {
-                $index = $this->search_set;
-            }
-            // $no_search is enabled when we are not interested in
-            // fetching index for search result, e.g. to sort
-            // threaded search result we can use full mailbox index.
-            // This makes possible to use index from cache
-            else if (!$no_search) {
-                if (!$this->sort_field) {
-                    // No sorting needed, just build index from the search result
-                    // @TODO: do we need to sort by UID here?
-                    $search = $this->search_set->get_compressed();
-                    $index  = new rcube_result_index($folder, '* ESEARCH ALL ' . $search);
-                }
-                else {
-                    $index = $this->index_direct($folder, $this->search_charset,
-                        $this->sort_field, $this->search_set);
-                }
-            }
-
-            if (isset($index)) {
-                if ($this->sort_order != $index->get_parameters('ORDER')) {
-                    $index->revert();
-                }
-
-                return $index;
-            }
-        }
-
-        // check local cache
-        if ($mcache = $this->get_mcache_engine()) {
-            return $mcache->get_index($folder, $this->sort_field, $this->sort_order);
-        }
-
-        // fetch from IMAP server
-        return $this->index_direct($folder, $this->sort_field, $this->sort_order);
-    }
-
-
-    /**
-     * Return sorted list of message UIDs ignoring current search settings.
-     * Doesn't uses cache by default.
-     *
-     * @param string         $folder     Folder to get index from
-     * @param string         $sort_field Sort column
-     * @param string         $sort_order Sort order [ASC, DESC]
-     * @param rcube_result_* $search     Optional messages set to limit the result
-     *
-     * @return rcube_result_index Sorted list of message UIDs
-     */
-    public function index_direct($folder, $sort_field = null, $sort_order = null, $search = null)
-    {
-        if (!empty($search)) {
-            $search = $this->search_set->get_compressed();
-        }
-
-        // use message index sort as default sorting
-        if (!$sort_field) {
-            // use search result from count() if possible
-            if (empty($search) && $this->options['skip_deleted']
-                && !empty($this->icache['undeleted_idx'])
-                && $this->icache['undeleted_idx']->get_parameters('ALL') !== null
-                && $this->icache['undeleted_idx']->get_parameters('MAILBOX') == $folder
-            ) {
-                $index = $this->icache['undeleted_idx'];
-            }
-            else if (!$this->check_connection()) {
-                return new rcube_result_index();
-            }
-            else {
-                $query = $this->options['skip_deleted'] ? 'UNDELETED' : '';
-                if ($search) {
-                    $query = trim($query . ' UID ' . $search);
-                }
-
-                $index = $this->conn->search($folder, $query, true);
-            }
-        }
-        else if (!$this->check_connection()) {
-            return new rcube_result_index();
-        }
-        // fetch complete message index
-        else {
-            if ($this->get_capability('SORT')) {
-                $query = $this->options['skip_deleted'] ? 'UNDELETED' : '';
-                if ($search) {
-                    $query = trim($query . ' UID ' . $search);
-                }
-
-                $index = $this->conn->sort($folder, $sort_field, $query, true);
-            }
-
-            if (empty($index) || $index->is_error()) {
-                $index = $this->conn->index($folder, $search ? $search : "1:*",
-                    $sort_field, $this->options['skip_deleted'],
-                    $search ? true : false, true);
-            }
-        }
-
-        if ($sort_order != $index->get_parameters('ORDER')) {
-            $index->revert();
-        }
-
-        return $index;
-    }
-
-
-    /**
-     * Return index of threaded message UIDs
-     *
-     * @param string $folder     Folder to get index from
-     * @param string $sort_field Sort column
-     * @param string $sort_order Sort order [ASC, DESC]
-     *
-     * @return rcube_result_thread Message UIDs
-     */
-    public function thread_index($folder='', $sort_field=NULL, $sort_order=NULL)
-    {
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        // we have a saved search result, get index from there
-        if ($this->search_string && $this->search_threads && $folder == $this->folder) {
-            $threads = $this->search_set;
-        }
-        else {
-            // get all threads (default sort order)
-            $threads = $this->threads($folder);
-        }
-
-        $this->set_sort_order($sort_field, $sort_order);
-        $this->sort_threads($threads);
-
-        return $threads;
-    }
-
-
-    /**
-     * Sort threaded result, using THREAD=REFS method if available.
-     * If not, use any method and re-sort the result in THREAD=REFS way.
-     *
-     * @param rcube_result_thread $threads Threads result set
-     */
-    protected function sort_threads($threads)
-    {
-        if ($threads->is_empty()) {
-            return;
-        }
-
-        // THREAD=ORDEREDSUBJECT: sorting by sent date of root message
-        // THREAD=REFERENCES:     sorting by sent date of root message
-        // THREAD=REFS:           sorting by the most recent date in each thread
-
-        if ($this->threading != 'REFS' || ($this->sort_field && $this->sort_field != 'date')) {
-            $sortby = $this->sort_field ? $this->sort_field : 'date';
-            $index  = $this->index($this->folder, $sortby, $this->sort_order, true, true);
-
-            if (!$index->is_empty()) {
-                $threads->sort($index);
-            }
-        }
-        else if ($this->sort_order != $threads->get_parameters('ORDER')) {
-            $threads->revert();
-        }
-    }
-
-
-    /**
-     * Invoke search request to IMAP server
-     *
-     * @param  string  $folder     Folder name to search in
-     * @param  string  $str        Search criteria
-     * @param  string  $charset    Search charset
-     * @param  string  $sort_field Header field to sort by
-     *
-     * @todo: Search criteria should be provided in non-IMAP format, eg. array
-     */
-    public function search($folder='', $str='ALL', $charset=NULL, $sort_field=NULL)
-    {
-        if (!$str) {
-            $str = 'ALL';
-        }
-
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        $results = $this->search_index($folder, $str, $charset, $sort_field);
-
-        $this->set_search_set(array($str, $results, $charset, $sort_field,
-            $this->threading || $this->search_sorted ? true : false));
-    }
-
-
-    /**
-     * Direct (real and simple) SEARCH request (without result sorting and caching).
-     *
-     * @param  string  $mailbox Mailbox name to search in
-     * @param  string  $str     Search string
-     *
-     * @return rcube_result_index  Search result (UIDs)
-     */
-    public function search_once($folder = null, $str = 'ALL')
-    {
-        if (!$str) {
-            return 'ALL';
-        }
-
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        if (!$this->check_connection()) {
-            return new rcube_result_index();
-        }
-
-        $index = $this->conn->search($folder, $str, true);
-
-        return $index;
-    }
-
-
-    /**
-     * protected search method
-     *
-     * @param string $folder     Folder name
-     * @param string $criteria   Search criteria
-     * @param string $charset    Charset
-     * @param string $sort_field Sorting field
-     *
-     * @return rcube_result_index|rcube_result_thread  Search results (UIDs)
-     * @see rcube_imap::search()
-     */
-    protected function search_index($folder, $criteria='ALL', $charset=NULL, $sort_field=NULL)
-    {
-        if (!$this->check_connection()) {
-            if ($this->threading) {
-                return new rcube_result_thread();
-            }
-            else {
-                return new rcube_result_index();
-            }
-        }
-
-        if ($this->options['skip_deleted'] && !preg_match('/UNDELETED/', $criteria)) {
-            $criteria = 'UNDELETED '.$criteria;
-        }
-
-        // unset CHARSET if criteria string is ASCII, this way
-        // SEARCH won't be re-sent after "unsupported charset" response
-        if ($charset && $charset != 'US-ASCII' && is_ascii($criteria)) {
-            $charset = 'US-ASCII';
-        }
-
-        if ($this->threading) {
-            $threads = $this->conn->thread($folder, $this->threading, $criteria, true, $charset);
-
-            // Error, try with US-ASCII (RFC5256: SORT/THREAD must support US-ASCII and UTF-8,
-            // but I've seen that Courier doesn't support UTF-8)
-            if ($threads->is_error() && $charset && $charset != 'US-ASCII') {
-                $threads = $this->conn->thread($folder, $this->threading,
-                    $this->convert_criteria($criteria, $charset), true, 'US-ASCII');
-            }
-
-            return $threads;
-        }
-
-        if ($sort_field && $this->get_capability('SORT')) {
-            $charset  = $charset ? $charset : $this->default_charset;
-            $messages = $this->conn->sort($folder, $sort_field, $criteria, true, $charset);
-
-            // Error, try with US-ASCII (RFC5256: SORT/THREAD must support US-ASCII and UTF-8,
-            // but I've seen Courier with disabled UTF-8 support)
-            if ($messages->is_error() && $charset && $charset != 'US-ASCII') {
-                $messages = $this->conn->sort($folder, $sort_field,
-                    $this->convert_criteria($criteria, $charset), true, 'US-ASCII');
-            }
-
-            if (!$messages->is_error()) {
-                $this->search_sorted = true;
-                return $messages;
-            }
-        }
-
-        $messages = $this->conn->search($folder,
-            ($charset && $charset != 'US-ASCII' ? "CHARSET $charset " : '') . $criteria, true);
-
-        // Error, try with US-ASCII (some servers may support only US-ASCII)
-        if ($messages->is_error() && $charset && $charset != 'US-ASCII') {
-            $messages = $this->conn->search($folder,
-                $this->convert_criteria($criteria, $charset), true);
-        }
-
-        $this->search_sorted = false;
-
-        return $messages;
-    }
-
-
-    /**
-     * Converts charset of search criteria string
-     *
-     * @param  string  $str          Search string
-     * @param  string  $charset      Original charset
-     * @param  string  $dest_charset Destination charset (default US-ASCII)
-     *
-     * @return string  Search string
-     */
-    protected function convert_criteria($str, $charset, $dest_charset='US-ASCII')
-    {
-        // convert strings to US_ASCII
-        if (preg_match_all('/\{([0-9]+)\}\r\n/', $str, $matches, PREG_OFFSET_CAPTURE)) {
-            $last = 0; $res = '';
-            foreach ($matches[1] as $m) {
-                $string_offset = $m[1] + strlen($m[0]) + 4; // {}\r\n
-                $string = substr($str, $string_offset - 1, $m[0]);
-                $string = rcube_charset::convert($string, $charset, $dest_charset);
-                if ($string === false) {
-                    continue;
-                }
-                $res .= substr($str, $last, $m[1] - $last - 1) . rcube_imap_generic::escape($string);
-                $last = $m[0] + $string_offset - 1;
-            }
-            if ($last < strlen($str)) {
-                $res .= substr($str, $last, strlen($str)-$last);
-            }
-        }
-        // strings for conversion not found
-        else {
-            $res = $str;
-        }
-
-        return $res;
-    }
-
-
-    /**
-     * Refresh saved search set
-     *
-     * @return array Current search set
-     */
-    public function refresh_search()
-    {
-        if (!empty($this->search_string)) {
-            $this->search('', $this->search_string, $this->search_charset, $this->search_sort_field);
-        }
-
-        return $this->get_search_set();
-    }
-
-
-    /**
-     * Return message headers object of a specific message
-     *
-     * @param int     $id       Message UID
-     * @param string  $folder   Folder to read from
-     * @param bool    $force    True to skip cache
-     *
-     * @return rcube_message_header Message headers
-     */
-    public function get_message_headers($uid, $folder = null, $force = false)
-    {
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        // get cached headers
-        if (!$force && $uid && ($mcache = $this->get_mcache_engine())) {
-            $headers = $mcache->get_message($folder, $uid);
-        }
-        else if (!$this->check_connection()) {
-            $headers = false;
-        }
-        else {
-            $headers = $this->conn->fetchHeader(
-                $folder, $uid, true, true, $this->get_fetch_headers());
-        }
-
-        return $headers;
-    }
-
-
-    /**
-     * Fetch message headers and body structure from the IMAP server and build
-     * an object structure similar to the one generated by PEAR::Mail_mimeDecode
-     *
-     * @param int     $uid      Message UID to fetch
-     * @param string  $folder   Folder to read from
-     *
-     * @return object rcube_message_header Message data
-     */
-    public function get_message($uid, $folder = null)
-    {
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        // Check internal cache
-        if (!empty($this->icache['message'])) {
-            if (($headers = $this->icache['message']) && $headers->uid == $uid) {
-                return $headers;
-            }
-        }
-
-        $headers = $this->get_message_headers($uid, $folder);
-
-        // message doesn't exist?
-        if (empty($headers)) {
-            return null;
-        }
-
-        // structure might be cached
-        if (!empty($headers->structure)) {
-            return $headers;
-        }
-
-        $this->msg_uid = $uid;
-
-        if (!$this->check_connection()) {
-            return $headers;
-        }
-
-        if (empty($headers->bodystructure)) {
-            $headers->bodystructure = $this->conn->getStructure($folder, $uid, true);
-        }
-
-        $structure = $headers->bodystructure;
-
-        if (empty($structure)) {
-            return $headers;
-        }
-
-        // set message charset from message headers
-        if ($headers->charset) {
-            $this->struct_charset = $headers->charset;
-        }
-        else {
-            $this->struct_charset = $this->structure_charset($structure);
-        }
-
-        $headers->ctype = strtolower($headers->ctype);
-
-        // Here we can recognize malformed BODYSTRUCTURE and
-        // 1. [@TODO] parse the message in other way to create our own message structure
-        // 2. or just show the raw message body.
-        // Example of structure for malformed MIME message:
-        // ("text" "plain" NIL NIL NIL "7bit" 2154 70 NIL NIL NIL)
-        if ($headers->ctype && !is_array($structure[0]) && $headers->ctype != 'text/plain'
-            && strtolower($structure[0].'/'.$structure[1]) == 'text/plain'
-        ) {
-            // A special known case "Content-type: text" (#1488968)
-            if ($headers->ctype == 'text') {
-                $structure[1]   = 'plain';
-                $headers->ctype = 'text/plain';
-            }
-            // we can handle single-part messages, by simple fix in structure (#1486898)
-            else if (preg_match('/^(text|application)\/(.*)/', $headers->ctype, $m)) {
-                $structure[0] = $m[1];
-                $structure[1] = $m[2];
-            }
-            else {
-                // Try to parse the message using Mail_mimeDecode package
-                // We need a better solution, Mail_mimeDecode parses message
-                // in memory, which wouldn't work for very big messages,
-                // (it uses up to 10x more memory than the message size)
-                // it's also buggy and not actively developed
-                if ($headers->size && rcube_utils::mem_check($headers->size * 10)) {
-                    $raw_msg = $this->get_raw_body($uid);
-                    $struct = rcube_mime::parse_message($raw_msg);
-                }
-                else {
-                    return $headers;
-                }
-            }
-        }
-
-        if (empty($struct)) {
-            $struct = $this->structure_part($structure, 0, '', $headers);
-        }
-
-        // some workarounds on simple messages...
-        if (empty($struct->parts)) {
-            // ...don't trust given content-type
-            if (!empty($headers->ctype)) {
-                $struct->mime_id  = '1';
-                $struct->mimetype = strtolower($headers->ctype);
-                list($struct->ctype_primary, $struct->ctype_secondary) = explode('/', $struct->mimetype);
-            }
-
-            // ...and charset (there's a case described in #1488968 where invalid content-type
-            // results in invalid charset in BODYSTRUCTURE)
-            if (!empty($headers->charset) && $headers->charset != $struct->ctype_parameters['charset']) {
-                $struct->charset                     = $headers->charset;
-                $struct->ctype_parameters['charset'] = $headers->charset;
-            }
-        }
-
-        $headers->structure = $struct;
-
-        return $this->icache['message'] = $headers;
-    }
-
-
-    /**
-     * Build message part object
-     *
-     * @param array  $part
-     * @param int    $count
-     * @param string $parent
-     */
-    protected function structure_part($part, $count=0, $parent='', $mime_headers=null)
-    {
-        $struct = new rcube_message_part;
-        $struct->mime_id = empty($parent) ? (string)$count : "$parent.$count";
-
-        // multipart
-        if (is_array($part[0])) {
-            $struct->ctype_primary = 'multipart';
-
-        /* RFC3501: BODYSTRUCTURE fields of multipart part
-            part1 array
-            part2 array
-            part3 array
-            ....
-            1. subtype
-            2. parameters (optional)
-            3. description (optional)
-            4. language (optional)
-            5. location (optional)
-        */
-
-            // find first non-array entry
-            for ($i=1; $i<count($part); $i++) {
-                if (!is_array($part[$i])) {
-                    $struct->ctype_secondary = strtolower($part[$i]);
-                    break;
-                }
-            }
-
-            $struct->mimetype = 'multipart/'.$struct->ctype_secondary;
-
-            // build parts list for headers pre-fetching
-            for ($i=0; $i<count($part); $i++) {
-                if (!is_array($part[$i])) {
-                    break;
-                }
-                // fetch message headers if message/rfc822
-                // or named part (could contain Content-Location header)
-                if (!is_array($part[$i][0])) {
-                    $tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
-                    if (strtolower($part[$i][0]) == 'message' && strtolower($part[$i][1]) == 'rfc822') {
-                        $mime_part_headers[] = $tmp_part_id;
-                    }
-                    else if (in_array('name', (array)$part[$i][2]) && empty($part[$i][3])) {
-                        $mime_part_headers[] = $tmp_part_id;
-                    }
-                }
-            }
-
-            // pre-fetch headers of all parts (in one command for better performance)
-            // @TODO: we could do this before _structure_part() call, to fetch
-            // headers for parts on all levels
-            if ($mime_part_headers) {
-                $mime_part_headers = $this->conn->fetchMIMEHeaders($this->folder,
-                    $this->msg_uid, $mime_part_headers);
-            }
-
-            $struct->parts = array();
-            for ($i=0, $count=0; $i<count($part); $i++) {
-                if (!is_array($part[$i])) {
-                    break;
-                }
-                $tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
-                $struct->parts[] = $this->structure_part($part[$i], ++$count, $struct->mime_id,
-                    $mime_part_headers[$tmp_part_id]);
-            }
-
-            return $struct;
-        }
-
-        /* RFC3501: BODYSTRUCTURE fields of non-multipart part
-            0. type
-            1. subtype
-            2. parameters
-            3. id
-            4. description
-            5. encoding
-            6. size
-          -- text
-            7. lines
-          -- message/rfc822
-            7. envelope structure
-            8. body structure
-            9. lines
-          --
-            x. md5 (optional)
-            x. disposition (optional)
-            x. language (optional)
-            x. location (optional)
-        */
-
-        // regular part
-        $struct->ctype_primary = strtolower($part[0]);
-        $struct->ctype_secondary = strtolower($part[1]);
-        $struct->mimetype = $struct->ctype_primary.'/'.$struct->ctype_secondary;
-
-        // read content type parameters
-        if (is_array($part[2])) {
-            $struct->ctype_parameters = array();
-            for ($i=0; $i<count($part[2]); $i+=2) {
-                $struct->ctype_parameters[strtolower($part[2][$i])] = $part[2][$i+1];
-            }
-
-            if (isset($struct->ctype_parameters['charset'])) {
-                $struct->charset = $struct->ctype_parameters['charset'];
-            }
-        }
-
-        // #1487700: workaround for lack of charset in malformed structure
-        if (empty($struct->charset) && !empty($mime_headers) && $mime_headers->charset) {
-            $struct->charset = $mime_headers->charset;
-        }
-
-        // read content encoding
-        if (!empty($part[5])) {
-            $struct->encoding = strtolower($part[5]);
-            $struct->headers['content-transfer-encoding'] = $struct->encoding;
-        }
-
-        // get part size
-        if (!empty($part[6])) {
-            $struct->size = intval($part[6]);
-        }
-
-        // read part disposition
-        $di = 8;
-        if ($struct->ctype_primary == 'text') {
-            $di += 1;
-        }
-        else if ($struct->mimetype == 'message/rfc822') {
-            $di += 3;
-        }
-
-        if (is_array($part[$di]) && count($part[$di]) == 2) {
-            $struct->disposition = strtolower($part[$di][0]);
-
-            if (is_array($part[$di][1])) {
-                for ($n=0; $n<count($part[$di][1]); $n+=2) {
-                    $struct->d_parameters[strtolower($part[$di][1][$n])] = $part[$di][1][$n+1];
-                }
-            }
-        }
-
-        // get message/rfc822's child-parts
-        if (is_array($part[8]) && $di != 8) {
-            $struct->parts = array();
-            for ($i=0, $count=0; $i<count($part[8]); $i++) {
-                if (!is_array($part[8][$i])) {
-                    break;
-                }
-                $struct->parts[] = $this->structure_part($part[8][$i], ++$count, $struct->mime_id);
-            }
-        }
-
-        // get part ID
-        if (!empty($part[3])) {
-            $struct->content_id = $part[3];
-            $struct->headers['content-id'] = $part[3];
-
-            if (empty($struct->disposition)) {
-                $struct->disposition = 'inline';
-            }
-        }
-
-        // fetch message headers if message/rfc822 or named part (could contain Content-Location header)
-        if ($struct->ctype_primary == 'message' || ($struct->ctype_parameters['name'] && !$struct->content_id)) {
-            if (empty($mime_headers)) {
-                $mime_headers = $this->conn->fetchPartHeader(
-                    $this->folder, $this->msg_uid, true, $struct->mime_id);
-            }
-
-            if (is_string($mime_headers)) {
-                $struct->headers = rcube_mime::parse_headers($mime_headers) + $struct->headers;
-            }
-            else if (is_object($mime_headers)) {
-                $struct->headers = get_object_vars($mime_headers) + $struct->headers;
-            }
-
-            // get real content-type of message/rfc822
-            if ($struct->mimetype == 'message/rfc822') {
-                // single-part
-                if (!is_array($part[8][0])) {
-                    $struct->real_mimetype = strtolower($part[8][0] . '/' . $part[8][1]);
-                }
-                // multi-part
-                else {
-                    for ($n=0; $n<count($part[8]); $n++) {
-                        if (!is_array($part[8][$n])) {
-                            break;
-                        }
-                    }
-                    $struct->real_mimetype = 'multipart/' . strtolower($part[8][$n]);
-                }
-            }
-
-            if ($struct->ctype_primary == 'message' && empty($struct->parts)) {
-                if (is_array($part[8]) && $di != 8) {
-                    $struct->parts[] = $this->structure_part($part[8], ++$count, $struct->mime_id);
-                }
-            }
-        }
-
-        // normalize filename property
-        $this->set_part_filename($struct, $mime_headers);
-
-        return $struct;
-    }
-
-
-    /**
-     * Set attachment filename from message part structure
-     *
-     * @param  rcube_message_part $part    Part object
-     * @param  string             $headers Part's raw headers
-     */
-    protected function set_part_filename(&$part, $headers=null)
-    {
-        if (!empty($part->d_parameters['filename'])) {
-            $filename_mime = $part->d_parameters['filename'];
-        }
-        else if (!empty($part->d_parameters['filename*'])) {
-            $filename_encoded = $part->d_parameters['filename*'];
-        }
-        else if (!empty($part->ctype_parameters['name*'])) {
-            $filename_encoded = $part->ctype_parameters['name*'];
-        }
-        // RFC2231 value continuations
-        // TODO: this should be rewrited to support RFC2231 4.1 combinations
-        else if (!empty($part->d_parameters['filename*0'])) {
-            $i = 0;
-            while (isset($part->d_parameters['filename*'.$i])) {
-                $filename_mime .= $part->d_parameters['filename*'.$i];
-                $i++;
-            }
-            // some servers (eg. dovecot-1.x) have no support for parameter value continuations
-            // we must fetch and parse headers "manually"
-            if ($i<2) {
-                if (!$headers) {
-                    $headers = $this->conn->fetchPartHeader(
-                        $this->folder, $this->msg_uid, true, $part->mime_id);
-                }
-                $filename_mime = '';
-                $i = 0;
-                while (preg_match('/filename\*'.$i.'\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
-                    $filename_mime .= $matches[1];
-                    $i++;
-                }
-            }
-        }
-        else if (!empty($part->d_parameters['filename*0*'])) {
-            $i = 0;
-            while (isset($part->d_parameters['filename*'.$i.'*'])) {
-                $filename_encoded .= $part->d_parameters['filename*'.$i.'*'];
-                $i++;
-            }
-            if ($i<2) {
-                if (!$headers) {
-                    $headers = $this->conn->fetchPartHeader(
-                            $this->folder, $this->msg_uid, true, $part->mime_id);
-                }
-                $filename_encoded = '';
-                $i = 0; $matches = array();
-                while (preg_match('/filename\*'.$i.'\*\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
-                    $filename_encoded .= $matches[1];
-                    $i++;
-                }
-            }
-        }
-        else if (!empty($part->ctype_parameters['name*0'])) {
-            $i = 0;
-            while (isset($part->ctype_parameters['name*'.$i])) {
-                $filename_mime .= $part->ctype_parameters['name*'.$i];
-                $i++;
-            }
-            if ($i<2) {
-                if (!$headers) {
-                    $headers = $this->conn->fetchPartHeader(
-                        $this->folder, $this->msg_uid, true, $part->mime_id);
-                }
-                $filename_mime = '';
-                $i = 0; $matches = array();
-                while (preg_match('/\s+name\*'.$i.'\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
-                    $filename_mime .= $matches[1];
-                    $i++;
-                }
-            }
-        }
-        else if (!empty($part->ctype_parameters['name*0*'])) {
-            $i = 0;
-            while (isset($part->ctype_parameters['name*'.$i.'*'])) {
-                $filename_encoded .= $part->ctype_parameters['name*'.$i.'*'];
-                $i++;
-            }
-            if ($i<2) {
-                if (!$headers) {
-                    $headers = $this->conn->fetchPartHeader(
-                        $this->folder, $this->msg_uid, true, $part->mime_id);
-                }
-                $filename_encoded = '';
-                $i = 0; $matches = array();
-                while (preg_match('/\s+name\*'.$i.'\*\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
-                    $filename_encoded .= $matches[1];
-                    $i++;
-                }
-            }
-        }
-        // read 'name' after rfc2231 parameters as it may contains truncated filename (from Thunderbird)
-        else if (!empty($part->ctype_parameters['name'])) {
-            $filename_mime = $part->ctype_parameters['name'];
-        }
-        // Content-Disposition
-        else if (!empty($part->headers['content-description'])) {
-            $filename_mime = $part->headers['content-description'];
-        }
-        else {
-            return;
-        }
-
-        // decode filename
-        if (!empty($filename_mime)) {
-            if (!empty($part->charset)) {
-                $charset = $part->charset;
-            }
-            else if (!empty($this->struct_charset)) {
-                $charset = $this->struct_charset;
-            }
-            else {
-                $charset = rcube_charset::detect($filename_mime, $this->default_charset);
-            }
-
-            $part->filename = rcube_mime::decode_mime_string($filename_mime, $charset);
-        }
-        else if (!empty($filename_encoded)) {
-            // decode filename according to RFC 2231, Section 4
-            if (preg_match("/^([^']*)'[^']*'(.*)$/", $filename_encoded, $fmatches)) {
-                $filename_charset = $fmatches[1];
-                $filename_encoded = $fmatches[2];
-            }
-
-            $part->filename = rcube_charset::convert(urldecode($filename_encoded), $filename_charset);
-        }
-    }
-
-
-    /**
-     * Get charset name from message structure (first part)
-     *
-     * @param  array $structure Message structure
-     *
-     * @return string Charset name
-     */
-    protected function structure_charset($structure)
-    {
-        while (is_array($structure)) {
-            if (is_array($structure[2]) && $structure[2][0] == 'charset') {
-                return $structure[2][1];
-            }
-            $structure = $structure[0];
-        }
-    }
-
-
-    /**
-     * Fetch message body of a specific message from the server
-     *
-     * @param int                Message UID
-     * @param string             Part number
-     * @param rcube_message_part Part object created by get_structure()
-     * @param mixed              True to print part, resource to write part contents in
-     * @param resource           File pointer to save the message part
-     * @param boolean            Disables charset conversion
-     * @param int                Only read this number of bytes
-     * @param boolean            Enables formatting of text/* parts bodies
-     *
-     * @return string Message/part body if not printed
-     */
-    public function get_message_part($uid, $part=1, $o_part=NULL, $print=NULL, $fp=NULL, $skip_charset_conv=false, $max_bytes=0, $formatted=true)
-    {
-        if (!$this->check_connection()) {
-            return null;
-        }
-
-        // get part data if not provided
-        if (!is_object($o_part)) {
-            $structure = $this->conn->getStructure($this->folder, $uid, true);
-            $part_data = rcube_imap_generic::getStructurePartData($structure, $part);
-
-            $o_part = new rcube_message_part;
-            $o_part->ctype_primary = $part_data['type'];
-            $o_part->encoding      = $part_data['encoding'];
-            $o_part->charset       = $part_data['charset'];
-            $o_part->size          = $part_data['size'];
-        }
-
-        if ($o_part && $o_part->size) {
-            $formatted = $formatted && $o_part->ctype_primary == 'text';
-            $body = $this->conn->handlePartBody($this->folder, $uid, true,
-                $part ? $part : 'TEXT', $o_part->encoding, $print, $fp, $formatted, $max_bytes);
-        }
-
-        if ($fp || $print) {
-            return true;
-        }
-
-        // convert charset (if text or message part)
-        if ($body && preg_match('/^(text|message)$/', $o_part->ctype_primary)) {
-            // Remove NULL characters if any (#1486189)
-            if (strpos($body, "\x00") !== false) {
-                $body = str_replace("\x00", '', $body);
-            }
-
-            if (!$skip_charset_conv) {
-                if (!$o_part->charset || strtoupper($o_part->charset) == 'US-ASCII') {
-                    // try to extract charset information from HTML meta tag (#1488125)
-                    if ($o_part->ctype_secondary == 'html' && preg_match('/<meta[^>]+charset=([a-z0-9-_]+)/i', $body, $m)) {
-                        $o_part->charset = strtoupper($m[1]);
-                    }
-                    else {
-                        $o_part->charset = $this->default_charset;
-                    }
-                }
-                $body = rcube_charset::convert($body, $o_part->charset);
-            }
-        }
-
-        return $body;
-    }
-
-
-    /**
-     * Returns the whole message source as string (or saves to a file)
-     *
-     * @param int      $uid Message UID
-     * @param resource $fp  File pointer to save the message
-     *
-     * @return string Message source string
-     */
-    public function get_raw_body($uid, $fp=null)
-    {
-        if (!$this->check_connection()) {
-            return null;
-        }
-
-        return $this->conn->handlePartBody($this->folder, $uid,
-            true, null, null, false, $fp);
-    }
-
-
-    /**
-     * Returns the message headers as string
-     *
-     * @param int $uid  Message UID
-     *
-     * @return string Message headers string
-     */
-    public function get_raw_headers($uid)
-    {
-        if (!$this->check_connection()) {
-            return null;
-        }
-
-        return $this->conn->fetchPartHeader($this->folder, $uid, true);
-    }
-
-
-    /**
-     * Sends the whole message source to stdout
-     *
-     * @param int  $uid       Message UID
-     * @param bool $formatted Enables line-ending formatting
-     */
-    public function print_raw_body($uid, $formatted = true)
-    {
-        if (!$this->check_connection()) {
-            return;
-        }
-
-        $this->conn->handlePartBody($this->folder, $uid, true, null, null, true, null, $formatted);
-    }
-
-
-    /**
-     * Set message flag to one or several messages
-     *
-     * @param mixed   $uids       Message UIDs as array or comma-separated string, or '*'
-     * @param string  $flag       Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
-     * @param string  $folder    Folder name
-     * @param boolean $skip_cache True to skip message cache clean up
-     *
-     * @return boolean  Operation status
-     */
-    public function set_flag($uids, $flag, $folder=null, $skip_cache=false)
-    {
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        $flag = strtoupper($flag);
-        list($uids, $all_mode) = $this->parse_uids($uids);
-
-        if (strpos($flag, 'UN') === 0) {
-            $result = $this->conn->unflag($folder, $uids, substr($flag, 2));
-        }
-        else {
-            $result = $this->conn->flag($folder, $uids, $flag);
-        }
-
-        if ($result && !$skip_cache) {
-            // reload message headers if cached
-            // update flags instead removing from cache
-            if ($mcache = $this->get_mcache_engine()) {
-                $status = strpos($flag, 'UN') !== 0;
-                $mflag  = preg_replace('/^UN/', '', $flag);
-                $mcache->change_flag($folder, $all_mode ? null : explode(',', $uids),
-                    $mflag, $status);
-            }
-
-            // clear cached counters
-            if ($flag == 'SEEN' || $flag == 'UNSEEN') {
-                $this->clear_messagecount($folder, 'SEEN');
-                $this->clear_messagecount($folder, 'UNSEEN');
-            }
-            else if ($flag == 'DELETED' || $flag == 'UNDELETED') {
-                $this->clear_messagecount($folder, 'DELETED');
-                // remove cached messages
-                if ($this->options['skip_deleted']) {
-                    $this->clear_message_cache($folder, $all_mode ? null : explode(',', $uids));
-                }
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Append a mail message (source) to a specific folder
-     *
-     * @param string       $folder  Target folder
-     * @param string|array $message The message source string or filename
-     *                              or array (of strings and file pointers)
-     * @param string       $headers Headers string if $message contains only the body
-     * @param boolean      $is_file True if $message is a filename
-     * @param array        $flags   Message flags
-     * @param mixed        $date    Message internal date
-     * @param bool         $binary  Enables BINARY append
-     *
-     * @return int|bool Appended message UID or True on success, False on error
-     */
-    public function save_message($folder, &$message, $headers='', $is_file=false, $flags = array(), $date = null, $binary = false)
-    {
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        // make sure folder exists
-        if (!$this->folder_exists($folder)) {
-            return false;
-        }
-
-        $date = $this->date_format($date);
-
-        if ($is_file) {
-            $saved = $this->conn->appendFromFile($folder, $message, $headers, $flags, $date, $binary);
-        }
-        else {
-            $saved = $this->conn->append($folder, $message, $flags, $date, $binary);
-        }
-
-        if ($saved) {
-            // increase messagecount of the target folder
-            $this->set_messagecount($folder, 'ALL', 1);
-        }
-
-        return $saved;
-    }
-
-
-    /**
-     * Move a message from one folder to another
-     *
-     * @param mixed  $uids      Message UIDs as array or comma-separated string, or '*'
-     * @param string $to_mbox   Target folder
-     * @param string $from_mbox Source folder
-     *
-     * @return boolean True on success, False on error
-     */
-    public function move_message($uids, $to_mbox, $from_mbox='')
-    {
-        if (!strlen($from_mbox)) {
-            $from_mbox = $this->folder;
-        }
-
-        if ($to_mbox === $from_mbox) {
-            return false;
-        }
-
-        list($uids, $all_mode) = $this->parse_uids($uids);
-
-        // exit if no message uids are specified
-        if (empty($uids)) {
-            return false;
-        }
-
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        // make sure folder exists
-        if ($to_mbox != 'INBOX' && !$this->folder_exists($to_mbox)) {
-            if (in_array($to_mbox, $this->default_folders)) {
-                if (!$this->create_folder($to_mbox, true)) {
-                    return false;
-                }
-            }
-            else {
-                return false;
-            }
-        }
-
-        $config = rcube::get_instance()->config;
-        $to_trash = $to_mbox == $config->get('trash_mbox');
-
-        // flag messages as read before moving them
-        if ($to_trash && $config->get('read_when_deleted')) {
-            // don't flush cache (4th argument)
-            $this->set_flag($uids, 'SEEN', $from_mbox, true);
-        }
-
-        // move messages
-        $moved = $this->conn->move($uids, $from_mbox, $to_mbox);
-
-        if ($moved) {
-            $this->clear_messagecount($from_mbox);
-            $this->clear_messagecount($to_mbox);
-        }
-        // moving failed
-        else if ($to_trash && $config->get('delete_always', false)) {
-            $moved = $this->delete_message($uids, $from_mbox);
-        }
-
-        if ($moved) {
-            // unset threads internal cache
-            unset($this->icache['threads']);
-
-            // remove message ids from search set
-            if ($this->search_set && $from_mbox == $this->folder) {
-                // threads are too complicated to just remove messages from set
-                if ($this->search_threads || $all_mode) {
-                    $this->refresh_search();
-                }
-                else {
-                    $this->search_set->filter(explode(',', $uids));
-                }
-            }
-
-            // remove cached messages
-            // @TODO: do cache update instead of clearing it
-            $this->clear_message_cache($from_mbox, $all_mode ? null : explode(',', $uids));
-        }
-
-        return $moved;
-    }
-
-
-    /**
-     * Copy a message from one folder to another
-     *
-     * @param mixed  $uids      Message UIDs as array or comma-separated string, or '*'
-     * @param string $to_mbox   Target folder
-     * @param string $from_mbox Source folder
-     *
-     * @return boolean True on success, False on error
-     */
-    public function copy_message($uids, $to_mbox, $from_mbox='')
-    {
-        if (!strlen($from_mbox)) {
-            $from_mbox = $this->folder;
-        }
-
-        list($uids, $all_mode) = $this->parse_uids($uids);
-
-        // exit if no message uids are specified
-        if (empty($uids)) {
-            return false;
-        }
-
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        // make sure folder exists
-        if ($to_mbox != 'INBOX' && !$this->folder_exists($to_mbox)) {
-            if (in_array($to_mbox, $this->default_folders)) {
-                if (!$this->create_folder($to_mbox, true)) {
-                    return false;
-                }
-            }
-            else {
-                return false;
-            }
-        }
-
-        // copy messages
-        $copied = $this->conn->copy($uids, $from_mbox, $to_mbox);
-
-        if ($copied) {
-            $this->clear_messagecount($to_mbox);
-        }
-
-        return $copied;
-    }
-
-
-    /**
-     * Mark messages as deleted and expunge them
-     *
-     * @param mixed  $uids    Message UIDs as array or comma-separated string, or '*'
-     * @param string $folder  Source folder
-     *
-     * @return boolean True on success, False on error
-     */
-    public function delete_message($uids, $folder='')
-    {
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        list($uids, $all_mode) = $this->parse_uids($uids);
-
-        // exit if no message uids are specified
-        if (empty($uids)) {
-            return false;
-        }
-
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        $deleted = $this->conn->flag($folder, $uids, 'DELETED');
-
-        if ($deleted) {
-            // send expunge command in order to have the deleted message
-            // really deleted from the folder
-            $this->expunge_message($uids, $folder, false);
-            $this->clear_messagecount($folder);
-            unset($this->uid_id_map[$folder]);
-
-            // unset threads internal cache
-            unset($this->icache['threads']);
-
-            // remove message ids from search set
-            if ($this->search_set && $folder == $this->folder) {
-                // threads are too complicated to just remove messages from set
-                if ($this->search_threads || $all_mode) {
-                    $this->refresh_search();
-                }
-                else {
-                    $this->search_set->filter(explode(',', $uids));
-                }
-            }
-
-            // remove cached messages
-            $this->clear_message_cache($folder, $all_mode ? null : explode(',', $uids));
-        }
-
-        return $deleted;
-    }
-
-
-    /**
-     * Send IMAP expunge command and clear cache
-     *
-     * @param mixed   $uids        Message UIDs as array or comma-separated string, or '*'
-     * @param string  $folder      Folder name
-     * @param boolean $clear_cache False if cache should not be cleared
-     *
-     * @return boolean True on success, False on failure
-     */
-    public function expunge_message($uids, $folder = null, $clear_cache = true)
-    {
-        if ($uids && $this->get_capability('UIDPLUS')) {
-            list($uids, $all_mode) = $this->parse_uids($uids);
-        }
-        else {
-            $uids = null;
-        }
-
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        // force folder selection and check if folder is writeable
-        // to prevent a situation when CLOSE is executed on closed
-        // or EXPUNGE on read-only folder
-        $result = $this->conn->select($folder);
-        if (!$result) {
-            return false;
-        }
-
-        if (!$this->conn->data['READ-WRITE']) {
-            $this->conn->setError(rcube_imap_generic::ERROR_READONLY, "Folder is read-only");
-            return false;
-        }
-
-        // CLOSE(+SELECT) should be faster than EXPUNGE
-        if (empty($uids) || $all_mode) {
-            $result = $this->conn->close();
-        }
-        else {
-            $result = $this->conn->expunge($folder, $uids);
-        }
-
-        if ($result && $clear_cache) {
-            $this->clear_message_cache($folder, $all_mode ? null : explode(',', $uids));
-            $this->clear_messagecount($folder);
-        }
-
-        return $result;
-    }
-
-
-    /* --------------------------------
-     *        folder managment
-     * --------------------------------*/
-
-    /**
-     * Public method for listing subscribed folders.
-     *
-     * @param   string  $root      Optional root folder
-     * @param   string  $name      Optional name pattern
-     * @param   string  $filter    Optional filter
-     * @param   string  $rights    Optional ACL requirements
-     * @param   bool    $skip_sort Enable to return unsorted list (for better performance)
-     *
-     * @return  array   List of folders
-     */
-    public function list_folders_subscribed($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
-    {
-        $cache_key = $root.':'.$name;
-        if (!empty($filter)) {
-            $cache_key .= ':'.(is_string($filter) ? $filter : serialize($filter));
-        }
-        $cache_key .= ':'.$rights;
-        $cache_key = 'mailboxes.'.md5($cache_key);
-
-        // get cached folder list
-        $a_mboxes = $this->get_cache($cache_key);
-        if (is_array($a_mboxes)) {
-            return $a_mboxes;
-        }
-
-        // Give plugins a chance to provide a list of folders
-        $data = rcube::get_instance()->plugins->exec_hook('storage_folders',
-            array('root' => $root, 'name' => $name, 'filter' => $filter, 'mode' => 'LSUB'));
-
-        if (isset($data['folders'])) {
-            $a_mboxes = $data['folders'];
-        }
-        else {
-            $a_mboxes = $this->list_folders_subscribed_direct($root, $name);
-        }
-
-        if (!is_array($a_mboxes)) {
-            return array();
-        }
-
-        // filter folders list according to rights requirements
-        if ($rights && $this->get_capability('ACL')) {
-            $a_mboxes = $this->filter_rights($a_mboxes, $rights);
-        }
-
-        // INBOX should always be available
-        if ((!$filter || $filter == 'mail') && !in_array('INBOX', $a_mboxes)) {
-            array_unshift($a_mboxes, 'INBOX');
-        }
-
-        // sort folders (always sort for cache)
-        if (!$skip_sort || $this->cache) {
-            $a_mboxes = $this->sort_folder_list($a_mboxes);
-        }
-
-        // write folders list to cache
-        $this->update_cache($cache_key, $a_mboxes);
-
-        return $a_mboxes;
-    }
-
-
-    /**
-     * Method for direct folders listing (LSUB)
-     *
-     * @param   string  $root   Optional root folder
-     * @param   string  $name   Optional name pattern
-     *
-     * @return  array   List of subscribed folders
-     * @see     rcube_imap::list_folders_subscribed()
-     */
-    public function list_folders_subscribed_direct($root='', $name='*')
-    {
-        if (!$this->check_connection()) {
-           return null;
-        }
-
-        $config = rcube::get_instance()->config;
-
-        // Server supports LIST-EXTENDED, we can use selection options
-        // #1486225: Some dovecot versions returns wrong result using LIST-EXTENDED
-        $list_extended = !$config->get('imap_force_lsub') && $this->get_capability('LIST-EXTENDED');
-        if ($list_extended) {
-            // This will also set folder options, LSUB doesn't do that
-            $a_folders = $this->conn->listMailboxes($root, $name,
-                NULL, array('SUBSCRIBED'));
-        }
-        else {
-            // retrieve list of folders from IMAP server using LSUB
-            $a_folders = $this->conn->listSubscribed($root, $name);
-        }
-
-        if (!is_array($a_folders)) {
-            return array();
-        }
-
-        // #1486796: some server configurations doesn't return folders in all namespaces
-        if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
-            $this->list_folders_update($a_folders, ($list_extended ? 'ext-' : '') . 'subscribed');
-        }
-
-        if ($list_extended) {
-            // unsubscribe non-existent folders, remove from the list
-            if (is_array($a_folders) && $name == '*' && !empty($this->conn->data['LIST'])) {
-                foreach ($a_folders as $idx => $folder) {
-                    if (($opts = $this->conn->data['LIST'][$folder])
-                        && in_array('\\NonExistent', $opts)
-                    ) {
-                        $this->conn->unsubscribe($folder);
-                        unset($a_folders[$idx]);
-                    }
-                }
-            }
-        }
-        else {
-            // unsubscribe non-existent folders, remove them from the list
-            if (is_array($a_folders) && !empty($a_folders) && $name == '*') {
-                $existing    = $this->list_folders($root, $name);
-                $nonexisting = array_diff($a_folders, $existing);
-                $a_folders   = array_diff($a_folders, $nonexisting);
-
-                foreach ($nonexisting as $folder) {
-                    $this->conn->unsubscribe($folder);
-                }
-            }
-        }
-
-        return $a_folders;
-    }
-
-
-    /**
-     * Get a list of all folders available on the server
-     *
-     * @param string  $root      IMAP root dir
-     * @param string  $name      Optional name pattern
-     * @param mixed   $filter    Optional filter
-     * @param string  $rights    Optional ACL requirements
-     * @param bool    $skip_sort Enable to return unsorted list (for better performance)
-     *
-     * @return array Indexed array with folder names
-     */
-    public function list_folders($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
-    {
-        $cache_key = $root.':'.$name;
-        if (!empty($filter)) {
-            $cache_key .= ':'.(is_string($filter) ? $filter : serialize($filter));
-        }
-        $cache_key .= ':'.$rights;
-        $cache_key = 'mailboxes.list.'.md5($cache_key);
-
-        // get cached folder list
-        $a_mboxes = $this->get_cache($cache_key);
-        if (is_array($a_mboxes)) {
-            return $a_mboxes;
-        }
-
-        // Give plugins a chance to provide a list of folders
-        $data = rcube::get_instance()->plugins->exec_hook('storage_folders',
-            array('root' => $root, 'name' => $name, 'filter' => $filter, 'mode' => 'LIST'));
-
-        if (isset($data['folders'])) {
-            $a_mboxes = $data['folders'];
-        }
-        else {
-            // retrieve list of folders from IMAP server
-            $a_mboxes = $this->list_folders_direct($root, $name);
-        }
-
-        if (!is_array($a_mboxes)) {
-            $a_mboxes = array();
-        }
-
-        // INBOX should always be available
-        if ((!$filter || $filter == 'mail') && !in_array('INBOX', $a_mboxes)) {
-            array_unshift($a_mboxes, 'INBOX');
-        }
-
-        // cache folder attributes
-        if ($root == '' && $name == '*' && empty($filter) && !empty($this->conn->data)) {
-            $this->update_cache('mailboxes.attributes', $this->conn->data['LIST']);
-        }
-
-        // filter folders list according to rights requirements
-        if ($rights && $this->get_capability('ACL')) {
-            $a_mboxes = $this->filter_rights($a_mboxes, $rights);
-        }
-
-        // filter folders and sort them
-        if (!$skip_sort) {
-            $a_mboxes = $this->sort_folder_list($a_mboxes);
-        }
-
-        // write folders list to cache
-        $this->update_cache($cache_key, $a_mboxes);
-
-        return $a_mboxes;
-    }
-
-
-    /**
-     * Method for direct folders listing (LIST)
-     *
-     * @param   string  $root   Optional root folder
-     * @param   string  $name   Optional name pattern
-     *
-     * @return  array   List of folders
-     * @see     rcube_imap::list_folders()
-     */
-    public function list_folders_direct($root='', $name='*')
-    {
-        if (!$this->check_connection()) {
-            return null;
-        }
-
-        $result = $this->conn->listMailboxes($root, $name);
-
-        if (!is_array($result)) {
-            return array();
-        }
-
-        $config = rcube::get_instance()->config;
-
-        // #1486796: some server configurations doesn't return folders in all namespaces
-        if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
-            $this->list_folders_update($result);
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Fix folders list by adding folders from other namespaces.
-     * Needed on some servers eg. Courier IMAP
-     *
-     * @param array  $result  Reference to folders list
-     * @param string $type    Listing type (ext-subscribed, subscribed or all)
-     */
-    private function list_folders_update(&$result, $type = null)
-    {
-        $namespace = $this->get_namespace();
-        $search    = array();
-
-        // build list of namespace prefixes
-        foreach ((array)$namespace as $ns) {
-            if (is_array($ns)) {
-                foreach ($ns as $ns_data) {
-                    if (strlen($ns_data[0])) {
-                        $search[] = $ns_data[0];
-                    }
-                }
-            }
-        }
-
-        if (!empty($search)) {
-            // go through all folders detecting namespace usage
-            foreach ($result as $folder) {
-                foreach ($search as $idx => $prefix) {
-                    if (strpos($folder, $prefix) === 0) {
-                        unset($search[$idx]);
-                    }
-                }
-                if (empty($search)) {
-                    break;
-                }
-            }
-
-            // get folders in hidden namespaces and add to the result
-            foreach ($search as $prefix) {
-                if ($type == 'ext-subscribed') {
-                    $list = $this->conn->listMailboxes('', $prefix . '*', null, array('SUBSCRIBED'));
-                }
-                else if ($type == 'subscribed') {
-                    $list = $this->conn->listSubscribed('', $prefix . '*');
-                }
-                else {
-                    $list = $this->conn->listMailboxes('', $prefix . '*');
-                }
-
-                if (!empty($list)) {
-                    $result = array_merge($result, $list);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Filter the given list of folders according to access rights
-     */
-    protected function filter_rights($a_folders, $rights)
-    {
-        $regex = '/('.$rights.')/';
-        foreach ($a_folders as $idx => $folder) {
-            $myrights = join('', (array)$this->my_rights($folder));
-            if ($myrights !== null && !preg_match($regex, $myrights)) {
-                unset($a_folders[$idx]);
-            }
-        }
-
-        return $a_folders;
-    }
-
-
-    /**
-     * Get mailbox quota information
-     * added by Nuny
-     *
-     * @return mixed Quota info or False if not supported
-     */
-    public function get_quota()
-    {
-        if ($this->get_capability('QUOTA') && $this->check_connection()) {
-            return $this->conn->getQuota();
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Get folder size (size of all messages in a folder)
-     *
-     * @param string $folder Folder name
-     *
-     * @return int Folder size in bytes, False on error
-     */
-    public function folder_size($folder)
-    {
-        if (!$this->check_connection()) {
-            return 0;
-        }
-
-        // @TODO: could we try to use QUOTA here?
-        $result = $this->conn->fetchHeaderIndex($folder, '1:*', 'SIZE', false);
-
-        if (is_array($result)) {
-            $result = array_sum($result);
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Subscribe to a specific folder(s)
-     *
-     * @param array $folders Folder name(s)
-     *
-     * @return boolean True on success
-     */
-    public function subscribe($folders)
-    {
-        // let this common function do the main work
-        return $this->change_subscription($folders, 'subscribe');
-    }
-
-
-    /**
-     * Unsubscribe folder(s)
-     *
-     * @param array $a_mboxes Folder name(s)
-     *
-     * @return boolean True on success
-     */
-    public function unsubscribe($folders)
-    {
-        // let this common function do the main work
-        return $this->change_subscription($folders, 'unsubscribe');
-    }
-
-
-    /**
-     * Create a new folder on the server and register it in local cache
-     *
-     * @param string  $folder    New folder name
-     * @param boolean $subscribe True if the new folder should be subscribed
-     *
-     * @return boolean True on success
-     */
-    public function create_folder($folder, $subscribe=false)
-    {
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        $result = $this->conn->createFolder($folder);
-
-        // try to subscribe it
-        if ($result) {
-            // clear cache
-            $this->clear_cache('mailboxes', true);
-
-            if ($subscribe) {
-                $this->subscribe($folder);
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Set a new name to an existing folder
-     *
-     * @param string $folder   Folder to rename
-     * @param string $new_name New folder name
-     *
-     * @return boolean True on success
-     */
-    public function rename_folder($folder, $new_name)
-    {
-        if (!strlen($new_name)) {
-            return false;
-        }
-
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        $delm = $this->get_hierarchy_delimiter();
-
-        // get list of subscribed folders
-        if ((strpos($folder, '%') === false) && (strpos($folder, '*') === false)) {
-            $a_subscribed = $this->list_folders_subscribed('', $folder . $delm . '*');
-            $subscribed   = $this->folder_exists($folder, true);
-        }
-        else {
-            $a_subscribed = $this->list_folders_subscribed();
-            $subscribed   = in_array($folder, $a_subscribed);
-        }
-
-        $result = $this->conn->renameFolder($folder, $new_name);
-
-        if ($result) {
-            // unsubscribe the old folder, subscribe the new one
-            if ($subscribed) {
-                $this->conn->unsubscribe($folder);
-                $this->conn->subscribe($new_name);
-            }
-
-            // check if folder children are subscribed
-            foreach ($a_subscribed as $c_subscribed) {
-                if (strpos($c_subscribed, $folder.$delm) === 0) {
-                    $this->conn->unsubscribe($c_subscribed);
-                    $this->conn->subscribe(preg_replace('/^'.preg_quote($folder, '/').'/',
-                        $new_name, $c_subscribed));
-
-                    // clear cache
-                    $this->clear_message_cache($c_subscribed);
-                }
-            }
-
-            // clear cache
-            $this->clear_message_cache($folder);
-            $this->clear_cache('mailboxes', true);
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Remove folder from server
-     *
-     * @param string $folder Folder name
-     *
-     * @return boolean True on success
-     */
-    function delete_folder($folder)
-    {
-        $delm = $this->get_hierarchy_delimiter();
-
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        // get list of folders
-        if ((strpos($folder, '%') === false) && (strpos($folder, '*') === false)) {
-            $sub_mboxes = $this->list_folders('', $folder . $delm . '*');
-        }
-        else {
-            $sub_mboxes = $this->list_folders();
-        }
-
-        // send delete command to server
-        $result = $this->conn->deleteFolder($folder);
-
-        if ($result) {
-            // unsubscribe folder
-            $this->conn->unsubscribe($folder);
-
-            foreach ($sub_mboxes as $c_mbox) {
-                if (strpos($c_mbox, $folder.$delm) === 0) {
-                    $this->conn->unsubscribe($c_mbox);
-                    if ($this->conn->deleteFolder($c_mbox)) {
-                        $this->clear_message_cache($c_mbox);
-                    }
-                }
-            }
-
-            // clear folder-related cache
-            $this->clear_message_cache($folder);
-            $this->clear_cache('mailboxes', true);
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Create all folders specified as default
-     */
-    public function create_default_folders()
-    {
-        // create default folders if they do not exist
-        foreach ($this->default_folders as $folder) {
-            if (!$this->folder_exists($folder)) {
-                $this->create_folder($folder, true);
-            }
-            else if (!$this->folder_exists($folder, true)) {
-                $this->subscribe($folder);
-            }
-        }
-    }
-
-
-    /**
-     * Checks if folder exists and is subscribed
-     *
-     * @param string   $folder       Folder name
-     * @param boolean  $subscription Enable subscription checking
-     *
-     * @return boolean TRUE or FALSE
-     */
-    public function folder_exists($folder, $subscription=false)
-    {
-        if ($folder == 'INBOX') {
-            return true;
-        }
-
-        $key  = $subscription ? 'subscribed' : 'existing';
-
-        if (is_array($this->icache[$key]) && in_array($folder, $this->icache[$key])) {
-            return true;
-        }
-
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        if ($subscription) {
-            $a_folders = $this->conn->listSubscribed('', $folder);
-        }
-        else {
-            $a_folders = $this->conn->listMailboxes('', $folder);
-        }
-
-        if (is_array($a_folders) && in_array($folder, $a_folders)) {
-            $this->icache[$key][] = $folder;
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Returns the namespace where the folder is in
-     *
-     * @param string $folder Folder name
-     *
-     * @return string One of 'personal', 'other' or 'shared'
-     */
-    public function folder_namespace($folder)
-    {
-        if ($folder == 'INBOX') {
-            return 'personal';
-        }
-
-        foreach ($this->namespace as $type => $namespace) {
-            if (is_array($namespace)) {
-                foreach ($namespace as $ns) {
-                    if ($len = strlen($ns[0])) {
-                        if (($len > 1 && $folder == substr($ns[0], 0, -1))
-                            || strpos($folder, $ns[0]) === 0
-                        ) {
-                            return $type;
-                        }
-                    }
-                }
-            }
-        }
-
-        return 'personal';
-    }
-
-
-    /**
-     * Modify folder name according to namespace.
-     * For output it removes prefix of the personal namespace if it's possible.
-     * For input it adds the prefix. Use it before creating a folder in root
-     * of the folders tree.
-     *
-     * @param string $folder Folder name
-     * @param string $mode    Mode name (out/in)
-     *
-     * @return string Folder name
-     */
-    public function mod_folder($folder, $mode = 'out')
-    {
-        if (!strlen($folder)) {
-            return $folder;
-        }
-
-        $prefix     = $this->namespace['prefix']; // see set_env()
-        $prefix_len = strlen($prefix);
-
-        if (!$prefix_len) {
-            return $folder;
-        }
-
-        // remove prefix for output
-        if ($mode == 'out') {
-            if (substr($folder, 0, $prefix_len) === $prefix) {
-                return substr($folder, $prefix_len);
-            }
-        }
-        // add prefix for input (e.g. folder creation)
-        else {
-            return $prefix . $folder;
-        }
-
-        return $folder;
-    }
-
-
-    /**
-     * Gets folder attributes from LIST response, e.g. \Noselect, \Noinferiors
-     *
-     * @param string $folder Folder name
-     * @param bool   $force   Set to True if attributes should be refreshed
-     *
-     * @return array Options list
-     */
-    public function folder_attributes($folder, $force=false)
-    {
-        // get attributes directly from LIST command
-        if (!empty($this->conn->data['LIST']) && is_array($this->conn->data['LIST'][$folder])) {
-            $opts = $this->conn->data['LIST'][$folder];
-        }
-        // get cached folder attributes
-        else if (!$force) {
-            $opts = $this->get_cache('mailboxes.attributes');
-            $opts = $opts[$folder];
-        }
-
-        if (!is_array($opts)) {
-            if (!$this->check_connection()) {
-                return array();
-            }
-
-            $this->conn->listMailboxes('', $folder);
-            $opts = $this->conn->data['LIST'][$folder];
-        }
-
-        return is_array($opts) ? $opts : array();
-    }
-
-
-    /**
-     * Gets connection (and current folder) data: UIDVALIDITY, EXISTS, RECENT,
-     * PERMANENTFLAGS, UIDNEXT, UNSEEN
-     *
-     * @param string $folder Folder name
-     *
-     * @return array Data
-     */
-    public function folder_data($folder)
-    {
-        if (!strlen($folder)) {
-            $folder = $this->folder !== null ? $this->folder : 'INBOX';
-        }
-
-        if ($this->conn->selected != $folder) {
-            if (!$this->check_connection()) {
-                return array();
-            }
-
-            if ($this->conn->select($folder)) {
-                $this->folder = $folder;
-            }
-            else {
-                return null;
-            }
-        }
-
-        $data = $this->conn->data;
-
-        // add (E)SEARCH result for ALL UNDELETED query
-        if (!empty($this->icache['undeleted_idx'])
-            && $this->icache['undeleted_idx']->get_parameters('MAILBOX') == $folder
-        ) {
-            $data['UNDELETED'] = $this->icache['undeleted_idx'];
-        }
-
-        return $data;
-    }
-
-
-    /**
-     * Returns extended information about the folder
-     *
-     * @param string $folder Folder name
-     *
-     * @return array Data
-     */
-    public function folder_info($folder)
-    {
-        if ($this->icache['options'] && $this->icache['options']['name'] == $folder) {
-            return $this->icache['options'];
-        }
-
-        // get cached metadata
-        $cache_key = 'mailboxes.folder-info.' . $folder;
-        $cached = $this->get_cache($cache_key);
-
-        if (is_array($cached)) {
-            return $cached;
-        }
-
-        $acl       = $this->get_capability('ACL');
-        $namespace = $this->get_namespace();
-        $options   = array();
-
-        // check if the folder is a namespace prefix
-        if (!empty($namespace)) {
-            $mbox = $folder . $this->delimiter;
-            foreach ($namespace as $ns) {
-                if (!empty($ns)) {
-                    foreach ($ns as $item) {
-                        if ($item[0] === $mbox) {
-                            $options['is_root'] = true;
-                            break 2;
-                        }
-                    }
-                }
-            }
-        }
-        // check if the folder is other user virtual-root
-        if (!$options['is_root'] && !empty($namespace) && !empty($namespace['other'])) {
-            $parts = explode($this->delimiter, $folder);
-            if (count($parts) == 2) {
-                $mbox = $parts[0] . $this->delimiter;
-                foreach ($namespace['other'] as $item) {
-                    if ($item[0] === $mbox) {
-                        $options['is_root'] = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-        $options['name']       = $folder;
-        $options['attributes'] = $this->folder_attributes($folder, true);
-        $options['namespace']  = $this->folder_namespace($folder);
-        $options['special']    = in_array($folder, $this->default_folders);
-
-        // Set 'noselect' flag
-        if (is_array($options['attributes'])) {
-            foreach ($options['attributes'] as $attrib) {
-                $attrib = strtolower($attrib);
-                if ($attrib == '\noselect' || $attrib == '\nonexistent') {
-                    $options['noselect'] = true;
-                }
-            }
-        }
-        else {
-            $options['noselect'] = true;
-        }
-
-        // Get folder rights (MYRIGHTS)
-        if ($acl && ($rights = $this->my_rights($folder))) {
-            $options['rights'] = $rights;
-        }
-
-        // Set 'norename' flag
-        if (!empty($options['rights'])) {
-            $options['norename'] = !in_array('x', $options['rights']) && !in_array('d', $options['rights']);
-
-            if (!$options['noselect']) {
-                $options['noselect'] = !in_array('r', $options['rights']);
-            }
-        }
-        else {
-            $options['norename'] = $options['is_root'] || $options['namespace'] != 'personal';
-        }
-
-        // update caches
-        $this->icache['options'] = $options;
-        $this->update_cache($cache_key, $options);
-
-        return $options;
-    }
-
-
-    /**
-     * Synchronizes messages cache.
-     *
-     * @param string $folder Folder name
-     */
-    public function folder_sync($folder)
-    {
-        if ($mcache = $this->get_mcache_engine()) {
-            $mcache->synchronize($folder);
-        }
-    }
-
-
-    /**
-     * Get message header names for rcube_imap_generic::fetchHeader(s)
-     *
-     * @return string Space-separated list of header names
-     */
-    protected function get_fetch_headers()
-    {
-        if (!empty($this->options['fetch_headers'])) {
-            $headers = explode(' ', $this->options['fetch_headers']);
-        }
-        else {
-            $headers = array();
-        }
-
-        if ($this->messages_caching || $this->options['all_headers']) {
-            $headers = array_merge($headers, $this->all_headers);
-        }
-
-        return $headers;
-    }
-
-
-    /* -----------------------------------------
-     *   ACL and METADATA/ANNOTATEMORE methods
-     * ----------------------------------------*/
-
-    /**
-     * Changes the ACL on the specified folder (SETACL)
-     *
-     * @param string $folder  Folder name
-     * @param string $user    User name
-     * @param string $acl     ACL string
-     *
-     * @return boolean True on success, False on failure
-     * @since 0.5-beta
-     */
-    public function set_acl($folder, $user, $acl)
-    {
-        if (!$this->get_capability('ACL')) {
-            return false;
-        }
-
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        $this->clear_cache('mailboxes.folder-info.' . $folder);
-
-        return $this->conn->setACL($folder, $user, $acl);
-    }
-
-
-    /**
-     * Removes any <identifier,rights> pair for the
-     * specified user from the ACL for the specified
-     * folder (DELETEACL)
-     *
-     * @param string $folder  Folder name
-     * @param string $user    User name
-     *
-     * @return boolean True on success, False on failure
-     * @since 0.5-beta
-     */
-    public function delete_acl($folder, $user)
-    {
-        if (!$this->get_capability('ACL')) {
-            return false;
-        }
-
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        return $this->conn->deleteACL($folder, $user);
-    }
-
-
-    /**
-     * Returns the access control list for folder (GETACL)
-     *
-     * @param string $folder Folder name
-     *
-     * @return array User-rights array on success, NULL on error
-     * @since 0.5-beta
-     */
-    public function get_acl($folder)
-    {
-        if (!$this->get_capability('ACL')) {
-            return null;
-        }
-
-        if (!$this->check_connection()) {
-            return null;
-        }
-
-        return $this->conn->getACL($folder);
-    }
-
-
-    /**
-     * Returns information about what rights can be granted to the
-     * user (identifier) in the ACL for the folder (LISTRIGHTS)
-     *
-     * @param string $folder  Folder name
-     * @param string $user    User name
-     *
-     * @return array List of user rights
-     * @since 0.5-beta
-     */
-    public function list_rights($folder, $user)
-    {
-        if (!$this->get_capability('ACL')) {
-            return null;
-        }
-
-        if (!$this->check_connection()) {
-            return null;
-        }
-
-        return $this->conn->listRights($folder, $user);
-    }
-
-
-    /**
-     * Returns the set of rights that the current user has to
-     * folder (MYRIGHTS)
-     *
-     * @param string $folder Folder name
-     *
-     * @return array MYRIGHTS response on success, NULL on error
-     * @since 0.5-beta
-     */
-    public function my_rights($folder)
-    {
-        if (!$this->get_capability('ACL')) {
-            return null;
-        }
-
-        if (!$this->check_connection()) {
-            return null;
-        }
-
-        return $this->conn->myRights($folder);
-    }
-
-
-    /**
-     * Sets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
-     *
-     * @param string $folder  Folder name (empty for server metadata)
-     * @param array  $entries Entry-value array (use NULL value as NIL)
-     *
-     * @return boolean True on success, False on failure
-     * @since 0.5-beta
-     */
-    public function set_metadata($folder, $entries)
-    {
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        $this->clear_cache('mailboxes.metadata.', true);
-
-        if ($this->get_capability('METADATA') ||
-            (!strlen($folder) && $this->get_capability('METADATA-SERVER'))
-        ) {
-            return $this->conn->setMetadata($folder, $entries);
-        }
-        else if ($this->get_capability('ANNOTATEMORE') || $this->get_capability('ANNOTATEMORE2')) {
-            foreach ((array)$entries as $entry => $value) {
-                list($ent, $attr) = $this->md2annotate($entry);
-                $entries[$entry] = array($ent, $attr, $value);
-            }
-            return $this->conn->setAnnotation($folder, $entries);
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Unsets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
-     *
-     * @param string $folder  Folder name (empty for server metadata)
-     * @param array  $entries Entry names array
-     *
-     * @return boolean True on success, False on failure
-     * @since 0.5-beta
-     */
-    public function delete_metadata($folder, $entries)
-    {
-        if (!$this->check_connection()) {
-            return false;
-        }
-
-        $this->clear_cache('mailboxes.metadata.', true);
-
-        if ($this->get_capability('METADATA') ||
-            (!strlen($folder) && $this->get_capability('METADATA-SERVER'))
-        ) {
-            return $this->conn->deleteMetadata($folder, $entries);
-        }
-        else if ($this->get_capability('ANNOTATEMORE') || $this->get_capability('ANNOTATEMORE2')) {
-            foreach ((array)$entries as $idx => $entry) {
-                list($ent, $attr) = $this->md2annotate($entry);
-                $entries[$idx] = array($ent, $attr, NULL);
-            }
-            return $this->conn->setAnnotation($folder, $entries);
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Returns IMAP metadata/annotations (GETMETADATA/GETANNOTATION)
-     *
-     * @param string $folder  Folder name (empty for server metadata)
-     * @param array  $entries Entries
-     * @param array  $options Command options (with MAXSIZE and DEPTH keys)
-     *
-     * @return array Metadata entry-value hash array on success, NULL on error
-     * @since 0.5-beta
-     */
-    public function get_metadata($folder, $entries, $options=array())
-    {
-        $entries = (array)$entries;
-
-        // create cache key
-        // @TODO: this is the simplest solution, but we do the same with folders list
-        //        maybe we should store data per-entry and merge on request
-        sort($options);
-        sort($entries);
-        $cache_key = 'mailboxes.metadata.' . $folder;
-        $cache_key .= '.' . md5(serialize($options).serialize($entries));
-
-        // get cached data
-        $cached_data = $this->get_cache($cache_key);
-
-        if (is_array($cached_data)) {
-            return $cached_data;
-        }
-
-        if (!$this->check_connection()) {
-            return null;
-        }
-
-        if ($this->get_capability('METADATA') ||
-            (!strlen($folder) && $this->get_capability('METADATA-SERVER'))
-        ) {
-            $res = $this->conn->getMetadata($folder, $entries, $options);
-        }
-        else if ($this->get_capability('ANNOTATEMORE') || $this->get_capability('ANNOTATEMORE2')) {
-            $queries = array();
-            $res     = array();
-
-            // Convert entry names
-            foreach ($entries as $entry) {
-                list($ent, $attr) = $this->md2annotate($entry);
-                $queries[$attr][] = $ent;
-            }
-
-            // @TODO: Honor MAXSIZE and DEPTH options
-            foreach ($queries as $attrib => $entry) {
-                if ($result = $this->conn->getAnnotation($folder, $entry, $attrib)) {
-                    $res = array_merge_recursive($res, $result);
-                }
-            }
-        }
-
-        if (isset($res)) {
-            $this->update_cache($cache_key, $res);
-            return $res;
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Converts the METADATA extension entry name into the correct
-     * entry-attrib names for older ANNOTATEMORE version.
-     *
-     * @param string $entry Entry name
-     *
-     * @return array Entry-attribute list, NULL if not supported (?)
-     */
-    protected function md2annotate($entry)
-    {
-        if (substr($entry, 0, 7) == '/shared') {
-            return array(substr($entry, 7), 'value.shared');
-        }
-        else if (substr($entry, 0, 8) == '/private') {
-            return array(substr($entry, 8), 'value.priv');
-        }
-
-        // @TODO: log error
-        return null;
-    }
-
-
-    /* --------------------------------
-     *   internal caching methods
-     * --------------------------------*/
-
-    /**
-     * Enable or disable indexes caching
-     *
-     * @param string $type Cache type (@see rcube::get_cache)
-     */
-    public function set_caching($type)
-    {
-        if ($type) {
-            $this->caching = $type;
-        }
-        else {
-            if ($this->cache) {
-                $this->cache->close();
-            }
-            $this->cache   = null;
-            $this->caching = false;
-        }
-    }
-
-    /**
-     * Getter for IMAP cache object
-     */
-    protected function get_cache_engine()
-    {
-        if ($this->caching && !$this->cache) {
-            $rcube = rcube::get_instance();
-            $ttl   = $rcube->config->get('imap_cache_ttl', '10d');
-            $this->cache = $rcube->get_cache('IMAP', $this->caching, $ttl);
-        }
-
-        return $this->cache;
-    }
-
-    /**
-     * Returns cached value
-     *
-     * @param string $key Cache key
-     *
-     * @return mixed
-     */
-    public function get_cache($key)
-    {
-        if ($cache = $this->get_cache_engine()) {
-            return $cache->get($key);
-        }
-    }
-
-    /**
-     * Update cache
-     *
-     * @param string $key  Cache key
-     * @param mixed  $data Data
-     */
-    public function update_cache($key, $data)
-    {
-        if ($cache = $this->get_cache_engine()) {
-            $cache->set($key, $data);
-        }
-    }
-
-    /**
-     * Clears the cache.
-     *
-     * @param string  $key         Cache key name or pattern
-     * @param boolean $prefix_mode Enable it to clear all keys starting
-     *                             with prefix specified in $key
-     */
-    public function clear_cache($key = null, $prefix_mode = false)
-    {
-        if ($cache = $this->get_cache_engine()) {
-            $cache->remove($key, $prefix_mode);
-        }
-    }
-
-
-    /* --------------------------------
-     *   message caching methods
-     * --------------------------------*/
-
-    /**
-     * Enable or disable messages caching
-     *
-     * @param boolean $set  Flag
-     * @param int     $mode Cache mode
-     */
-    public function set_messages_caching($set, $mode = null)
-    {
-        if ($set) {
-            $this->messages_caching = true;
-
-            if ($mode && ($cache = $this->get_mcache_engine())) {
-                $cache->set_mode($mode);
-            }
-        }
-        else {
-            if ($this->mcache) {
-                $this->mcache->close();
-            }
-            $this->mcache = null;
-            $this->messages_caching = false;
-        }
-    }
-
-
-    /**
-     * Getter for messages cache object
-     */
-    protected function get_mcache_engine()
-    {
-        if ($this->messages_caching && !$this->mcache) {
-            $rcube = rcube::get_instance();
-            if (($dbh = $rcube->get_dbh()) && ($userid = $rcube->get_user_id())) {
-                $ttl       = $rcube->config->get('messages_cache_ttl', '10d');
-                $threshold = $rcube->config->get('messages_cache_threshold', 50);
-                $this->mcache = new rcube_imap_cache(
-                    $dbh, $this, $userid, $this->options['skip_deleted'], $ttl, $threshold);
-            }
-        }
-
-        return $this->mcache;
-    }
-
-
-    /**
-     * Clears the messages cache.
-     *
-     * @param string $folder Folder name
-     * @param array  $uids   Optional message UIDs to remove from cache
-     */
-    protected function clear_message_cache($folder = null, $uids = null)
-    {
-        if ($mcache = $this->get_mcache_engine()) {
-            $mcache->clear($folder, $uids);
-        }
-    }
-
-
-    /**
-     * Delete outdated cache entries
-     */
-    function cache_gc()
-    {
-        rcube_imap_cache::gc();
-    }
-
-
-    /* --------------------------------
-     *         protected methods
-     * --------------------------------*/
-
-    /**
-     * Validate the given input and save to local properties
-     *
-     * @param string $sort_field Sort column
-     * @param string $sort_order Sort order
-     */
-    protected function set_sort_order($sort_field, $sort_order)
-    {
-        if ($sort_field != null) {
-            $this->sort_field = asciiwords($sort_field);
-        }
-        if ($sort_order != null) {
-            $this->sort_order = strtoupper($sort_order) == 'DESC' ? 'DESC' : 'ASC';
-        }
-    }
-
-
-    /**
-     * Sort folders first by default folders and then in alphabethical order
-     *
-     * @param array $a_folders Folders list
-     */
-    protected function sort_folder_list($a_folders)
-    {
-        $a_out = $a_defaults = $folders = array();
-
-        $delimiter = $this->get_hierarchy_delimiter();
-
-        // find default folders and skip folders starting with '.'
-        foreach ($a_folders as $folder) {
-            if ($folder[0] == '.') {
-                continue;
-            }
-
-            if (($p = array_search($folder, $this->default_folders)) !== false && !$a_defaults[$p]) {
-                $a_defaults[$p] = $folder;
-            }
-            else {
-                $folders[$folder] = rcube_charset::convert($folder, 'UTF7-IMAP');
-            }
-        }
-
-        // sort folders and place defaults on the top
-        asort($folders, SORT_LOCALE_STRING);
-        ksort($a_defaults);
-        $folders = array_merge($a_defaults, array_keys($folders));
-
-        // finally we must rebuild the list to move
-        // subfolders of default folders to their place...
-        // ...also do this for the rest of folders because
-        // asort() is not properly sorting case sensitive names
-        while (list($key, $folder) = each($folders)) {
-            // set the type of folder name variable (#1485527)
-            $a_out[] = (string) $folder;
-            unset($folders[$key]);
-            $this->rsort($folder, $delimiter, $folders, $a_out);
-        }
-
-        return $a_out;
-    }
-
-
-    /**
-     * Recursive method for sorting folders
-     */
-    protected function rsort($folder, $delimiter, &$list, &$out)
-    {
-        while (list($key, $name) = each($list)) {
-            if (strpos($name, $folder.$delimiter) === 0) {
-                // set the type of folder name variable (#1485527)
-                $out[] = (string) $name;
-                unset($list[$key]);
-                $this->rsort($name, $delimiter, $list, $out);
-            }
-        }
-        reset($list);
-    }
-
-
-    /**
-     * Find UID of the specified message sequence ID
-     *
-     * @param int    $id       Message (sequence) ID
-     * @param string $folder   Folder name
-     *
-     * @return int Message UID
-     */
-    public function id2uid($id, $folder = null)
-    {
-        if (!strlen($folder)) {
-            $folder = $this->folder;
-        }
-
-        if ($uid = array_search($id, (array)$this->uid_id_map[$folder])) {
-            return $uid;
-        }
-
-        if (!$this->check_connection()) {
-            return null;
-        }
-
-        $uid = $this->conn->ID2UID($folder, $id);
-
-        $this->uid_id_map[$folder][$uid] = $id;
-
-        return $uid;
-    }
-
-
-    /**
-     * Subscribe/unsubscribe a list of folders and update local cache
-     */
-    protected function change_subscription($folders, $mode)
-    {
-        $updated = false;
-
-        if (!empty($folders)) {
-            if (!$this->check_connection()) {
-                return false;
-            }
-
-            foreach ((array)$folders as $i => $folder) {
-                $folders[$i] = $folder;
-
-                if ($mode == 'subscribe') {
-                    $updated = $this->conn->subscribe($folder);
-                }
-                else if ($mode == 'unsubscribe') {
-                    $updated = $this->conn->unsubscribe($folder);
-                }
-            }
-        }
-
-        // clear cached folders list(s)
-        if ($updated) {
-            $this->clear_cache('mailboxes', true);
-        }
-
-        return $updated;
-    }
-
-
-    /**
-     * Increde/decrese messagecount for a specific folder
-     */
-    protected function set_messagecount($folder, $mode, $increment)
-    {
-        if (!is_numeric($increment)) {
-            return false;
-        }
-
-        $mode = strtoupper($mode);
-        $a_folder_cache = $this->get_cache('messagecount');
-
-        if (!is_array($a_folder_cache[$folder]) || !isset($a_folder_cache[$folder][$mode])) {
-            return false;
-        }
-
-        // add incremental value to messagecount
-        $a_folder_cache[$folder][$mode] += $increment;
-
-        // there's something wrong, delete from cache
-        if ($a_folder_cache[$folder][$mode] < 0) {
-            unset($a_folder_cache[$folder][$mode]);
-        }
-
-        // write back to cache
-        $this->update_cache('messagecount', $a_folder_cache);
-
-        return true;
-    }
-
-
-    /**
-     * Remove messagecount of a specific folder from cache
-     */
-    protected function clear_messagecount($folder, $mode=null)
-    {
-        $a_folder_cache = $this->get_cache('messagecount');
-
-        if (is_array($a_folder_cache[$folder])) {
-            if ($mode) {
-                unset($a_folder_cache[$folder][$mode]);
-            }
-            else {
-                unset($a_folder_cache[$folder]);
-            }
-            $this->update_cache('messagecount', $a_folder_cache);
-        }
-    }
-
-
-    /**
-     * Converts date string/object into IMAP date/time format
-     */
-    protected function date_format($date)
-    {
-        if (empty($date)) {
-            return null;
-        }
-
-        if (!is_object($date) || !is_a($date, 'DateTime')) {
-            try {
-                $timestamp = rcube_utils::strtotime($date);
-                $date      = new DateTime("@".$timestamp);
-            }
-            catch (Exception $e) {
-                return null;
-            }
-        }
-
-        return $date->format('d-M-Y H:i:s O');
-    }
-
-
-    /**
-     * This is our own debug handler for the IMAP connection
-     * @access public
-     */
-    public function debug_handler(&$imap, $message)
-    {
-        rcube::write_log('imap', $message);
-    }
-
-
-    /**
-     * Deprecated methods (to be removed)
-     */
-
-    public function decode_address_list($input, $max = null, $decode = true, $fallback = null)
-    {
-        return rcube_mime::decode_address_list($input, $max, $decode, $fallback);
-    }
-
-    public function decode_header($input, $fallback = null)
-    {
-        return rcube_mime::decode_mime_string((string)$input, $fallback);
-    }
-
-    public static function decode_mime_string($input, $fallback = null)
-    {
-        return rcube_mime::decode_mime_string($input, $fallback);
-    }
-
-    public function mime_decode($input, $encoding = '7bit')
-    {
-        return rcube_mime::decode($input, $encoding);
-    }
-
-    public static function explode_header_string($separator, $str, $remove_comments = false)
-    {
-        return rcube_mime::explode_header_string($separator, $str, $remove_comments);
-    }
-
-    public function select_mailbox($mailbox)
-    {
-        // do nothing
-    }
-
-    public function set_mailbox($folder)
-    {
-        $this->set_folder($folder);
-    }
-
-    public function get_mailbox_name()
-    {
-        return $this->get_folder();
-    }
-
-    public function list_headers($folder='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
-    {
-        return $this->list_messages($folder, $page, $sort_field, $sort_order, $slice);
-    }
-
-    public function get_headers($uid, $folder = null, $force = false)
-    {
-        return $this->get_message_headers($uid, $folder, $force);
-    }
-
-    public function mailbox_status($folder = null)
-    {
-        return $this->folder_status($folder);
-    }
-
-    public function message_index($folder = '', $sort_field = NULL, $sort_order = NULL)
-    {
-        return $this->index($folder, $sort_field, $sort_order);
-    }
-
-    public function message_index_direct($folder, $sort_field = null, $sort_order = null)
-    {
-        return $this->index_direct($folder, $sort_field, $sort_order);
-    }
-
-    public function list_mailboxes($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
-    {
-        return $this->list_folders_subscribed($root, $name, $filter, $rights, $skip_sort);
-    }
-
-    public function list_unsubscribed($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
-    {
-        return $this->list_folders($root, $name, $filter, $rights, $skip_sort);
-    }
-
-    public function get_mailbox_size($folder)
-    {
-        return $this->folder_size($folder);
-    }
-
-    public function create_mailbox($folder, $subscribe=false)
-    {
-        return $this->create_folder($folder, $subscribe);
-    }
-
-    public function rename_mailbox($folder, $new_name)
-    {
-        return $this->rename_folder($folder, $new_name);
-    }
-
-    function delete_mailbox($folder)
-    {
-        return $this->delete_folder($folder);
-    }
-
-    function clear_mailbox($folder = null)
-    {
-        return $this->clear_folder($folder);
-    }
-
-    public function mailbox_exists($folder, $subscription=false)
-    {
-        return $this->folder_exists($folder, $subscription);
-    }
-
-    public function mailbox_namespace($folder)
-    {
-        return $this->folder_namespace($folder);
-    }
-
-    public function mod_mailbox($folder, $mode = 'out')
-    {
-        return $this->mod_folder($folder, $mode);
-    }
-
-    public function mailbox_attributes($folder, $force=false)
-    {
-        return $this->folder_attributes($folder, $force);
-    }
-
-    public function mailbox_data($folder)
-    {
-        return $this->folder_data($folder);
-    }
-
-    public function mailbox_info($folder)
-    {
-        return $this->folder_info($folder);
-    }
-
-    public function mailbox_sync($folder)
-    {
-        return $this->folder_sync($folder);
-    }
-
-    public function expunge($folder='', $clear_cache=true)
-    {
-        return $this->expunge_folder($folder, $clear_cache);
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_imap_cache.php b/lib/ext/Roundcube/rcube_imap_cache.php
deleted file mode 100644
index a816654..0000000
--- a/lib/ext/Roundcube/rcube_imap_cache.php
+++ /dev/null
@@ -1,1308 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Caching of IMAP folder contents (messages and index)                |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Interface class for accessing Roundcube messages cache
- *
- * @package    Framework
- * @subpackage Storage
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- */
-class rcube_imap_cache
-{
-    const MODE_INDEX   = 1;
-    const MODE_MESSAGE = 2;
-
-    /**
-     * Instance of rcube_imap
-     *
-     * @var rcube_imap
-     */
-    private $imap;
-
-    /**
-     * Instance of rcube_db
-     *
-     * @var rcube_db
-     */
-    private $db;
-
-    /**
-     * User ID
-     *
-     * @var int
-     */
-    private $userid;
-
-    /**
-     * Expiration time in seconds
-     *
-     * @var int
-     */
-    private $ttl;
-
-    /**
-     * Maximum cached message size
-     *
-     * @var int
-     */
-    private $threshold;
-
-    /**
-     * Internal (in-memory) cache
-     *
-     * @var array
-     */
-    private $icache = array();
-
-    private $skip_deleted = false;
-    private $mode;
-
-    /**
-     * List of known flags. Thanks to this we can handle flag changes
-     * with good performance. Bad thing is we need to know used flags.
-     */
-    public $flags = array(
-        1       => 'SEEN',          // RFC3501
-        2       => 'DELETED',       // RFC3501
-        4       => 'ANSWERED',      // RFC3501
-        8       => 'FLAGGED',       // RFC3501
-        16      => 'DRAFT',         // RFC3501
-        32      => 'MDNSENT',       // RFC3503
-        64      => 'FORWARDED',     // RFC5550
-        128     => 'SUBMITPENDING', // RFC5550
-        256     => 'SUBMITTED',     // RFC5550
-        512     => 'JUNK',
-        1024    => 'NONJUNK',
-        2048    => 'LABEL1',
-        4096    => 'LABEL2',
-        8192    => 'LABEL3',
-        16384   => 'LABEL4',
-        32768   => 'LABEL5',
-    );
-
-
-
-    /**
-     * Object constructor.
-     *
-     * @param rcube_db   $db           DB handler
-     * @param rcube_imap $imap         IMAP handler
-     * @param int        $userid       User identifier
-     * @param bool       $skip_deleted skip_deleted flag
-     * @param string     $ttl          Expiration time of memcache/apc items
-     * @param int        $threshold    Maximum cached message size
-     */
-    function __construct($db, $imap, $userid, $skip_deleted, $ttl=0, $threshold=0)
-    {
-        // convert ttl string to seconds
-        $ttl = get_offset_sec($ttl);
-        if ($ttl > 2592000) $ttl = 2592000;
-
-        $this->db           = $db;
-        $this->imap         = $imap;
-        $this->userid       = $userid;
-        $this->skip_deleted = $skip_deleted;
-        $this->ttl          = $ttl;
-        $this->threshold    = $threshold;
-
-        // cache all possible information by default
-        $this->mode = self::MODE_INDEX | self::MODE_MESSAGE;
-    }
-
-
-    /**
-     * Cleanup actions (on shutdown).
-     */
-    public function close()
-    {
-        $this->save_icache();
-        $this->icache = null;
-    }
-
-
-    /**
-     * Set cache mode
-     *
-     * @param int $mode Cache mode
-     */
-    public function set_mode($mode)
-    {
-        $this->mode = $mode;
-    }
-
-
-    /**
-     * Return (sorted) messages index (UIDs).
-     * If index doesn't exist or is invalid, will be updated.
-     *
-     * @param string  $mailbox     Folder name
-     * @param string  $sort_field  Sorting column
-     * @param string  $sort_order  Sorting order (ASC|DESC)
-     * @param bool    $exiting     Skip index initialization if it doesn't exist in DB
-     *
-     * @return array Messages index
-     */
-    function get_index($mailbox, $sort_field = null, $sort_order = null, $existing = false)
-    {
-        if (empty($this->icache[$mailbox])) {
-            $this->icache[$mailbox] = array();
-        }
-
-        $sort_order = strtoupper($sort_order) == 'ASC' ? 'ASC' : 'DESC';
-
-        // Seek in internal cache
-        if (array_key_exists('index', $this->icache[$mailbox])) {
-            // The index was fetched from database already, but not validated yet
-            if (!array_key_exists('object', $this->icache[$mailbox]['index'])) {
-                $index = $this->icache[$mailbox]['index'];
-            }
-            // We've got a valid index
-            else if ($sort_field == 'ANY' || $this->icache[$mailbox]['index']['sort_field'] == $sort_field) {
-                $result = $this->icache[$mailbox]['index']['object'];
-                if ($result->get_parameters('ORDER') != $sort_order) {
-                    $result->revert();
-                }
-                return $result;
-            }
-        }
-
-        // Get index from DB (if DB wasn't already queried)
-        if (empty($index) && empty($this->icache[$mailbox]['index_queried'])) {
-            $index = $this->get_index_row($mailbox);
-
-            // set the flag that DB was already queried for index
-            // this way we'll be able to skip one SELECT, when
-            // get_index() is called more than once
-            $this->icache[$mailbox]['index_queried'] = true;
-        }
-
-        $data = null;
-
-        // @TODO: Think about skipping validation checks.
-        // If we could check only every 10 minutes, we would be able to skip
-        // expensive checks, mailbox selection or even IMAP connection, this would require
-        // additional logic to force cache invalidation in some cases
-        // and many rcube_imap changes to connect when needed
-
-        // Entry exists, check cache status
-        if (!empty($index)) {
-            $exists = true;
-
-            if ($sort_field == 'ANY') {
-                $sort_field = $index['sort_field'];
-            }
-
-            if ($sort_field != $index['sort_field']) {
-                $is_valid = false;
-            }
-            else {
-                $is_valid = $this->validate($mailbox, $index, $exists);
-            }
-
-            if ($is_valid) {
-                $data = $index['object'];
-                // revert the order if needed
-                if ($data->get_parameters('ORDER') != $sort_order) {
-                    $data->revert();
-                }
-            }
-        }
-        else {
-            if ($existing) {
-                return null;
-            }
-            else if ($sort_field == 'ANY') {
-                $sort_field = '';
-            }
-
-            // Got it in internal cache, so the row already exist
-            $exists = array_key_exists('index', $this->icache[$mailbox]);
-        }
-
-        // Index not found, not valid or sort field changed, get index from IMAP server
-        if ($data === null) {
-            // Get mailbox data (UIDVALIDITY, counters, etc.) for status check
-            $mbox_data = $this->imap->folder_data($mailbox);
-            $data      = $this->get_index_data($mailbox, $sort_field, $sort_order, $mbox_data);
-
-            // insert/update
-            $this->add_index_row($mailbox, $sort_field, $data, $mbox_data, $exists, $index['modseq']);
-        }
-
-        $this->icache[$mailbox]['index'] = array(
-            'object'     => $data,
-            'sort_field' => $sort_field,
-            'modseq'     => !empty($index['modseq']) ? $index['modseq'] : $mbox_data['HIGHESTMODSEQ']
-        );
-
-        return $data;
-    }
-
-
-    /**
-     * Return messages thread.
-     * If threaded index doesn't exist or is invalid, will be updated.
-     *
-     * @param string $mailbox Folder name
-     *
-     * @return array Messages threaded index
-     */
-    function get_thread($mailbox)
-    {
-        if (empty($this->icache[$mailbox])) {
-            $this->icache[$mailbox] = array();
-        }
-
-        // Seek in internal cache
-        if (array_key_exists('thread', $this->icache[$mailbox])) {
-            return $this->icache[$mailbox]['thread']['object'];
-        }
-
-        // Get thread from DB (if DB wasn't already queried)
-        if (empty($this->icache[$mailbox]['thread_queried'])) {
-            $index = $this->get_thread_row($mailbox);
-
-            // set the flag that DB was already queried for thread
-            // this way we'll be able to skip one SELECT, when
-            // get_thread() is called more than once or after clear()
-            $this->icache[$mailbox]['thread_queried'] = true;
-        }
-
-        // Entry exist, check cache status
-        if (!empty($index)) {
-            $exists   = true;
-            $is_valid = $this->validate($mailbox, $index, $exists);
-
-            if (!$is_valid) {
-                $index = null;
-            }
-        }
-
-        // Index not found or not valid, get index from IMAP server
-        if ($index === null) {
-            // Get mailbox data (UIDVALIDITY, counters, etc.) for status check
-            $mbox_data = $this->imap->folder_data($mailbox);
-            // Get THREADS result
-            $index['object'] = $this->get_thread_data($mailbox, $mbox_data);
-
-            // insert/update
-            $this->add_thread_row($mailbox, $index['object'], $mbox_data, $exists);
-        }
-
-        $this->icache[$mailbox]['thread'] = $index;
-
-        return $index['object'];
-    }
-
-
-    /**
-     * Returns list of messages (headers). See rcube_imap::fetch_headers().
-     *
-     * @param string $mailbox  Folder name
-     * @param array  $msgs     Message UIDs
-     *
-     * @return array The list of messages (rcube_message_header) indexed by UID
-     */
-    function get_messages($mailbox, $msgs = array())
-    {
-        if (empty($msgs)) {
-            return array();
-        }
-
-        $result = array();
-
-        if ($this->mode & self::MODE_MESSAGE) {
-            // Fetch messages from cache
-            $sql_result = $this->db->query(
-                "SELECT uid, data, flags"
-                ." FROM ".$this->db->table_name('cache_messages')
-                ." WHERE user_id = ?"
-                    ." AND mailbox = ?"
-                    ." AND uid IN (".$this->db->array2list($msgs, 'integer').")",
-                $this->userid, $mailbox);
-
-            $msgs = array_flip($msgs);
-
-            while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                $uid          = intval($sql_arr['uid']);
-                $result[$uid] = $this->build_message($sql_arr);
-
-                if (!empty($result[$uid])) {
-                    // save memory, we don't need message body here (?)
-                    $result[$uid]->body = null;
-
-                    unset($msgs[$uid]);
-                }
-            }
-
-            $msgs = array_flip($msgs);
-        }
-
-        // Fetch not found messages from IMAP server
-        if (!empty($msgs)) {
-            $messages = $this->imap->fetch_headers($mailbox, $msgs, false, true);
-
-            // Insert to DB and add to result list
-            if (!empty($messages)) {
-                foreach ($messages as $msg) {
-                    if ($this->mode & self::MODE_MESSAGE) {
-                        $this->add_message($mailbox, $msg, !array_key_exists($msg->uid, $result));
-                    }
-
-                    $result[$msg->uid] = $msg;
-                }
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Returns message data.
-     *
-     * @param string $mailbox  Folder name
-     * @param int    $uid      Message UID
-     * @param bool   $update   If message doesn't exists in cache it will be fetched
-     *                         from IMAP server
-     * @param bool   $no_cache Enables internal cache usage
-     *
-     * @return rcube_message_header Message data
-     */
-    function get_message($mailbox, $uid, $update = true, $cache = true)
-    {
-        // Check internal cache
-        if ($this->icache['__message']
-            && $this->icache['__message']['mailbox'] == $mailbox
-            && $this->icache['__message']['object']->uid == $uid
-        ) {
-            return $this->icache['__message']['object'];
-        }
-
-        if ($this->mode & self::MODE_MESSAGE) {
-            $sql_result = $this->db->query(
-                "SELECT flags, data"
-                ." FROM ".$this->db->table_name('cache_messages')
-                ." WHERE user_id = ?"
-                    ." AND mailbox = ?"
-                    ." AND uid = ?",
-                    $this->userid, $mailbox, (int)$uid);
-
-            if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                $message = $this->build_message($sql_arr);
-                $found   = true;
-            }
-        }
-
-        // Get the message from IMAP server
-        if (empty($message) && $update) {
-            $message = $this->imap->get_message_headers($uid, $mailbox, true);
-            // cache will be updated in close(), see below
-        }
-
-        if (!($this->mode & self::MODE_MESSAGE)) {
-            return $message;
-        }
-
-        // Save the message in internal cache, will be written to DB in close()
-        // Common scenario: user opens unseen message
-        // - get message (SELECT)
-        // - set message headers/structure (INSERT or UPDATE)
-        // - set \Seen flag (UPDATE)
-        // This way we can skip one UPDATE
-        if (!empty($message) && $cache) {
-            // Save current message from internal cache
-            $this->save_icache();
-
-            $this->icache['__message'] = array(
-                'object'  => $message,
-                'mailbox' => $mailbox,
-                'exists'  => $found,
-                'md5sum'  => md5(serialize($message)),
-            );
-        }
-
-        return $message;
-    }
-
-
-    /**
-     * Saves the message in cache.
-     *
-     * @param string               $mailbox  Folder name
-     * @param rcube_message_header $message  Message data
-     * @param bool                 $force    Skips message in-cache existance check
-     */
-    function add_message($mailbox, $message, $force = false)
-    {
-        if (!is_object($message) || empty($message->uid)) {
-            return;
-        }
-
-        if (!($this->mode & self::MODE_MESSAGE)) {
-            return;
-        }
-
-        $flags = 0;
-        $msg   = clone $message;
-
-        if (!empty($message->flags)) {
-            foreach ($this->flags as $idx => $flag) {
-                if (!empty($message->flags[$flag])) {
-                    $flags += $idx;
-                }
-            }
-        }
-
-        unset($msg->flags);
-        $msg = $this->db->encode($msg, true);
-
-        // update cache record (even if it exists, the update
-        // here will work as select, assume row exist if affected_rows=0)
-        if (!$force) {
-            $res = $this->db->query(
-                "UPDATE ".$this->db->table_name('cache_messages')
-                ." SET flags = ?, data = ?, expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL')
-                ." WHERE user_id = ?"
-                    ." AND mailbox = ?"
-                    ." AND uid = ?",
-                $flags, $msg, $this->userid, $mailbox, (int) $message->uid);
-
-            if ($this->db->affected_rows($res)) {
-                return;
-            }
-        }
-
-        $this->db->set_option('ignore_key_errors', true);
-
-        // insert new record
-        $res = $this->db->query(
-            "INSERT INTO ".$this->db->table_name('cache_messages')
-            ." (user_id, mailbox, uid, flags, expires, data)"
-            ." VALUES (?, ?, ?, ?, ". ($this->ttl ? $this->db->now($this->ttl) : 'NULL') . ", ?)",
-            $this->userid, $mailbox, (int) $message->uid, $flags, $msg);
-
-        // race-condition, insert failed so try update (#1489146)
-        // thanks to ignore_key_errors "duplicate row" errors will be ignored
-        if ($force && !$res && !$this->db->is_error($res)) {
-            $this->db->query(
-                "UPDATE ".$this->db->table_name('cache_messages')
-                ." SET expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL')
-                    .", flags = ?, data = ?"
-                ." WHERE user_id = ?"
-                    ." AND mailbox = ?"
-                    ." AND uid = ?",
-                $flags, $msg, $this->userid, $mailbox, (int) $message->uid);
-        }
-
-        $this->db->set_option('ignore_key_errors', false);
-    }
-
-
-    /**
-     * Sets the flag for specified message.
-     *
-     * @param string  $mailbox  Folder name
-     * @param array   $uids     Message UIDs or null to change flag
-     *                          of all messages in a folder
-     * @param string  $flag     The name of the flag
-     * @param bool    $enabled  Flag state
-     */
-    function change_flag($mailbox, $uids, $flag, $enabled = false)
-    {
-        if (empty($uids)) {
-            return;
-        }
-
-        if (!($this->mode & self::MODE_MESSAGE)) {
-            return;
-        }
-
-        $flag = strtoupper($flag);
-        $idx  = (int) array_search($flag, $this->flags);
-        $uids = (array) $uids;
-
-        if (!$idx) {
-            return;
-        }
-
-        // Internal cache update
-        if (($message = $this->icache['__message'])
-            && $message['mailbox'] === $mailbox
-            && in_array($message['object']->uid, $uids)
-        ) {
-            $message['object']->flags[$flag] = $enabled;
-
-            if (count($uids) == 1) {
-                return;
-            }
-        }
-
-        $this->db->query(
-            "UPDATE ".$this->db->table_name('cache_messages')
-            ." SET expires = ". ($this->ttl ? $this->db->now($this->ttl) : 'NULL')
-            .", flags = flags ".($enabled ? "+ $idx" : "- $idx")
-            ." WHERE user_id = ?"
-                ." AND mailbox = ?"
-                .(!empty($uids) ? " AND uid IN (".$this->db->array2list($uids, 'integer').")" : "")
-                ." AND (flags & $idx) ".($enabled ? "= 0" : "= $idx"),
-            $this->userid, $mailbox);
-    }
-
-
-    /**
-     * Removes message(s) from cache.
-     *
-     * @param string $mailbox  Folder name
-     * @param array  $uids     Message UIDs, NULL removes all messages
-     */
-    function remove_message($mailbox = null, $uids = null)
-    {
-        if (!($this->mode & self::MODE_MESSAGE)) {
-            return;
-        }
-
-        if (!strlen($mailbox)) {
-            $this->db->query(
-                "DELETE FROM ".$this->db->table_name('cache_messages')
-                ." WHERE user_id = ?",
-                $this->userid);
-        }
-        else {
-            // Remove the message from internal cache
-            if (!empty($uids) && ($message = $this->icache['__message'])
-                && $message['mailbox'] === $mailbox
-                && in_array($message['object']->uid, (array)$uids)
-            ) {
-                $this->icache['__message'] = null;
-            }
-
-            $this->db->query(
-                "DELETE FROM ".$this->db->table_name('cache_messages')
-                ." WHERE user_id = ?"
-                    ." AND mailbox = ?"
-                    .($uids !== null ? " AND uid IN (".$this->db->array2list((array)$uids, 'integer').")" : ""),
-                $this->userid, $mailbox);
-        }
-    }
-
-
-    /**
-     * Clears index cache.
-     *
-     * @param string  $mailbox     Folder name
-     * @param bool    $remove      Enable to remove the DB row
-     */
-    function remove_index($mailbox = null, $remove = false)
-    {
-        // The index should be only removed from database when
-        // UIDVALIDITY was detected or the mailbox is empty
-        // otherwise use 'valid' flag to not loose HIGHESTMODSEQ value
-        if ($remove) {
-            $this->db->query(
-                "DELETE FROM ".$this->db->table_name('cache_index')
-                ." WHERE user_id = ?"
-                    .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : ""),
-                $this->userid
-            );
-        }
-        else {
-            $this->db->query(
-                "UPDATE ".$this->db->table_name('cache_index')
-                ." SET valid = 0"
-                ." WHERE user_id = ?"
-                    .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : ""),
-                $this->userid
-            );
-        }
-
-        if (strlen($mailbox)) {
-            unset($this->icache[$mailbox]['index']);
-            // Index removed, set flag to skip SELECT query in get_index()
-            $this->icache[$mailbox]['index_queried'] = true;
-        }
-        else {
-            $this->icache = array();
-        }
-    }
-
-
-    /**
-     * Clears thread cache.
-     *
-     * @param string  $mailbox     Folder name
-     */
-    function remove_thread($mailbox = null)
-    {
-        $this->db->query(
-            "DELETE FROM ".$this->db->table_name('cache_thread')
-            ." WHERE user_id = ?"
-                .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : ""),
-            $this->userid
-        );
-
-        if (strlen($mailbox)) {
-            unset($this->icache[$mailbox]['thread']);
-            // Thread data removed, set flag to skip SELECT query in get_thread()
-            $this->icache[$mailbox]['thread_queried'] = true;
-        }
-        else {
-            $this->icache = array();
-        }
-    }
-
-
-    /**
-     * Clears the cache.
-     *
-     * @param string $mailbox  Folder name
-     * @param array  $uids     Message UIDs, NULL removes all messages in a folder
-     */
-    function clear($mailbox = null, $uids = null)
-    {
-        $this->remove_index($mailbox, true);
-        $this->remove_thread($mailbox);
-        $this->remove_message($mailbox, $uids);
-    }
-
-
-    /**
-     * Delete expired cache entries
-     */
-    static function gc()
-    {
-        $rcube = rcube::get_instance();
-        $db    = $rcube->get_dbh();
-
-        $db->query("DELETE FROM ".$db->table_name('cache_messages')
-              ." WHERE expires < " . $db->now());
-
-        $db->query("DELETE FROM ".$db->table_name('cache_index')
-              ." WHERE expires < " . $db->now());
-
-        $db->query("DELETE FROM ".$db->table_name('cache_thread')
-              ." WHERE expires < " . $db->now());
-    }
-
-
-    /**
-     * Fetches index data from database
-     */
-    private function get_index_row($mailbox)
-    {
-        // Get index from DB
-        $sql_result = $this->db->query(
-            "SELECT data, valid"
-            ." FROM ".$this->db->table_name('cache_index')
-            ." WHERE user_id = ?"
-                ." AND mailbox = ?",
-            $this->userid, $mailbox);
-
-        if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-            $data  = explode('@', $sql_arr['data']);
-            $index = $this->db->decode($data[0], true);
-            unset($data[0]);
-
-            if (empty($index)) {
-                $index = new rcube_result_index($mailbox);
-            }
-
-            return array(
-                'valid'      => $sql_arr['valid'],
-                'object'     => $index,
-                'sort_field' => $data[1],
-                'deleted'    => $data[2],
-                'validity'   => $data[3],
-                'uidnext'    => $data[4],
-                'modseq'     => $data[5],
-            );
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Fetches thread data from database
-     */
-    private function get_thread_row($mailbox)
-    {
-        // Get thread from DB
-        $sql_result = $this->db->query(
-            "SELECT data"
-            ." FROM ".$this->db->table_name('cache_thread')
-            ." WHERE user_id = ?"
-                ." AND mailbox = ?",
-            $this->userid, $mailbox);
-
-        if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-            $data   = explode('@', $sql_arr['data']);
-            $thread = $this->db->decode($data[0], true);
-            unset($data[0]);
-
-            if (empty($thread)) {
-                $thread = new rcube_result_thread($mailbox);
-            }
-
-            return array(
-                'object'   => $thread,
-                'deleted'  => $data[1],
-                'validity' => $data[2],
-                'uidnext'  => $data[3],
-            );
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Saves index data into database
-     */
-    private function add_index_row($mailbox, $sort_field,
-        $data, $mbox_data = array(), $exists = false, $modseq = null)
-    {
-        $data = array(
-            $this->db->encode($data, true),
-            $sort_field,
-            (int) $this->skip_deleted,
-            (int) $mbox_data['UIDVALIDITY'],
-            (int) $mbox_data['UIDNEXT'],
-            $modseq ? $modseq : $mbox_data['HIGHESTMODSEQ'],
-        );
-        $data = implode('@', $data);
-
-        if ($exists) {
-            $res = $this->db->query(
-                "UPDATE ".$this->db->table_name('cache_index')
-                ." SET data = ?, valid = 1, expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL')
-                ." WHERE user_id = ?"
-                    ." AND mailbox = ?",
-                $data, $this->userid, $mailbox);
-
-            if ($this->db->affected_rows($res)) {
-                return;
-            }
-        }
-
-        $this->db->set_option('ignore_key_errors', true);
-
-        $res = $this->db->query(
-            "INSERT INTO ".$this->db->table_name('cache_index')
-            ." (user_id, mailbox, valid, expires, data)"
-            ." VALUES (?, ?, 1, ". ($this->ttl ? $this->db->now($this->ttl) : 'NULL') .", ?)",
-            $this->userid, $mailbox, $data);
-
-        // race-condition, insert failed so try update (#1489146)
-        // thanks to ignore_key_errors "duplicate row" errors will be ignored
-        if (!$exists && !$res && !$this->db->is_error($res)) {
-            $res = $this->db->query(
-                "UPDATE ".$this->db->table_name('cache_index')
-                ." SET data = ?, valid = 1, expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL')
-                ." WHERE user_id = ?"
-                    ." AND mailbox = ?",
-                $data, $this->userid, $mailbox);
-        }
-
-        $this->db->set_option('ignore_key_errors', false);
-    }
-
-
-    /**
-     * Saves thread data into database
-     */
-    private function add_thread_row($mailbox, $data, $mbox_data = array(), $exists = false)
-    {
-        $data = array(
-            $this->db->encode($data, true),
-            (int) $this->skip_deleted,
-            (int) $mbox_data['UIDVALIDITY'],
-            (int) $mbox_data['UIDNEXT'],
-        );
-        $data = implode('@', $data);
-
-        $expires = ($this->ttl ? $this->db->now($this->ttl) : 'NULL');
-
-        if ($exists) {
-            $res = $this->db->query(
-                "UPDATE ".$this->db->table_name('cache_thread')
-                ." SET data = ?, expires = $expires"
-                ." WHERE user_id = ?"
-                    ." AND mailbox = ?",
-                $data, $this->userid, $mailbox);
-
-            if ($this->db->affected_rows($res)) {
-                return;
-            }
-        }
-
-        $this->db->set_option('ignore_key_errors', true);
-
-        $res = $this->db->query(
-            "INSERT INTO ".$this->db->table_name('cache_thread')
-            ." (user_id, mailbox, expires, data)"
-            ." VALUES (?, ?, $expires, ?)",
-            $this->userid, $mailbox, $data);
-
-        // race-condition, insert failed so try update (#1489146)
-        // thanks to ignore_key_errors "duplicate row" errors will be ignored
-        if (!$exists && !$res && !$this->db->is_error($res)) {
-            $this->db->query(
-                "UPDATE ".$this->db->table_name('cache_thread')
-                ." SET expires = $expires, data = ?"
-                ." WHERE user_id = ?"
-                    ." AND mailbox = ?",
-                $data, $this->userid, $mailbox);
-        }
-
-        $this->db->set_option('ignore_key_errors', false);
-    }
-
-
-    /**
-     * Checks index/thread validity
-     */
-    private function validate($mailbox, $index, &$exists = true)
-    {
-        $object    = $index['object'];
-        $is_thread = is_a($object, 'rcube_result_thread');
-
-        // sanity check
-        if (empty($object)) {
-            return false;
-        }
-
-        // Get mailbox data (UIDVALIDITY, counters, etc.) for status check
-        $mbox_data = $this->imap->folder_data($mailbox);
-
-        // @TODO: Think about skipping validation checks.
-        // If we could check only every 10 minutes, we would be able to skip
-        // expensive checks, mailbox selection or even IMAP connection, this would require
-        // additional logic to force cache invalidation in some cases
-        // and many rcube_imap changes to connect when needed
-
-        // Check UIDVALIDITY
-        if ($index['validity'] != $mbox_data['UIDVALIDITY']) {
-            $this->clear($mailbox);
-            $exists = false;
-            return false;
-        }
-
-        // Folder is empty but cache isn't
-        if (empty($mbox_data['EXISTS'])) {
-            if (!$object->is_empty()) {
-                $this->clear($mailbox);
-                $exists = false;
-                return false;
-            }
-        }
-        // Folder is not empty but cache is
-        else if ($object->is_empty()) {
-            unset($this->icache[$mailbox][$is_thread ? 'thread' : 'index']);
-            return false;
-        }
-
-        // Validation flag
-        if (!$is_thread && empty($index['valid'])) {
-            unset($this->icache[$mailbox]['index']);
-            return false;
-        }
-
-        // Index was created with different skip_deleted setting
-        if ($this->skip_deleted != $index['deleted']) {
-            return false;
-        }
-
-        // Check HIGHESTMODSEQ
-        if (!empty($index['modseq']) && !empty($mbox_data['HIGHESTMODSEQ'])
-            && $index['modseq'] == $mbox_data['HIGHESTMODSEQ']
-        ) {
-            return true;
-        }
-
-        // Check UIDNEXT
-        if ($index['uidnext'] != $mbox_data['UIDNEXT']) {
-            unset($this->icache[$mailbox][$is_thread ? 'thread' : 'index']);
-            return false;
-        }
-
-        // @TODO: find better validity check for threaded index
-        if ($is_thread) {
-            // check messages number...
-            if (!$this->skip_deleted && $mbox_data['EXISTS'] != $object->count_messages()) {
-                return false;
-            }
-            return true;
-        }
-
-        // The rest of checks, more expensive
-        if (!empty($this->skip_deleted)) {
-            // compare counts if available
-            if (!empty($mbox_data['UNDELETED'])
-                && $mbox_data['UNDELETED']->count() != $object->count()
-            ) {
-                return false;
-            }
-            // compare UID sets
-            if (!empty($mbox_data['UNDELETED'])) {
-                $uids_new = $mbox_data['UNDELETED']->get();
-                $uids_old = $object->get();
-
-                if (count($uids_new) != count($uids_old)) {
-                    return false;
-                }
-
-                sort($uids_new, SORT_NUMERIC);
-                sort($uids_old, SORT_NUMERIC);
-
-                if ($uids_old != $uids_new)
-                    return false;
-            }
-            else {
-                // get all undeleted messages excluding cached UIDs
-                $ids = $this->imap->search_once($mailbox, 'ALL UNDELETED NOT UID '.
-                    rcube_imap_generic::compressMessageSet($object->get()));
-
-                if (!$ids->is_empty()) {
-                    return false;
-                }
-            }
-        }
-        else {
-            // check messages number...
-            if ($mbox_data['EXISTS'] != $object->count()) {
-                return false;
-            }
-            // ... and max UID
-            if ($object->max() != $this->imap->id2uid($mbox_data['EXISTS'], $mailbox, true)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Synchronizes the mailbox.
-     *
-     * @param string $mailbox Folder name
-     */
-    function synchronize($mailbox)
-    {
-        // RFC4549: Synchronization Operations for Disconnected IMAP4 Clients
-        // RFC4551: IMAP Extension for Conditional STORE Operation
-        //          or Quick Flag Changes Resynchronization
-        // RFC5162: IMAP Extensions for Quick Mailbox Resynchronization
-
-        // @TODO: synchronize with other methods?
-        $qresync   = $this->imap->get_capability('QRESYNC');
-        $condstore = $qresync ? true : $this->imap->get_capability('CONDSTORE');
-
-        if (!$qresync && !$condstore) {
-            return;
-        }
-
-        // Get stored index
-        $index = $this->get_index_row($mailbox);
-
-        // database is empty
-        if (empty($index)) {
-            // set the flag that DB was already queried for index
-            // this way we'll be able to skip one SELECT in get_index()
-            $this->icache[$mailbox]['index_queried'] = true;
-            return;
-        }
-
-        $this->icache[$mailbox]['index'] = $index;
-
-        // no last HIGHESTMODSEQ value
-        if (empty($index['modseq'])) {
-            return;
-        }
-
-        if (!$this->imap->check_connection()) {
-            return;
-        }
-
-        // Enable QRESYNC
-        $res = $this->imap->conn->enable($qresync ? 'QRESYNC' : 'CONDSTORE');
-        if ($res === false) {
-            return;
-        }
-
-        // Close mailbox if already selected to get most recent data
-        if ($this->imap->conn->selected == $mailbox) {
-            $this->imap->conn->close();
-        }
-
-        // Get mailbox data (UIDVALIDITY, HIGHESTMODSEQ, counters, etc.)
-        $mbox_data = $this->imap->folder_data($mailbox);
-
-        if (empty($mbox_data)) {
-             return;
-        }
-
-        // Check UIDVALIDITY
-        if ($index['validity'] != $mbox_data['UIDVALIDITY']) {
-            $this->clear($mailbox);
-            return;
-        }
-
-        // QRESYNC not supported on specified mailbox
-        if (!empty($mbox_data['NOMODSEQ']) || empty($mbox_data['HIGHESTMODSEQ'])) {
-            return;
-        }
-
-        // Nothing new
-        if ($mbox_data['HIGHESTMODSEQ'] == $index['modseq']) {
-            return;
-        }
-
-        $uids    = array();
-        $removed = array();
-
-        // Get known UIDs
-        if ($this->mode & self::MODE_MESSAGE) {
-            $sql_result = $this->db->query(
-                "SELECT uid"
-                ." FROM ".$this->db->table_name('cache_messages')
-                ." WHERE user_id = ?"
-                    ." AND mailbox = ?",
-                $this->userid, $mailbox);
-
-            while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                $uids[] = $sql_arr['uid'];
-            }
-        }
-
-        // Synchronize messages data
-        if (!empty($uids)) {
-            // Get modified flags and vanished messages
-            // UID FETCH 1:* (FLAGS) (CHANGEDSINCE 0123456789 VANISHED)
-            $result = $this->imap->conn->fetch($mailbox,
-                $uids, true, array('FLAGS'), $index['modseq'], $qresync);
-
-            if (!empty($result)) {
-                foreach ($result as $msg) {
-                    $uid = $msg->uid;
-                    // Remove deleted message
-                    if ($this->skip_deleted && !empty($msg->flags['DELETED'])) {
-                        $removed[] = $uid;
-                        // Invalidate index
-                        $index['valid'] = false;
-                        continue;
-                    }
-
-                    $flags = 0;
-                    if (!empty($msg->flags)) {
-                        foreach ($this->flags as $idx => $flag) {
-                            if (!empty($msg->flags[$flag])) {
-                                $flags += $idx;
-                            }
-                        }
-                    }
-
-                    $this->db->query(
-                        "UPDATE ".$this->db->table_name('cache_messages')
-                        ." SET flags = ?, expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL')
-                        ." WHERE user_id = ?"
-                            ." AND mailbox = ?"
-                            ." AND uid = ?"
-                            ." AND flags <> ?",
-                        $flags, $this->userid, $mailbox, $uid, $flags);
-                }
-            }
-
-            // VANISHED found?
-            if ($qresync) {
-                $mbox_data = $this->imap->folder_data($mailbox);
-
-                // Removed messages found
-                $uids = rcube_imap_generic::uncompressMessageSet($mbox_data['VANISHED']);
-                if (!empty($uids)) {
-                    $removed = array_merge($removed, $uids);
-                    // Invalidate index
-                    $index['valid'] = false;
-                }
-            }
-
-            // remove messages from database
-            if (!empty($removed)) {
-                $this->remove_message($mailbox, $removed);
-            }
-        }
-
-        $sort_field = $index['sort_field'];
-        $sort_order = $index['object']->get_parameters('ORDER');
-        $exists     = true;
-
-        // Validate index
-        if (!$this->validate($mailbox, $index, $exists)) {
-            // Invalidate (remove) thread index
-            // if $exists=false it was already removed in validate()
-            if ($exists) {
-                $this->remove_thread($mailbox);
-            }
-
-            // Update index
-            $data = $this->get_index_data($mailbox, $sort_field, $sort_order, $mbox_data);
-        }
-        else {
-            $data = $index['object'];
-        }
-
-        // update index and/or HIGHESTMODSEQ value
-        $this->add_index_row($mailbox, $sort_field, $data, $mbox_data, $exists);
-
-        // update internal cache for get_index()
-        $this->icache[$mailbox]['index']['object'] = $data;
-    }
-
-
-    /**
-     * Converts cache row into message object.
-     *
-     * @param array $sql_arr Message row data
-     *
-     * @return rcube_message_header Message object
-     */
-    private function build_message($sql_arr)
-    {
-        $message = $this->db->decode($sql_arr['data'], true);
-
-        if ($message) {
-            $message->flags = array();
-            foreach ($this->flags as $idx => $flag) {
-                if (($sql_arr['flags'] & $idx) == $idx) {
-                    $message->flags[$flag] = true;
-                }
-           }
-        }
-
-        return $message;
-    }
-
-
-    /**
-     * Saves message stored in internal cache
-     */
-    private function save_icache()
-    {
-        // Save current message from internal cache
-        if ($message = $this->icache['__message']) {
-            // clean up some object's data
-            $this->message_object_prepare($message['object']);
-
-            // calculate current md5 sum
-            $md5sum = md5(serialize($message['object']));
-
-            if ($message['md5sum'] != $md5sum) {
-                $this->add_message($message['mailbox'], $message['object'], !$message['exists']);
-            }
-
-            $this->icache['__message']['md5sum'] = $md5sum;
-        }
-    }
-
-
-    /**
-     * Prepares message object to be stored in database.
-     *
-     * @param rcube_message_header|rcube_message_part
-     */
-    private function message_object_prepare(&$msg, &$size = 0)
-    {
-        // Remove body too big
-        if ($msg->body && ($length = strlen($msg->body))) {
-            $size += $length;
-
-            if ($size > $this->threshold * 1024) {
-                $size -= $length;
-                unset($msg->body);
-            }
-        }
-
-        // Fix mimetype which might be broken by some code when message is displayed
-        // Another solution would be to use object's copy in rcube_message class
-        // to prevent related issues, however I'm not sure which is better
-        if ($msg->mimetype) {
-            list($msg->ctype_primary, $msg->ctype_secondary) = explode('/', $msg->mimetype);
-        }
-
-        unset($msg->replaces);
-
-        if (is_array($msg->structure->parts)) {
-            foreach ($msg->structure->parts as $part) {
-                $this->message_object_prepare($part, $size);
-            }
-        }
-
-        if (is_array($msg->parts)) {
-            foreach ($msg->parts as $part) {
-                $this->message_object_prepare($part, $size);
-            }
-        }
-    }
-
-
-    /**
-     * Fetches index data from IMAP server
-     */
-    private function get_index_data($mailbox, $sort_field, $sort_order, $mbox_data = array())
-    {
-        if (empty($mbox_data)) {
-            $mbox_data = $this->imap->folder_data($mailbox);
-        }
-
-        if ($mbox_data['EXISTS']) {
-            // fetch sorted sequence numbers
-            $index = $this->imap->index_direct($mailbox, $sort_field, $sort_order);
-        }
-        else {
-            $index = new rcube_result_index($mailbox, '* SORT');
-        }
-
-        return $index;
-    }
-
-
-    /**
-     * Fetches thread data from IMAP server
-     */
-    private function get_thread_data($mailbox, $mbox_data = array())
-    {
-        if (empty($mbox_data)) {
-            $mbox_data = $this->imap->folder_data($mailbox);
-        }
-
-        if ($mbox_data['EXISTS']) {
-            // get all threads (default sort order)
-            return $this->imap->threads_direct($mailbox);
-        }
-
-        return new rcube_result_thread($mailbox, '* THREAD');
-    }
-
-}
-
-// for backward compat.
-class rcube_mail_header extends rcube_message_header { }
diff --git a/lib/ext/Roundcube/rcube_imap_generic.php b/lib/ext/Roundcube/rcube_imap_generic.php
deleted file mode 100644
index f9a62f0..0000000
--- a/lib/ext/Roundcube/rcube_imap_generic.php
+++ /dev/null
@@ -1,3812 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Provide alternative IMAP library that doesn't rely on the standard  |
- |   C-Client based version. This allows to function regardless          |
- |   of whether or not the PHP build it's running on has IMAP            |
- |   functionality built-in.                                             |
- |                                                                       |
- |   Based on Iloha IMAP Library. See http://ilohamail.org/ for details  |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- | Author: Ryo Chijiiwa <Ryo@IlohaMail.org>                              |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * PHP based wrapper class to connect to an IMAP server
- *
- * @package    Framework
- * @subpackage Storage
- */
-class rcube_imap_generic
-{
-    public $error;
-    public $errornum;
-    public $result;
-    public $resultcode;
-    public $selected;
-    public $data = array();
-    public $flags = array(
-        'SEEN'     => '\\Seen',
-        'DELETED'  => '\\Deleted',
-        'ANSWERED' => '\\Answered',
-        'DRAFT'    => '\\Draft',
-        'FLAGGED'  => '\\Flagged',
-        'FORWARDED' => '$Forwarded',
-        'MDNSENT'  => '$MDNSent',
-        '*'        => '\\*',
-    );
-
-    public static $mupdate;
-
-    private $fp;
-    private $host;
-    private $logged = false;
-    private $capability = array();
-    private $capability_readed = false;
-    private $prefs;
-    private $cmd_tag;
-    private $cmd_num = 0;
-    private $resourceid;
-    private $_debug = false;
-    private $_debug_handler = false;
-
-    const ERROR_OK = 0;
-    const ERROR_NO = -1;
-    const ERROR_BAD = -2;
-    const ERROR_BYE = -3;
-    const ERROR_UNKNOWN = -4;
-    const ERROR_COMMAND = -5;
-    const ERROR_READONLY = -6;
-
-    const COMMAND_NORESPONSE = 1;
-    const COMMAND_CAPABILITY = 2;
-    const COMMAND_LASTLINE   = 4;
-
-    const DEBUG_LINE_LENGTH = 4098; // 4KB + 2B for \r\n
-
-    /**
-     * Object constructor
-     */
-    function __construct()
-    {
-    }
-
-    /**
-     * Send simple (one line) command to the connection stream
-     *
-     * @param string $string Command string
-     * @param bool   $endln  True if CRLF need to be added at the end of command
-     *
-     * @param int Number of bytes sent, False on error
-     */
-    function putLine($string, $endln=true)
-    {
-        if (!$this->fp)
-            return false;
-
-        if ($this->_debug) {
-            $this->debug('C: '. rtrim($string));
-        }
-
-        $res = fwrite($this->fp, $string . ($endln ? "\r\n" : ''));
-
-        if ($res === false) {
-            @fclose($this->fp);
-            $this->fp = null;
-        }
-
-        return $res;
-    }
-
-    /**
-     * Send command to the connection stream with Command Continuation
-     * Requests (RFC3501 7.5) and LITERAL+ (RFC2088) support
-     *
-     * @param string $string Command string
-     * @param bool   $endln  True if CRLF need to be added at the end of command
-     *
-     * @return int|bool Number of bytes sent, False on error
-     */
-    function putLineC($string, $endln=true)
-    {
-        if (!$this->fp) {
-            return false;
-        }
-
-        if ($endln) {
-            $string .= "\r\n";
-        }
-
-        $res = 0;
-        if ($parts = preg_split('/(\{[0-9]+\}\r\n)/m', $string, -1, PREG_SPLIT_DELIM_CAPTURE)) {
-            for ($i=0, $cnt=count($parts); $i<$cnt; $i++) {
-                if (preg_match('/^\{([0-9]+)\}\r\n$/', $parts[$i+1], $matches)) {
-                    // LITERAL+ support
-                    if ($this->prefs['literal+']) {
-                        $parts[$i+1] = sprintf("{%d+}\r\n", $matches[1]);
-                    }
-
-                    $bytes = $this->putLine($parts[$i].$parts[$i+1], false);
-                    if ($bytes === false)
-                        return false;
-                    $res += $bytes;
-
-                    // don't wait if server supports LITERAL+ capability
-                    if (!$this->prefs['literal+']) {
-                        $line = $this->readLine(1000);
-                        // handle error in command
-                        if ($line[0] != '+')
-                            return false;
-                    }
-                    $i++;
-                }
-                else {
-                    $bytes = $this->putLine($parts[$i], false);
-                    if ($bytes === false)
-                        return false;
-                    $res += $bytes;
-                }
-            }
-        }
-        return $res;
-    }
-
-    /**
-     * Reads line from the connection stream
-     *
-     * @param int  $size  Buffer size
-     *
-     * @return string Line of text response
-     */
-    function readLine($size=1024)
-    {
-        $line = '';
-
-        if (!$size) {
-            $size = 1024;
-        }
-
-        do {
-            if ($this->eof()) {
-                return $line ? $line : NULL;
-            }
-
-            $buffer = fgets($this->fp, $size);
-
-            if ($buffer === false) {
-                $this->closeSocket();
-                break;
-            }
-            if ($this->_debug) {
-                $this->debug('S: '. rtrim($buffer));
-            }
-            $line .= $buffer;
-        } while (substr($buffer, -1) != "\n");
-
-        return $line;
-    }
-
-    /**
-     * Reads more data from the connection stream when provided
-     * data contain string literal
-     *
-     * @param string  $line    Response text
-     * @param bool    $escape  Enables escaping
-     *
-     * @return string Line of text response
-     */
-    function multLine($line, $escape = false)
-    {
-        $line = rtrim($line);
-        if (preg_match('/\{([0-9]+)\}$/', $line, $m)) {
-            $out   = '';
-            $str   = substr($line, 0, -strlen($m[0]));
-            $bytes = $m[1];
-
-            while (strlen($out) < $bytes) {
-                $line = $this->readBytes($bytes);
-                if ($line === NULL)
-                    break;
-                $out .= $line;
-            }
-
-            $line = $str . ($escape ? $this->escape($out) : $out);
-        }
-
-        return $line;
-    }
-
-    /**
-     * Reads specified number of bytes from the connection stream
-     *
-     * @param int  $bytes  Number of bytes to get
-     *
-     * @return string Response text
-     */
-    function readBytes($bytes)
-    {
-        $data = '';
-        $len  = 0;
-        while ($len < $bytes && !$this->eof())
-        {
-            $d = fread($this->fp, $bytes-$len);
-            if ($this->_debug) {
-                $this->debug('S: '. $d);
-            }
-            $data .= $d;
-            $data_len = strlen($data);
-            if ($len == $data_len) {
-                break; // nothing was read -> exit to avoid apache lockups
-            }
-            $len = $data_len;
-        }
-
-        return $data;
-    }
-
-    /**
-     * Reads complete response to the IMAP command
-     *
-     * @param array  $untagged  Will be filled with untagged response lines
-     *
-     * @return string Response text
-     */
-    function readReply(&$untagged=null)
-    {
-        do {
-            $line = trim($this->readLine(1024));
-            // store untagged response lines
-            if ($line[0] == '*')
-                $untagged[] = $line;
-        } while ($line[0] == '*');
-
-        if ($untagged)
-            $untagged = join("\n", $untagged);
-
-        return $line;
-    }
-
-    /**
-     * Response parser.
-     *
-     * @param  string  $string      Response text
-     * @param  string  $err_prefix  Error message prefix
-     *
-     * @return int Response status
-     */
-    function parseResult($string, $err_prefix='')
-    {
-        if (preg_match('/^[a-z0-9*]+ (OK|NO|BAD|BYE)(.*)$/i', trim($string), $matches)) {
-            $res = strtoupper($matches[1]);
-            $str = trim($matches[2]);
-
-            if ($res == 'OK') {
-                $this->errornum = self::ERROR_OK;
-            } else if ($res == 'NO') {
-                $this->errornum = self::ERROR_NO;
-            } else if ($res == 'BAD') {
-                $this->errornum = self::ERROR_BAD;
-            } else if ($res == 'BYE') {
-                $this->closeSocket();
-                $this->errornum = self::ERROR_BYE;
-            }
-
-            if ($str) {
-                $str = trim($str);
-                // get response string and code (RFC5530)
-                if (preg_match("/^\[([a-z-]+)\]/i", $str, $m)) {
-                    $this->resultcode = strtoupper($m[1]);
-                    $str = trim(substr($str, strlen($m[1]) + 2));
-                }
-                else {
-                    $this->resultcode = null;
-                    // parse response for [APPENDUID 1204196876 3456]
-                    if (preg_match("/^\[APPENDUID [0-9]+ ([0-9]+)\]/i", $str, $m)) {
-                        $this->data['APPENDUID'] = $m[1];
-                    }
-                    // parse response for [COPYUID 1204196876 3456:3457 123:124]
-                    else if (preg_match("/^\[COPYUID [0-9]+ ([0-9,:]+) ([0-9,:]+)\]/i", $str, $m)) {
-                        $this->data['COPYUID'] = array($m[1], $m[2]);
-                    }
-                }
-                $this->result = $str;
-
-                if ($this->errornum != self::ERROR_OK) {
-                    $this->error = $err_prefix ? $err_prefix.$str : $str;
-                }
-            }
-
-            return $this->errornum;
-        }
-        return self::ERROR_UNKNOWN;
-    }
-
-    /**
-     * Checks connection stream state.
-     *
-     * @return bool True if connection is closed
-     */
-    private function eof()
-    {
-        if (!is_resource($this->fp)) {
-            return true;
-        }
-
-        // If a connection opened by fsockopen() wasn't closed
-        // by the server, feof() will hang.
-        $start = microtime(true);
-
-        if (feof($this->fp) ||
-            ($this->prefs['timeout'] && (microtime(true) - $start > $this->prefs['timeout']))
-        ) {
-            $this->closeSocket();
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Closes connection stream.
-     */
-    private function closeSocket()
-    {
-        @fclose($this->fp);
-        $this->fp = null;
-    }
-
-    /**
-     * Error code/message setter.
-     */
-    function setError($code, $msg='')
-    {
-        $this->errornum = $code;
-        $this->error    = $msg;
-    }
-
-    /**
-     * Checks response status.
-     * Checks if command response line starts with specified prefix (or * BYE/BAD)
-     *
-     * @param string $string   Response text
-     * @param string $match    Prefix to match with (case-sensitive)
-     * @param bool   $error    Enables BYE/BAD checking
-     * @param bool   $nonempty Enables empty response checking
-     *
-     * @return bool True any check is true or connection is closed.
-     */
-    function startsWith($string, $match, $error=false, $nonempty=false)
-    {
-        if (!$this->fp) {
-            return true;
-        }
-        if (strncmp($string, $match, strlen($match)) == 0) {
-            return true;
-        }
-        if ($error && preg_match('/^\* (BYE|BAD) /i', $string, $m)) {
-            if (strtoupper($m[1]) == 'BYE') {
-                $this->closeSocket();
-            }
-            return true;
-        }
-        if ($nonempty && !strlen($string)) {
-            return true;
-        }
-        return false;
-    }
-
-    private function hasCapability($name)
-    {
-        if (empty($this->capability) || $name == '') {
-            return false;
-        }
-
-        if (in_array($name, $this->capability)) {
-            return true;
-        }
-        else if (strpos($name, '=')) {
-            return false;
-        }
-
-        $result = array();
-        foreach ($this->capability as $cap) {
-            $entry = explode('=', $cap);
-            if ($entry[0] == $name) {
-                $result[] = $entry[1];
-            }
-        }
-
-        return !empty($result) ? $result : false;
-    }
-
-    /**
-     * Capabilities checker
-     *
-     * @param string $name Capability name
-     *
-     * @return mixed Capability values array for key=value pairs, true/false for others
-     */
-    function getCapability($name)
-    {
-        $result = $this->hasCapability($name);
-
-        if (!empty($result)) {
-            return $result;
-        }
-        else if ($this->capability_readed) {
-            return false;
-        }
-
-        // get capabilities (only once) because initial
-        // optional CAPABILITY response may differ
-        $result = $this->execute('CAPABILITY');
-
-        if ($result[0] == self::ERROR_OK) {
-            $this->parseCapability($result[1]);
-        }
-
-        $this->capability_readed = true;
-
-        return $this->hasCapability($name);
-    }
-
-    function clearCapability()
-    {
-        $this->capability = array();
-        $this->capability_readed = false;
-    }
-
-    /**
-     * DIGEST-MD5/CRAM-MD5/PLAIN Authentication
-     *
-     * @param string $user
-     * @param string $pass
-     * @param string $type Authentication type (PLAIN/CRAM-MD5/DIGEST-MD5)
-     *
-     * @return resource Connection resourse on success, error code on error
-     */
-    function authenticate($user, $pass, $type='PLAIN')
-    {
-        if ($type == 'CRAM-MD5' || $type == 'DIGEST-MD5') {
-            if ($type == 'DIGEST-MD5' && !class_exists('Auth_SASL')) {
-                $this->setError(self::ERROR_BYE,
-                    "The Auth_SASL package is required for DIGEST-MD5 authentication");
-                return self::ERROR_BAD;
-            }
-
-            $this->putLine($this->nextTag() . " AUTHENTICATE $type");
-            $line = trim($this->readReply());
-
-            if ($line[0] == '+') {
-                $challenge = substr($line, 2);
-            }
-            else {
-                return $this->parseResult($line);
-            }
-
-            if ($type == 'CRAM-MD5') {
-                // RFC2195: CRAM-MD5
-                $ipad = '';
-                $opad = '';
-
-                // initialize ipad, opad
-                for ($i=0; $i<64; $i++) {
-                    $ipad .= chr(0x36);
-                    $opad .= chr(0x5C);
-                }
-
-                // pad $pass so it's 64 bytes
-                $padLen = 64 - strlen($pass);
-                for ($i=0; $i<$padLen; $i++) {
-                    $pass .= chr(0);
-                }
-
-                // generate hash
-                $hash  = md5($this->_xor($pass, $opad) . pack("H*",
-                    md5($this->_xor($pass, $ipad) . base64_decode($challenge))));
-                $reply = base64_encode($user . ' ' . $hash);
-
-                // send result
-                $this->putLine($reply);
-            }
-            else {
-                // RFC2831: DIGEST-MD5
-                // proxy authorization
-                if (!empty($this->prefs['auth_cid'])) {
-                    $authc = $this->prefs['auth_cid'];
-                    $pass  = $this->prefs['auth_pw'];
-                }
-                else {
-                    $authc = $user;
-                    $user  = '';
-                }
-                $auth_sasl = Auth_SASL::factory('digestmd5');
-                $reply = base64_encode($auth_sasl->getResponse($authc, $pass,
-                    base64_decode($challenge), $this->host, 'imap', $user));
-
-                // send result
-                $this->putLine($reply);
-                $line = trim($this->readReply());
-
-                if ($line[0] == '+') {
-                    $challenge = substr($line, 2);
-                }
-                else {
-                    return $this->parseResult($line);
-                }
-
-                // check response
-                $challenge = base64_decode($challenge);
-                if (strpos($challenge, 'rspauth=') === false) {
-                    $this->setError(self::ERROR_BAD,
-                        "Unexpected response from server to DIGEST-MD5 response");
-                    return self::ERROR_BAD;
-                }
-
-                $this->putLine('');
-            }
-
-            $line = $this->readReply();
-            $result = $this->parseResult($line);
-        }
-        else { // PLAIN
-            // proxy authorization
-            if (!empty($this->prefs['auth_cid'])) {
-                $authc = $this->prefs['auth_cid'];
-                $pass  = $this->prefs['auth_pw'];
-            }
-            else {
-                $authc = $user;
-                $user  = '';
-            }
-
-            $reply = base64_encode($user . chr(0) . $authc . chr(0) . $pass);
-
-            // RFC 4959 (SASL-IR): save one round trip
-            if ($this->getCapability('SASL-IR')) {
-                list($result, $line) = $this->execute("AUTHENTICATE PLAIN", array($reply),
-                    self::COMMAND_LASTLINE | self::COMMAND_CAPABILITY);
-            }
-            else {
-                $this->putLine($this->nextTag() . " AUTHENTICATE PLAIN");
-                $line = trim($this->readReply());
-
-                if ($line[0] != '+') {
-                    return $this->parseResult($line);
-                }
-
-                // send result, get reply and process it
-                $this->putLine($reply);
-                $line = $this->readReply();
-                $result = $this->parseResult($line);
-            }
-        }
-
-        if ($result == self::ERROR_OK) {
-            // optional CAPABILITY response
-            if ($line && preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
-                $this->parseCapability($matches[1], true);
-            }
-            return $this->fp;
-        }
-        else {
-            $this->setError($result, "AUTHENTICATE $type: $line");
-        }
-
-        return $result;
-    }
-
-    /**
-     * LOGIN Authentication
-     *
-     * @param string $user
-     * @param string $pass
-     *
-     * @return resource Connection resourse on success, error code on error
-     */
-    function login($user, $password)
-    {
-        list($code, $response) = $this->execute('LOGIN', array(
-            $this->escape($user), $this->escape($password)), self::COMMAND_CAPABILITY);
-
-        // re-set capabilities list if untagged CAPABILITY response provided
-        if (preg_match('/\* CAPABILITY (.+)/i', $response, $matches)) {
-            $this->parseCapability($matches[1], true);
-        }
-
-        if ($code == self::ERROR_OK) {
-            return $this->fp;
-        }
-
-        return $code;
-    }
-
-    /**
-     * Detects hierarchy delimiter
-     *
-     * @return string The delimiter
-     */
-    function getHierarchyDelimiter()
-    {
-        if ($this->prefs['delimiter']) {
-            return $this->prefs['delimiter'];
-        }
-
-        // try (LIST "" ""), should return delimiter (RFC2060 Sec 6.3.8)
-        list($code, $response) = $this->execute('LIST',
-            array($this->escape(''), $this->escape('')));
-
-        if ($code == self::ERROR_OK) {
-            $args = $this->tokenizeResponse($response, 4);
-            $delimiter = $args[3];
-
-            if (strlen($delimiter) > 0) {
-                return ($this->prefs['delimiter'] = $delimiter);
-            }
-        }
-
-        return NULL;
-    }
-
-    /**
-     * NAMESPACE handler (RFC 2342)
-     *
-     * @return array Namespace data hash (personal, other, shared)
-     */
-    function getNamespace()
-    {
-        if (array_key_exists('namespace', $this->prefs)) {
-            return $this->prefs['namespace'];
-        }
-
-        if (!$this->getCapability('NAMESPACE')) {
-            return self::ERROR_BAD;
-        }
-
-        list($code, $response) = $this->execute('NAMESPACE');
-
-        if ($code == self::ERROR_OK && preg_match('/^\* NAMESPACE /', $response)) {
-            $data = $this->tokenizeResponse(substr($response, 11));
-        }
-
-        if (!is_array($data)) {
-            return $code;
-        }
-
-        $this->prefs['namespace'] = array(
-            'personal' => $data[0],
-            'other'    => $data[1],
-            'shared'   => $data[2],
-        );
-
-        return $this->prefs['namespace'];
-    }
-
-    /**
-     * Connects to IMAP server and authenticates.
-     *
-     * @param string $host      Server hostname or IP
-     * @param string $user      User name
-     * @param string $password  Password
-     * @param array  $options   Connection and class options
-     *
-     * @return bool True on success, False on failure
-     */
-    function connect($host, $user, $password, $options=null)
-    {
-        // configure
-        $this->set_prefs($options);
-
-        $auth_method = $this->prefs['auth_type'];
-        $result      = false;
-
-        // initialize connection
-        $this->error    = '';
-        $this->errornum = self::ERROR_OK;
-        $this->selected = null;
-        $this->user     = $user;
-        $this->host     = $host;
-        $this->logged   = false;
-
-        // check input
-        if (empty($host)) {
-            $this->setError(self::ERROR_BAD, "Empty host");
-            return false;
-        }
-        if (empty($user)) {
-            $this->setError(self::ERROR_NO, "Empty user");
-            return false;
-        }
-        if (empty($password)) {
-            $this->setError(self::ERROR_NO, "Empty password");
-            return false;
-        }
-
-        if (!$this->prefs['port']) {
-            $this->prefs['port'] = 143;
-        }
-        // check for SSL
-        if ($this->prefs['ssl_mode'] && $this->prefs['ssl_mode'] != 'tls') {
-            $host = $this->prefs['ssl_mode'] . '://' . $host;
-        }
-
-        if ($this->prefs['timeout'] <= 0) {
-            $this->prefs['timeout'] = max(0, intval(ini_get('default_socket_timeout')));
-        }
-
-        // Connect
-        $this->fp = @fsockopen($host, $this->prefs['port'], $errno, $errstr, $this->prefs['timeout']);
-
-        if (!$this->fp) {
-            if (!$errstr) {
-                $errstr = "Unknown reason (fsockopen() function disabled?)";
-            }
-            $this->setError(self::ERROR_BAD, sprintf("Could not connect to %s:%d: %s", $host, $this->prefs['port'], $errstr));
-            return false;
-        }
-
-        if ($this->prefs['timeout'] > 0) {
-            stream_set_timeout($this->fp, $this->prefs['timeout']);
-        }
-
-        $line = trim(fgets($this->fp, 8192));
-
-        if ($this->_debug) {
-            // set connection identifier for debug output
-            preg_match('/#([0-9]+)/', (string)$this->fp, $m);
-            $this->resourceid = strtoupper(substr(md5($m[1].$this->user.microtime()), 0, 4));
-
-            if ($line)
-                $this->debug('S: '. $line);
-        }
-
-        // Connected to wrong port or connection error?
-        if (!preg_match('/^\* (OK|PREAUTH)/i', $line)) {
-            if ($line)
-                $error = sprintf("Wrong startup greeting (%s:%d): %s", $host, $this->prefs['port'], $line);
-            else
-                $error = sprintf("Empty startup greeting (%s:%d)", $host, $this->prefs['port']);
-
-            $this->setError(self::ERROR_BAD, $error);
-            $this->closeConnection();
-            return false;
-        }
-
-        // RFC3501 [7.1] optional CAPABILITY response
-        if (preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
-            $this->parseCapability($matches[1], true);
-        }
-
-        // TLS connection
-        if ($this->prefs['ssl_mode'] == 'tls' && $this->getCapability('STARTTLS')) {
-            $res = $this->execute('STARTTLS');
-
-            if ($res[0] != self::ERROR_OK) {
-                $this->closeConnection();
-                return false;
-            }
-
-            if (!stream_socket_enable_crypto($this->fp, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
-                $this->setError(self::ERROR_BAD, "Unable to negotiate TLS");
-                $this->closeConnection();
-                return false;
-            }
-
-            // Now we're secure, capabilities need to be reread
-            $this->clearCapability();
-        }
-
-        // Send ID info
-        if (!empty($this->prefs['ident']) && $this->getCapability('ID')) {
-            $this->id($this->prefs['ident']);
-        }
-
-        $auth_methods = array();
-        $result       = null;
-
-        // check for supported auth methods
-        if ($auth_method == 'CHECK') {
-            if ($auth_caps = $this->getCapability('AUTH')) {
-                $auth_methods = $auth_caps;
-            }
-            // RFC 2595 (LOGINDISABLED) LOGIN disabled when connection is not secure
-            $login_disabled = $this->getCapability('LOGINDISABLED');
-            if (($key = array_search('LOGIN', $auth_methods)) !== false) {
-                if ($login_disabled) {
-                    unset($auth_methods[$key]);
-                }
-            }
-            else if (!$login_disabled) {
-                $auth_methods[] = 'LOGIN';
-            }
-
-            // Use best (for security) supported authentication method
-            foreach (array('DIGEST-MD5', 'CRAM-MD5', 'CRAM_MD5', 'PLAIN', 'LOGIN') as $auth_method) {
-                if (in_array($auth_method, $auth_methods)) {
-                    break;
-                }
-            }
-        }
-        else {
-            // Prevent from sending credentials in plain text when connection is not secure
-            if ($auth_method == 'LOGIN' && $this->getCapability('LOGINDISABLED')) {
-                $this->setError(self::ERROR_BAD, "Login disabled by IMAP server");
-                $this->closeConnection();
-                return false;
-            }
-            // replace AUTH with CRAM-MD5 for backward compat.
-            if ($auth_method == 'AUTH') {
-                $auth_method = 'CRAM-MD5';
-            }
-        }
-
-        // pre-login capabilities can be not complete
-        $this->capability_readed = false;
-
-        // Authenticate
-        switch ($auth_method) {
-            case 'CRAM_MD5':
-                $auth_method = 'CRAM-MD5';
-            case 'CRAM-MD5':
-            case 'DIGEST-MD5':
-            case 'PLAIN':
-                $result = $this->authenticate($user, $password, $auth_method);
-                break;
-            case 'LOGIN':
-                $result = $this->login($user, $password);
-                break;
-            default:
-                $this->setError(self::ERROR_BAD, "Configuration error. Unknown auth method: $auth_method");
-        }
-
-        // Connected and authenticated
-        if (is_resource($result)) {
-            if ($this->prefs['force_caps']) {
-                $this->clearCapability();
-            }
-            $this->logged = true;
-
-            return true;
-        }
-
-        $this->closeConnection();
-
-        return false;
-    }
-
-    /**
-     * Initializes environment
-     */
-    protected function set_prefs($prefs)
-    {
-        // set preferences
-        if (is_array($prefs)) {
-            $this->prefs = $prefs;
-        }
-
-        // set auth method
-        if (!empty($this->prefs['auth_type'])) {
-            $this->prefs['auth_type'] = strtoupper($this->prefs['auth_type']);
-        }
-        else {
-            $this->prefs['auth_type'] = 'CHECK';
-        }
-
-        // disabled capabilities
-        if (!empty($this->prefs['disabled_caps'])) {
-            $this->prefs['disabled_caps'] = array_map('strtoupper', (array)$this->prefs['disabled_caps']);
-        }
-
-        // additional message flags
-        if (!empty($this->prefs['message_flags'])) {
-            $this->flags = array_merge($this->flags, $this->prefs['message_flags']);
-            unset($this->prefs['message_flags']);
-        }
-    }
-
-    /**
-     * Checks connection status
-     *
-     * @return bool True if connection is active and user is logged in, False otherwise.
-     */
-    function connected()
-    {
-        return ($this->fp && $this->logged) ? true : false;
-    }
-
-    /**
-     * Closes connection with logout.
-     */
-    function closeConnection()
-    {
-        if ($this->logged && $this->putLine($this->nextTag() . ' LOGOUT')) {
-            $this->readReply();
-        }
-
-        $this->closeSocket();
-    }
-
-    /**
-     * Executes SELECT command (if mailbox is already not in selected state)
-     *
-     * @param string $mailbox      Mailbox name
-     * @param array  $qresync_data QRESYNC data (RFC5162)
-     *
-     * @return boolean True on success, false on error
-     */
-    function select($mailbox, $qresync_data = null)
-    {
-        if (!strlen($mailbox)) {
-            return false;
-        }
-
-        if ($this->selected === $mailbox) {
-            return true;
-        }
-/*
-    Temporary commented out because Courier returns \Noselect for INBOX
-    Requires more investigation
-
-        if (is_array($this->data['LIST']) && is_array($opts = $this->data['LIST'][$mailbox])) {
-            if (in_array('\\Noselect', $opts)) {
-                return false;
-            }
-        }
-*/
-        $params = array($this->escape($mailbox));
-
-        // QRESYNC data items
-        //    0. the last known UIDVALIDITY,
-        //    1. the last known modification sequence,
-        //    2. the optional set of known UIDs, and
-        //    3. an optional parenthesized list of known sequence ranges and their
-        //       corresponding UIDs.
-        if (!empty($qresync_data)) {
-            if (!empty($qresync_data[2]))
-                $qresync_data[2] = self::compressMessageSet($qresync_data[2]);
-            $params[] = array('QRESYNC', $qresync_data);
-        }
-
-        list($code, $response) = $this->execute('SELECT', $params);
-
-        if ($code == self::ERROR_OK) {
-            $response = explode("\r\n", $response);
-            foreach ($response as $line) {
-                if (preg_match('/^\* ([0-9]+) (EXISTS|RECENT)$/i', $line, $m)) {
-                    $this->data[strtoupper($m[2])] = (int) $m[1];
-                }
-                else if (preg_match('/^\* OK \[/i', $line, $match)) {
-                    $line = substr($line, 6);
-                    if (preg_match('/^(UIDNEXT|UIDVALIDITY|UNSEEN) ([0-9]+)/i', $line, $match)) {
-                        $this->data[strtoupper($match[1])] = (int) $match[2];
-                    }
-                    else if (preg_match('/^(HIGHESTMODSEQ) ([0-9]+)/i', $line, $match)) {
-                        $this->data[strtoupper($match[1])] = (string) $match[2];
-                    }
-                    else if (preg_match('/^(NOMODSEQ)/i', $line, $match)) {
-                        $this->data[strtoupper($match[1])] = true;
-                    }
-                    else if (preg_match('/^PERMANENTFLAGS \(([^\)]+)\)/iU', $line, $match)) {
-                        $this->data['PERMANENTFLAGS'] = explode(' ', $match[1]);
-                    }
-                }
-                // QRESYNC FETCH response (RFC5162)
-                else if (preg_match('/^\* ([0-9+]) FETCH/i', $line, $match)) {
-                    $line       = substr($line, strlen($match[0]));
-                    $fetch_data = $this->tokenizeResponse($line, 1);
-                    $data       = array('id' => $match[1]);
-
-                    for ($i=0, $size=count($fetch_data); $i<$size; $i+=2) {
-                        $data[strtolower($fetch_data[$i])] = $fetch_data[$i+1];
-                    }
-
-                    $this->data['QRESYNC'][$data['uid']] = $data;
-                }
-                // QRESYNC VANISHED response (RFC5162)
-                else if (preg_match('/^\* VANISHED [()EARLIER]*/i', $line, $match)) {
-                    $line   = substr($line, strlen($match[0]));
-                    $v_data = $this->tokenizeResponse($line, 1);
-
-                    $this->data['VANISHED'] = $v_data;
-                }
-            }
-
-            $this->data['READ-WRITE'] = $this->resultcode != 'READ-ONLY';
-
-            $this->selected = $mailbox;
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Executes STATUS command
-     *
-     * @param string $mailbox Mailbox name
-     * @param array  $items   Additional requested item names. By default
-     *                        MESSAGES and UNSEEN are requested. Other defined
-     *                        in RFC3501: UIDNEXT, UIDVALIDITY, RECENT
-     *
-     * @return array Status item-value hash
-     * @since 0.5-beta
-     */
-    function status($mailbox, $items=array())
-    {
-        if (!strlen($mailbox)) {
-            return false;
-        }
-
-        if (!in_array('MESSAGES', $items)) {
-            $items[] = 'MESSAGES';
-        }
-        if (!in_array('UNSEEN', $items)) {
-            $items[] = 'UNSEEN';
-        }
-
-        list($code, $response) = $this->execute('STATUS', array($this->escape($mailbox),
-            '(' . implode(' ', (array) $items) . ')'));
-
-        if ($code == self::ERROR_OK && preg_match('/\* STATUS /i', $response)) {
-            $result   = array();
-            $response = substr($response, 9); // remove prefix "* STATUS "
-
-            list($mbox, $items) = $this->tokenizeResponse($response, 2);
-
-            // Fix for #1487859. Some buggy server returns not quoted
-            // folder name with spaces. Let's try to handle this situation
-            if (!is_array($items) && ($pos = strpos($response, '(')) !== false) {
-                $response = substr($response, $pos);
-                $items = $this->tokenizeResponse($response, 1);
-                if (!is_array($items)) {
-                    return $result;
-                }
-            }
-
-            for ($i=0, $len=count($items); $i<$len; $i += 2) {
-                $result[$items[$i]] = $items[$i+1];
-            }
-
-            $this->data['STATUS:'.$mailbox] = $result;
-
-            return $result;
-        }
-
-        return false;
-    }
-
-    /**
-     * Executes EXPUNGE command
-     *
-     * @param string       $mailbox  Mailbox name
-     * @param string|array $messages Message UIDs to expunge
-     *
-     * @return boolean True on success, False on error
-     */
-    function expunge($mailbox, $messages=NULL)
-    {
-        if (!$this->select($mailbox)) {
-            return false;
-        }
-
-        if (!$this->data['READ-WRITE']) {
-            $this->setError(self::ERROR_READONLY, "Mailbox is read-only");
-            return false;
-        }
-
-        // Clear internal status cache
-        unset($this->data['STATUS:'.$mailbox]);
-
-        if (!empty($messages) && $messages != '*' && $this->hasCapability('UIDPLUS')) {
-            $messages = self::compressMessageSet($messages);
-            $result   = $this->execute('UID EXPUNGE', array($messages), self::COMMAND_NORESPONSE);
-        }
-        else {
-            $result = $this->execute('EXPUNGE', null, self::COMMAND_NORESPONSE);
-        }
-
-        if ($result == self::ERROR_OK) {
-            $this->selected = null; // state has changed, need to reselect
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Executes CLOSE command
-     *
-     * @return boolean True on success, False on error
-     * @since 0.5
-     */
-    function close()
-    {
-        $result = $this->execute('CLOSE', NULL, self::COMMAND_NORESPONSE);
-
-        if ($result == self::ERROR_OK) {
-            $this->selected = null;
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Folder subscription (SUBSCRIBE)
-     *
-     * @param string $mailbox Mailbox name
-     *
-     * @return boolean True on success, False on error
-     */
-    function subscribe($mailbox)
-    {
-        $result = $this->execute('SUBSCRIBE', array($this->escape($mailbox)),
-            self::COMMAND_NORESPONSE);
-
-        return ($result == self::ERROR_OK);
-    }
-
-    /**
-     * Folder unsubscription (UNSUBSCRIBE)
-     *
-     * @param string $mailbox Mailbox name
-     *
-     * @return boolean True on success, False on error
-     */
-    function unsubscribe($mailbox)
-    {
-        $result = $this->execute('UNSUBSCRIBE', array($this->escape($mailbox)),
-            self::COMMAND_NORESPONSE);
-
-        return ($result == self::ERROR_OK);
-    }
-
-    /**
-     * Folder creation (CREATE)
-     *
-     * @param string $mailbox Mailbox name
-     *
-     * @return bool True on success, False on error
-     */
-    function createFolder($mailbox)
-    {
-        $result = $this->execute('CREATE', array($this->escape($mailbox)),
-            self::COMMAND_NORESPONSE);
-
-        return ($result == self::ERROR_OK);
-    }
-
-    /**
-     * Folder renaming (RENAME)
-     *
-     * @param string $mailbox Mailbox name
-     *
-     * @return bool True on success, False on error
-     */
-    function renameFolder($from, $to)
-    {
-        $result = $this->execute('RENAME', array($this->escape($from), $this->escape($to)),
-            self::COMMAND_NORESPONSE);
-
-        return ($result == self::ERROR_OK);
-    }
-
-    /**
-     * Executes DELETE command
-     *
-     * @param string $mailbox Mailbox name
-     *
-     * @return boolean True on success, False on error
-     */
-    function deleteFolder($mailbox)
-    {
-        $result = $this->execute('DELETE', array($this->escape($mailbox)),
-            self::COMMAND_NORESPONSE);
-
-        return ($result == self::ERROR_OK);
-    }
-
-    /**
-     * Removes all messages in a folder
-     *
-     * @param string $mailbox Mailbox name
-     *
-     * @return boolean True on success, False on error
-     */
-    function clearFolder($mailbox)
-    {
-        $num_in_trash = $this->countMessages($mailbox);
-        if ($num_in_trash > 0) {
-            $res = $this->flag($mailbox, '1:*', 'DELETED');
-        }
-
-        if ($res) {
-            if ($this->selected === $mailbox)
-                $res = $this->close();
-            else
-                $res = $this->expunge($mailbox);
-        }
-
-        return $res;
-    }
-
-    /**
-     * Returns list of mailboxes
-     *
-     * @param string $ref         Reference name
-     * @param string $mailbox     Mailbox name
-     * @param array  $status_opts (see self::_listMailboxes)
-     * @param array  $select_opts (see self::_listMailboxes)
-     *
-     * @return array List of mailboxes or hash of options if $status_opts argument
-     *               is non-empty.
-     */
-    function listMailboxes($ref, $mailbox, $status_opts=array(), $select_opts=array())
-    {
-        return $this->_listMailboxes($ref, $mailbox, false, $status_opts, $select_opts);
-    }
-
-    /**
-     * Returns list of subscribed mailboxes
-     *
-     * @param string $ref         Reference name
-     * @param string $mailbox     Mailbox name
-     * @param array  $status_opts (see self::_listMailboxes)
-     *
-     * @return array List of mailboxes or hash of options if $status_opts argument
-     *               is non-empty.
-     */
-    function listSubscribed($ref, $mailbox, $status_opts=array())
-    {
-        return $this->_listMailboxes($ref, $mailbox, true, $status_opts, NULL);
-    }
-
-    /**
-     * IMAP LIST/LSUB command
-     *
-     * @param string $ref         Reference name
-     * @param string $mailbox     Mailbox name
-     * @param bool   $subscribed  Enables returning subscribed mailboxes only
-     * @param array  $status_opts List of STATUS options (RFC5819: LIST-STATUS)
-     *                            Possible: MESSAGES, RECENT, UIDNEXT, UIDVALIDITY, UNSEEN
-     * @param array  $select_opts List of selection options (RFC5258: LIST-EXTENDED)
-     *                            Possible: SUBSCRIBED, RECURSIVEMATCH, REMOTE
-     *
-     * @return array List of mailboxes or hash of options if $status_ops argument
-     *               is non-empty.
-     */
-    private function _listMailboxes($ref, $mailbox, $subscribed=false,
-        $status_opts=array(), $select_opts=array())
-    {
-        if (!strlen($mailbox)) {
-            $mailbox = '*';
-        }
-
-        $args = array();
-
-        if (!empty($select_opts) && $this->getCapability('LIST-EXTENDED')) {
-            $select_opts = (array) $select_opts;
-
-            $args[] = '(' . implode(' ', $select_opts) . ')';
-        }
-
-        $args[] = $this->escape($ref);
-        $args[] = $this->escape($mailbox);
-
-        if (!empty($status_opts) && $this->getCapability('LIST-STATUS')) {
-            $status_opts = (array) $status_opts;
-            $lstatus = true;
-
-            $args[] = 'RETURN (STATUS (' . implode(' ', $status_opts) . '))';
-        }
-
-        list($code, $response) = $this->execute($subscribed ? 'LSUB' : 'LIST', $args);
-
-        if ($code == self::ERROR_OK) {
-            $folders  = array();
-            $last     = 0;
-            $pos      = 0;
-            $response .= "\r\n";
-
-            while ($pos = strpos($response, "\r\n", $pos+1)) {
-                // literal string, not real end-of-command-line
-                if ($response[$pos-1] == '}') {
-                    continue;
-                }
-
-                $line = substr($response, $last, $pos - $last);
-                $last = $pos + 2;
-
-                if (!preg_match('/^\* (LIST|LSUB|STATUS) /i', $line, $m)) {
-                    continue;
-                }
-                $cmd  = strtoupper($m[1]);
-                $line = substr($line, strlen($m[0]));
-
-                // * LIST (<options>) <delimiter> <mailbox>
-                if ($cmd == 'LIST' || $cmd == 'LSUB') {
-                    list($opts, $delim, $mailbox) = $this->tokenizeResponse($line, 3);
-
-                    // Remove redundant separator at the end of folder name, UW-IMAP bug? (#1488879)
-                    if ($delim) {
-                        $mailbox = rtrim($mailbox, $delim);
-                    }
-
-                    // Add to result array
-                    if (!$lstatus) {
-                        $folders[] = $mailbox;
-                    }
-                    else {
-                        $folders[$mailbox] = array();
-                    }
-
-                    // store folder options
-                    if ($cmd == 'LIST') {
-                        // Add to options array
-                        if (empty($this->data['LIST'][$mailbox]))
-                            $this->data['LIST'][$mailbox] = $opts;
-                        else if (!empty($opts))
-                            $this->data['LIST'][$mailbox] = array_unique(array_merge(
-                                $this->data['LIST'][$mailbox], $opts));
-                    }
-                }
-                // * STATUS <mailbox> (<result>)
-                else if ($cmd == 'STATUS') {
-                    list($mailbox, $status) = $this->tokenizeResponse($line, 2);
-
-                    for ($i=0, $len=count($status); $i<$len; $i += 2) {
-                        list($name, $value) = $this->tokenizeResponse($status, 2);
-                        $folders[$mailbox][$name] = $value;
-                    }
-                }
-            }
-
-            return $folders;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns count of all messages in a folder
-     *
-     * @param string $mailbox Mailbox name
-     *
-     * @return int Number of messages, False on error
-     */
-    function countMessages($mailbox, $refresh = false)
-    {
-        if ($refresh) {
-            $this->selected = null;
-        }
-
-        if ($this->selected === $mailbox) {
-            return $this->data['EXISTS'];
-        }
-
-        // Check internal cache
-        $cache = $this->data['STATUS:'.$mailbox];
-        if (!empty($cache) && isset($cache['MESSAGES'])) {
-            return (int) $cache['MESSAGES'];
-        }
-
-        // Try STATUS (should be faster than SELECT)
-        $counts = $this->status($mailbox);
-        if (is_array($counts)) {
-            return (int) $counts['MESSAGES'];
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns count of messages with \Recent flag in a folder
-     *
-     * @param string $mailbox Mailbox name
-     *
-     * @return int Number of messages, False on error
-     */
-    function countRecent($mailbox)
-    {
-        if (!strlen($mailbox)) {
-            $mailbox = 'INBOX';
-        }
-
-        $this->select($mailbox);
-
-        if ($this->selected === $mailbox) {
-            return $this->data['RECENT'];
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns count of messages without \Seen flag in a specified folder
-     *
-     * @param string $mailbox Mailbox name
-     *
-     * @return int Number of messages, False on error
-     */
-    function countUnseen($mailbox)
-    {
-        // Check internal cache
-        $cache = $this->data['STATUS:'.$mailbox];
-        if (!empty($cache) && isset($cache['UNSEEN'])) {
-            return (int) $cache['UNSEEN'];
-        }
-
-        // Try STATUS (should be faster than SELECT+SEARCH)
-        $counts = $this->status($mailbox);
-        if (is_array($counts)) {
-            return (int) $counts['UNSEEN'];
-        }
-
-        // Invoke SEARCH as a fallback
-        $index = $this->search($mailbox, 'ALL UNSEEN', false, array('COUNT'));
-        if (!$index->is_error()) {
-            return $index->count();
-        }
-
-        return false;
-    }
-
-    /**
-     * Executes ID command (RFC2971)
-     *
-     * @param array $items Client identification information key/value hash
-     *
-     * @return array Server identification information key/value hash
-     * @since 0.6
-     */
-    function id($items=array())
-    {
-        if (is_array($items) && !empty($items)) {
-            foreach ($items as $key => $value) {
-                $args[] = $this->escape($key, true);
-                $args[] = $this->escape($value, true);
-            }
-        }
-
-        list($code, $response) = $this->execute('ID', array(
-            !empty($args) ? '(' . implode(' ', (array) $args) . ')' : $this->escape(null)
-        ));
-
-
-        if ($code == self::ERROR_OK && preg_match('/\* ID /i', $response)) {
-            $response = substr($response, 5); // remove prefix "* ID "
-            $items    = $this->tokenizeResponse($response, 1);
-            $result   = null;
-
-            for ($i=0, $len=count($items); $i<$len; $i += 2) {
-                $result[$items[$i]] = $items[$i+1];
-            }
-
-            return $result;
-        }
-
-        return false;
-    }
-
-    /**
-     * Executes ENABLE command (RFC5161)
-     *
-     * @param mixed $extension Extension name to enable (or array of names)
-     *
-     * @return array|bool List of enabled extensions, False on error
-     * @since 0.6
-     */
-    function enable($extension)
-    {
-        if (empty($extension)) {
-            return false;
-        }
-
-        if (!$this->hasCapability('ENABLE')) {
-            return false;
-        }
-
-        if (!is_array($extension)) {
-            $extension = array($extension);
-        }
-
-        if (!empty($this->extensions_enabled)) {
-            // check if all extensions are already enabled
-            $diff = array_diff($extension, $this->extensions_enabled);
-
-            if (empty($diff)) {
-                return $extension;
-            }
-
-            // Make sure the mailbox isn't selected, before enabling extension(s)
-            if ($this->selected !== null) {
-                $this->close();
-            }
-        }
-
-        list($code, $response) = $this->execute('ENABLE', $extension);
-
-        if ($code == self::ERROR_OK && preg_match('/\* ENABLED /i', $response)) {
-            $response = substr($response, 10); // remove prefix "* ENABLED "
-            $result   = (array) $this->tokenizeResponse($response);
-
-            $this->extensions_enabled = array_unique(array_merge((array)$this->extensions_enabled, $result));
-
-            return $this->extensions_enabled;
-        }
-
-        return false;
-    }
-
-    /**
-     * Executes SORT command
-     *
-     * @param string $mailbox    Mailbox name
-     * @param string $field      Field to sort by (ARRIVAL, CC, DATE, FROM, SIZE, SUBJECT, TO)
-     * @param string $add        Searching criteria
-     * @param bool   $return_uid Enables UID SORT usage
-     * @param string $encoding   Character set
-     *
-     * @return rcube_result_index Response data
-     */
-    function sort($mailbox, $field, $add='', $return_uid=false, $encoding = 'US-ASCII')
-    {
-        $field = strtoupper($field);
-        if ($field == 'INTERNALDATE') {
-            $field = 'ARRIVAL';
-        }
-
-        $fields = array('ARRIVAL' => 1,'CC' => 1,'DATE' => 1,
-            'FROM' => 1, 'SIZE' => 1, 'SUBJECT' => 1, 'TO' => 1);
-
-        if (!$fields[$field]) {
-            return new rcube_result_index($mailbox);
-        }
-
-        if (!$this->select($mailbox)) {
-            return new rcube_result_index($mailbox);
-        }
-
-        // RFC 5957: SORT=DISPLAY
-        if (($field == 'FROM' || $field == 'TO') && $this->getCapability('SORT=DISPLAY')) {
-            $field = 'DISPLAY' . $field;
-        }
-
-        // message IDs
-        if (!empty($add)) {
-            $add = $this->compressMessageSet($add);
-        }
-
-        list($code, $response) = $this->execute($return_uid ? 'UID SORT' : 'SORT',
-            array("($field)", $encoding, !empty($add) ? $add : 'ALL'));
-
-        if ($code != self::ERROR_OK) {
-            $response = null;
-        }
-
-        return new rcube_result_index($mailbox, $response);
-    }
-
-    /**
-     * Executes THREAD command
-     *
-     * @param string $mailbox    Mailbox name
-     * @param string $algorithm  Threading algorithm (ORDEREDSUBJECT, REFERENCES, REFS)
-     * @param string $criteria   Searching criteria
-     * @param bool   $return_uid Enables UIDs in result instead of sequence numbers
-     * @param string $encoding   Character set
-     *
-     * @return rcube_result_thread Thread data
-     */
-    function thread($mailbox, $algorithm='REFERENCES', $criteria='', $return_uid=false, $encoding='US-ASCII')
-    {
-        $old_sel = $this->selected;
-
-        if (!$this->select($mailbox)) {
-            return new rcube_result_thread($mailbox);
-        }
-
-        // return empty result when folder is empty and we're just after SELECT
-        if ($old_sel != $mailbox && !$this->data['EXISTS']) {
-            return new rcube_result_thread($mailbox);
-        }
-
-        $encoding  = $encoding ? trim($encoding) : 'US-ASCII';
-        $algorithm = $algorithm ? trim($algorithm) : 'REFERENCES';
-        $criteria  = $criteria ? 'ALL '.trim($criteria) : 'ALL';
-        $data      = '';
-
-        list($code, $response) = $this->execute($return_uid ? 'UID THREAD' : 'THREAD',
-            array($algorithm, $encoding, $criteria));
-
-        if ($code != self::ERROR_OK) {
-            $response = null;
-        }
-
-        return new rcube_result_thread($mailbox, $response);
-    }
-
-    /**
-     * Executes SEARCH command
-     *
-     * @param string $mailbox    Mailbox name
-     * @param string $criteria   Searching criteria
-     * @param bool   $return_uid Enable UID in result instead of sequence ID
-     * @param array  $items      Return items (MIN, MAX, COUNT, ALL)
-     *
-     * @return rcube_result_index Result data
-     */
-    function search($mailbox, $criteria, $return_uid=false, $items=array())
-    {
-        $old_sel = $this->selected;
-
-        if (!$this->select($mailbox)) {
-            return new rcube_result_index($mailbox);
-        }
-
-        // return empty result when folder is empty and we're just after SELECT
-        if ($old_sel != $mailbox && !$this->data['EXISTS']) {
-            return new rcube_result_index($mailbox, '* SEARCH');
-        }
-
-        // If ESEARCH is supported always use ALL
-        // but not when items are specified or using simple id2uid search
-        if (empty($items) && preg_match('/[^0-9]/', $criteria)) {
-            $items = array('ALL');
-        }
-
-        $esearch  = empty($items) ? false : $this->getCapability('ESEARCH');
-        $criteria = trim($criteria);
-        $params   = '';
-
-        // RFC4731: ESEARCH
-        if (!empty($items) && $esearch) {
-            $params .= 'RETURN (' . implode(' ', $items) . ')';
-        }
-
-        if (!empty($criteria)) {
-            $params .= ($params ? ' ' : '') . $criteria;
-        }
-        else {
-            $params .= 'ALL';
-        }
-
-        list($code, $response) = $this->execute($return_uid ? 'UID SEARCH' : 'SEARCH',
-            array($params));
-
-        if ($code != self::ERROR_OK) {
-            $response = null;
-        }
-
-        return new rcube_result_index($mailbox, $response);
-    }
-
-    /**
-     * Simulates SORT command by using FETCH and sorting.
-     *
-     * @param string       $mailbox      Mailbox name
-     * @param string|array $message_set  Searching criteria (list of messages to return)
-     * @param string       $index_field  Field to sort by (ARRIVAL, CC, DATE, FROM, SIZE, SUBJECT, TO)
-     * @param bool         $skip_deleted Makes that DELETED messages will be skipped
-     * @param bool         $uidfetch     Enables UID FETCH usage
-     * @param bool         $return_uid   Enables returning UIDs instead of IDs
-     *
-     * @return rcube_result_index Response data
-     */
-    function index($mailbox, $message_set, $index_field='', $skip_deleted=true,
-        $uidfetch=false, $return_uid=false)
-    {
-        $msg_index = $this->fetchHeaderIndex($mailbox, $message_set,
-            $index_field, $skip_deleted, $uidfetch, $return_uid);
-
-        if (!empty($msg_index)) {
-            asort($msg_index); // ASC
-            $msg_index = array_keys($msg_index);
-            $msg_index = '* SEARCH ' . implode(' ', $msg_index);
-        }
-        else {
-            $msg_index = is_array($msg_index) ? '* SEARCH' : null;
-        }
-
-        return new rcube_result_index($mailbox, $msg_index);
-    }
-
-    function fetchHeaderIndex($mailbox, $message_set, $index_field='', $skip_deleted=true,
-        $uidfetch=false, $return_uid=false)
-    {
-        if (is_array($message_set)) {
-            if (!($message_set = $this->compressMessageSet($message_set)))
-                return false;
-        } else {
-            list($from_idx, $to_idx) = explode(':', $message_set);
-            if (empty($message_set) ||
-                (isset($to_idx) && $to_idx != '*' && (int)$from_idx > (int)$to_idx)) {
-                return false;
-            }
-        }
-
-        $index_field = empty($index_field) ? 'DATE' : strtoupper($index_field);
-
-        $fields_a['DATE']         = 1;
-        $fields_a['INTERNALDATE'] = 4;
-        $fields_a['ARRIVAL']      = 4;
-        $fields_a['FROM']         = 1;
-        $fields_a['REPLY-TO']     = 1;
-        $fields_a['SENDER']       = 1;
-        $fields_a['TO']           = 1;
-        $fields_a['CC']           = 1;
-        $fields_a['SUBJECT']      = 1;
-        $fields_a['UID']          = 2;
-        $fields_a['SIZE']         = 2;
-        $fields_a['SEEN']         = 3;
-        $fields_a['RECENT']       = 3;
-        $fields_a['DELETED']      = 3;
-
-        if (!($mode = $fields_a[$index_field])) {
-            return false;
-        }
-
-        /*  Do "SELECT" command */
-        if (!$this->select($mailbox)) {
-            return false;
-        }
-
-        // build FETCH command string
-        $key    = $this->nextTag();
-        $cmd    = $uidfetch ? 'UID FETCH' : 'FETCH';
-        $fields = array();
-
-        if ($return_uid)
-            $fields[] = 'UID';
-        if ($skip_deleted)
-            $fields[] = 'FLAGS';
-
-        if ($mode == 1) {
-            if ($index_field == 'DATE')
-                $fields[] = 'INTERNALDATE';
-            $fields[] = "BODY.PEEK[HEADER.FIELDS ($index_field)]";
-        }
-        else if ($mode == 2) {
-            if ($index_field == 'SIZE')
-                $fields[] = 'RFC822.SIZE';
-            else if (!$return_uid || $index_field != 'UID')
-                $fields[] = $index_field;
-        }
-        else if ($mode == 3 && !$skip_deleted)
-            $fields[] = 'FLAGS';
-        else if ($mode == 4)
-            $fields[] = 'INTERNALDATE';
-
-        $request = "$key $cmd $message_set (" . implode(' ', $fields) . ")";
-
-        if (!$this->putLine($request)) {
-            $this->setError(self::ERROR_COMMAND, "Unable to send command: $request");
-            return false;
-        }
-
-        $result = array();
-
-        do {
-            $line = rtrim($this->readLine(200));
-            $line = $this->multLine($line);
-
-            if (preg_match('/^\* ([0-9]+) FETCH/', $line, $m)) {
-                $id     = $m[1];
-                $flags  = NULL;
-
-                if ($return_uid) {
-                    if (preg_match('/UID ([0-9]+)/', $line, $matches))
-                        $id = (int) $matches[1];
-                    else
-                        continue;
-                }
-                if ($skip_deleted && preg_match('/FLAGS \(([^)]+)\)/', $line, $matches)) {
-                    $flags = explode(' ', strtoupper($matches[1]));
-                    if (in_array('\\DELETED', $flags)) {
-                        continue;
-                    }
-                }
-
-                if ($mode == 1 && $index_field == 'DATE') {
-                    if (preg_match('/BODY\[HEADER\.FIELDS \("*DATE"*\)\] (.*)/', $line, $matches)) {
-                        $value = preg_replace(array('/^"*[a-z]+:/i'), '', $matches[1]);
-                        $value = trim($value);
-                        $result[$id] = $this->strToTime($value);
-                    }
-                    // non-existent/empty Date: header, use INTERNALDATE
-                    if (empty($result[$id])) {
-                        if (preg_match('/INTERNALDATE "([^"]+)"/', $line, $matches))
-                            $result[$id] = $this->strToTime($matches[1]);
-                        else
-                            $result[$id] = 0;
-                    }
-                } else if ($mode == 1) {
-                    if (preg_match('/BODY\[HEADER\.FIELDS \("?(FROM|REPLY-TO|SENDER|TO|SUBJECT)"?\)\] (.*)/', $line, $matches)) {
-                        $value = preg_replace(array('/^"*[a-z]+:/i', '/\s+$/sm'), array('', ''), $matches[2]);
-                        $result[$id] = trim($value);
-                    } else {
-                        $result[$id] = '';
-                    }
-                } else if ($mode == 2) {
-                    if (preg_match('/(UID|RFC822\.SIZE) ([0-9]+)/', $line, $matches)) {
-                        $result[$id] = trim($matches[2]);
-                    } else {
-                        $result[$id] = 0;
-                    }
-                } else if ($mode == 3) {
-                    if (!$flags && preg_match('/FLAGS \(([^)]+)\)/', $line, $matches)) {
-                        $flags = explode(' ', $matches[1]);
-                    }
-                    $result[$id] = in_array('\\'.$index_field, $flags) ? 1 : 0;
-                } else if ($mode == 4) {
-                    if (preg_match('/INTERNALDATE "([^"]+)"/', $line, $matches)) {
-                        $result[$id] = $this->strToTime($matches[1]);
-                    } else {
-                        $result[$id] = 0;
-                    }
-                }
-            }
-        } while (!$this->startsWith($line, $key, true, true));
-
-        return $result;
-    }
-
-    /**
-     * Returns message sequence identifier
-     *
-     * @param string $mailbox Mailbox name
-     * @param int    $uid     Message unique identifier (UID)
-     *
-     * @return int Message sequence identifier
-     */
-    function UID2ID($mailbox, $uid)
-    {
-        if ($uid > 0) {
-            $index = $this->search($mailbox, "UID $uid");
-
-            if ($index->count() == 1) {
-                $arr = $index->get();
-                return (int) $arr[0];
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns message unique identifier (UID)
-     *
-     * @param string $mailbox Mailbox name
-     * @param int    $uid     Message sequence identifier
-     *
-     * @return int Message unique identifier
-     */
-    function ID2UID($mailbox, $id)
-    {
-        if (empty($id) || $id < 0) {
-            return null;
-        }
-
-        if (!$this->select($mailbox)) {
-            return null;
-        }
-
-        $index = $this->search($mailbox, $id, true);
-
-        if ($index->count() == 1) {
-            $arr = $index->get();
-            return (int) $arr[0];
-        }
-
-        return null;
-    }
-
-    /**
-     * Sets flag of the message(s)
-     *
-     * @param string        $mailbox   Mailbox name
-     * @param string|array  $messages  Message UID(s)
-     * @param string        $flag      Flag name
-     *
-     * @return bool True on success, False on failure
-     */
-    function flag($mailbox, $messages, $flag) {
-        return $this->modFlag($mailbox, $messages, $flag, '+');
-    }
-
-    /**
-     * Unsets flag of the message(s)
-     *
-     * @param string        $mailbox   Mailbox name
-     * @param string|array  $messages  Message UID(s)
-     * @param string        $flag      Flag name
-     *
-     * @return bool True on success, False on failure
-     */
-    function unflag($mailbox, $messages, $flag) {
-        return $this->modFlag($mailbox, $messages, $flag, '-');
-    }
-
-    /**
-     * Changes flag of the message(s)
-     *
-     * @param string        $mailbox   Mailbox name
-     * @param string|array  $messages  Message UID(s)
-     * @param string        $flag      Flag name
-     * @param string        $mod       Modifier [+|-]. Default: "+".
-     *
-     * @return bool True on success, False on failure
-     */
-    private function modFlag($mailbox, $messages, $flag, $mod = '+')
-    {
-        if ($mod != '+' && $mod != '-') {
-            $mod = '+';
-        }
-
-        if (!$this->select($mailbox)) {
-            return false;
-        }
-
-        if (!$this->data['READ-WRITE']) {
-            $this->setError(self::ERROR_READONLY, "Mailbox is read-only");
-            return false;
-        }
-
-        // Clear internal status cache
-        if ($flag == 'SEEN') {
-            unset($this->data['STATUS:'.$mailbox]['UNSEEN']);
-        }
-
-        $flag   = $this->flags[strtoupper($flag)];
-        $result = $this->execute('UID STORE', array(
-            $this->compressMessageSet($messages), $mod . 'FLAGS.SILENT', "($flag)"),
-            self::COMMAND_NORESPONSE);
-
-        return ($result == self::ERROR_OK);
-    }
-
-    /**
-     * Copies message(s) from one folder to another
-     *
-     * @param string|array  $messages  Message UID(s)
-     * @param string        $from      Mailbox name
-     * @param string        $to        Destination mailbox name
-     *
-     * @return bool True on success, False on failure
-     */
-    function copy($messages, $from, $to)
-    {
-        // Clear last COPYUID data
-        unset($this->data['COPYUID']);
-
-        if (!$this->select($from)) {
-            return false;
-        }
-
-        // Clear internal status cache
-        unset($this->data['STATUS:'.$to]);
-
-        $result = $this->execute('UID COPY', array(
-            $this->compressMessageSet($messages), $this->escape($to)),
-            self::COMMAND_NORESPONSE);
-
-        return ($result == self::ERROR_OK);
-    }
-
-    /**
-     * Moves message(s) from one folder to another.
-     *
-     * @param string|array  $messages  Message UID(s)
-     * @param string        $from      Mailbox name
-     * @param string        $to        Destination mailbox name
-     *
-     * @return bool True on success, False on failure
-     */
-    function move($messages, $from, $to)
-    {
-        if (!$this->select($from)) {
-            return false;
-        }
-
-        if (!$this->data['READ-WRITE']) {
-            $this->setError(self::ERROR_READONLY, "Mailbox is read-only");
-            return false;
-        }
-
-        // use MOVE command (RFC 6851)
-        if ($this->hasCapability('MOVE')) {
-            // Clear last COPYUID data
-            unset($this->data['COPYUID']);
-
-            // Clear internal status cache
-            unset($this->data['STATUS:'.$to]);
-            unset($this->data['STATUS:'.$from]);
-
-            $result = $this->execute('UID MOVE', array(
-                $this->compressMessageSet($messages), $this->escape($to)),
-                self::COMMAND_NORESPONSE);
-
-            return ($result == self::ERROR_OK);
-        }
-
-        // use COPY + STORE +FLAGS.SILENT \Deleted + EXPUNGE
-        $result = $this->copy($messages, $from, $to);
-
-        if ($result) {
-            // Clear internal status cache
-            unset($this->data['STATUS:'.$from]);
-
-            $result = $this->flag($from, $messages, 'DELETED');
-
-            if ($messages == '*') {
-                // CLOSE+SELECT should be faster than EXPUNGE
-                $this->close();
-            }
-            else {
-                $this->expunge($from, $messages);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * FETCH command (RFC3501)
-     *
-     * @param string $mailbox     Mailbox name
-     * @param mixed  $message_set Message(s) sequence identifier(s) or UID(s)
-     * @param bool   $is_uid      True if $message_set contains UIDs
-     * @param array  $query_items FETCH command data items
-     * @param string $mod_seq     Modification sequence for CHANGEDSINCE (RFC4551) query
-     * @param bool   $vanished    Enables VANISHED parameter (RFC5162) for CHANGEDSINCE query
-     *
-     * @return array List of rcube_message_header elements, False on error
-     * @since 0.6
-     */
-    function fetch($mailbox, $message_set, $is_uid = false, $query_items = array(),
-        $mod_seq = null, $vanished = false)
-    {
-        if (!$this->select($mailbox)) {
-            return false;
-        }
-
-        $message_set = $this->compressMessageSet($message_set);
-        $result      = array();
-
-        $key      = $this->nextTag();
-        $request  = $key . ($is_uid ? ' UID' : '') . " FETCH $message_set ";
-        $request .= "(" . implode(' ', $query_items) . ")";
-
-        if ($mod_seq !== null && $this->hasCapability('CONDSTORE')) {
-            $request .= " (CHANGEDSINCE $mod_seq" . ($vanished ? " VANISHED" : '') .")";
-        }
-
-        if (!$this->putLine($request)) {
-            $this->setError(self::ERROR_COMMAND, "Unable to send command: $request");
-            return false;
-        }
-
-        do {
-            $line = $this->readLine(4096);
-
-            if (!$line)
-                break;
-
-            // Sample reply line:
-            // * 321 FETCH (UID 2417 RFC822.SIZE 2730 FLAGS (\Seen)
-            // INTERNALDATE "16-Nov-2008 21:08:46 +0100" BODYSTRUCTURE (...)
-            // BODY[HEADER.FIELDS ...
-
-            if (preg_match('/^\* ([0-9]+) FETCH/', $line, $m)) {
-                $id = intval($m[1]);
-
-                $result[$id]            = new rcube_message_header;
-                $result[$id]->id        = $id;
-                $result[$id]->subject   = '';
-                $result[$id]->messageID = 'mid:' . $id;
-
-                $headers = null;
-                $lines   = array();
-                $line    = substr($line, strlen($m[0]) + 2);
-                $ln      = 0;
-
-                // get complete entry
-                while (preg_match('/\{([0-9]+)\}\r\n$/', $line, $m)) {
-                    $bytes = $m[1];
-                    $out   = '';
-
-                    while (strlen($out) < $bytes) {
-                        $out = $this->readBytes($bytes);
-                        if ($out === NULL)
-                            break;
-                        $line .= $out;
-                    }
-
-                    $str = $this->readLine(4096);
-                    if ($str === false)
-                        break;
-
-                    $line .= $str;
-                }
-
-                // Tokenize response and assign to object properties
-                while (list($name, $value) = $this->tokenizeResponse($line, 2)) {
-                    if ($name == 'UID') {
-                        $result[$id]->uid = intval($value);
-                    }
-                    else if ($name == 'RFC822.SIZE') {
-                        $result[$id]->size = intval($value);
-                    }
-                    else if ($name == 'RFC822.TEXT') {
-                        $result[$id]->body = $value;
-                    }
-                    else if ($name == 'INTERNALDATE') {
-                        $result[$id]->internaldate = $value;
-                        $result[$id]->date         = $value;
-                        $result[$id]->timestamp    = $this->StrToTime($value);
-                    }
-                    else if ($name == 'FLAGS') {
-                        if (!empty($value)) {
-                            foreach ((array)$value as $flag) {
-                                $flag = str_replace(array('$', '\\'), '', $flag);
-                                $flag = strtoupper($flag);
-
-                                $result[$id]->flags[$flag] = true;
-                            }
-                        }
-                    }
-                    else if ($name == 'MODSEQ') {
-                        $result[$id]->modseq = $value[0];
-                    }
-                    else if ($name == 'ENVELOPE') {
-                        $result[$id]->envelope = $value;
-                    }
-                    else if ($name == 'BODYSTRUCTURE' || ($name == 'BODY' && count($value) > 2)) {
-                        if (!is_array($value[0]) && (strtolower($value[0]) == 'message' && strtolower($value[1]) == 'rfc822')) {
-                            $value = array($value);
-                        }
-                        $result[$id]->bodystructure = $value;
-                    }
-                    else if ($name == 'RFC822') {
-                        $result[$id]->body = $value;
-                    }
-                    else if (stripos($name, 'BODY[') === 0) {
-                        $name = str_replace(']', '', substr($name, 5));
-
-                        if ($name == 'HEADER.FIELDS') {
-                            // skip ']' after headers list
-                            $this->tokenizeResponse($line, 1);
-                            $headers = $this->tokenizeResponse($line, 1);
-                        }
-                        else if (strlen($name))
-                            $result[$id]->bodypart[$name] = $value;
-                        else
-                            $result[$id]->body = $value;
-                    }
-                }
-
-                // create array with header field:data
-                if (!empty($headers)) {
-                    $headers = explode("\n", trim($headers));
-                    foreach ($headers as $resln) {
-                        if (ord($resln[0]) <= 32) {
-                            $lines[$ln] .= (empty($lines[$ln]) ? '' : "\n") . trim($resln);
-                        } else {
-                            $lines[++$ln] = trim($resln);
-                        }
-                    }
-
-                    foreach ($lines as $str) {
-                        list($field, $string) = explode(':', $str, 2);
-
-                        $field  = strtolower($field);
-                        $string = preg_replace('/\n[\t\s]*/', ' ', trim($string));
-
-                        switch ($field) {
-                        case 'date';
-                            $result[$id]->date = $string;
-                            $result[$id]->timestamp = $this->strToTime($string);
-                            break;
-                        case 'from':
-                            $result[$id]->from = $string;
-                            break;
-                        case 'to':
-                            $result[$id]->to = preg_replace('/undisclosed-recipients:[;,]*/', '', $string);
-                            break;
-                        case 'subject':
-                            $result[$id]->subject = $string;
-                            break;
-                        case 'reply-to':
-                            $result[$id]->replyto = $string;
-                            break;
-                        case 'cc':
-                            $result[$id]->cc = $string;
-                            break;
-                        case 'bcc':
-                            $result[$id]->bcc = $string;
-                            break;
-                        case 'content-transfer-encoding':
-                            $result[$id]->encoding = $string;
-                        break;
-                        case 'content-type':
-                            $ctype_parts = preg_split('/[; ]+/', $string);
-                            $result[$id]->ctype = strtolower(array_shift($ctype_parts));
-                            if (preg_match('/charset\s*=\s*"?([a-z0-9\-\.\_]+)"?/i', $string, $regs)) {
-                                $result[$id]->charset = $regs[1];
-                            }
-                            break;
-                        case 'in-reply-to':
-                            $result[$id]->in_reply_to = str_replace(array("\n", '<', '>'), '', $string);
-                            break;
-                        case 'references':
-                            $result[$id]->references = $string;
-                            break;
-                        case 'return-receipt-to':
-                        case 'disposition-notification-to':
-                        case 'x-confirm-reading-to':
-                            $result[$id]->mdn_to = $string;
-                            break;
-                        case 'message-id':
-                            $result[$id]->messageID = $string;
-                            break;
-                        case 'x-priority':
-                            if (preg_match('/^(\d+)/', $string, $matches)) {
-                                $result[$id]->priority = intval($matches[1]);
-                            }
-                            break;
-                        default:
-                            if (strlen($field) < 3) {
-                                break;
-                            }
-                            if ($result[$id]->others[$field]) {
-                                $string = array_merge((array)$result[$id]->others[$field], (array)$string);
-                            }
-                            $result[$id]->others[$field] = $string;
-                        }
-                    }
-                }
-            }
-
-            // VANISHED response (QRESYNC RFC5162)
-            // Sample: * VANISHED (EARLIER) 300:310,405,411
-            else if (preg_match('/^\* VANISHED [()EARLIER]*/i', $line, $match)) {
-                $line   = substr($line, strlen($match[0]));
-                $v_data = $this->tokenizeResponse($line, 1);
-
-                $this->data['VANISHED'] = $v_data;
-            }
-
-        } while (!$this->startsWith($line, $key, true));
-
-        return $result;
-    }
-
-    /**
-     * Returns message(s) data (flags, headers, etc.)
-     *
-     * @param string $mailbox     Mailbox name
-     * @param mixed  $message_set Message(s) sequence identifier(s) or UID(s)
-     * @param bool   $is_uid      True if $message_set contains UIDs
-     * @param bool   $bodystr     Enable to add BODYSTRUCTURE data to the result
-     * @param array  $add_headers List of additional headers
-     *
-     * @return bool|array List of rcube_message_header elements, False on error
-     */
-    function fetchHeaders($mailbox, $message_set, $is_uid = false, $bodystr = false, $add_headers = array())
-    {
-        $query_items = array('UID', 'RFC822.SIZE', 'FLAGS', 'INTERNALDATE');
-        $headers     = array('DATE', 'FROM', 'TO', 'SUBJECT', 'CONTENT-TYPE', 'CC', 'REPLY-TO',
-            'LIST-POST', 'DISPOSITION-NOTIFICATION-TO', 'X-PRIORITY');
-
-        if (!empty($add_headers)) {
-            $add_headers = array_map('strtoupper', $add_headers);
-            $headers     = array_unique(array_merge($headers, $add_headers));
-        }
-
-        if ($bodystr) {
-            $query_items[] = 'BODYSTRUCTURE';
-        }
-
-        $query_items[] = 'BODY.PEEK[HEADER.FIELDS (' . implode(' ', $headers) . ')]';
-
-        $result = $this->fetch($mailbox, $message_set, $is_uid, $query_items);
-
-        return $result;
-    }
-
-    /**
-     * Returns message data (flags, headers, etc.)
-     *
-     * @param string $mailbox     Mailbox name
-     * @param int    $id          Message sequence identifier or UID
-     * @param bool   $is_uid      True if $id is an UID
-     * @param bool   $bodystr     Enable to add BODYSTRUCTURE data to the result
-     * @param array  $add_headers List of additional headers
-     *
-     * @return bool|rcube_message_header Message data, False on error
-     */
-    function fetchHeader($mailbox, $id, $is_uid = false, $bodystr = false, $add_headers = array())
-    {
-        $a = $this->fetchHeaders($mailbox, $id, $is_uid, $bodystr, $add_headers);
-        if (is_array($a)) {
-            return array_shift($a);
-        }
-        return false;
-    }
-
-    function sortHeaders($a, $field, $flag)
-    {
-        if (empty($field)) {
-            $field = 'uid';
-        }
-        else {
-            $field = strtolower($field);
-        }
-
-        if ($field == 'date' || $field == 'internaldate') {
-            $field = 'timestamp';
-        }
-
-        if (empty($flag)) {
-            $flag = 'ASC';
-        } else {
-            $flag = strtoupper($flag);
-        }
-
-        $c = count($a);
-        if ($c > 0) {
-            // Strategy:
-            // First, we'll create an "index" array.
-            // Then, we'll use sort() on that array,
-            // and use that to sort the main array.
-
-            // create "index" array
-            $index = array();
-            reset($a);
-            while (list($key, $val) = each($a)) {
-                if ($field == 'timestamp') {
-                    $data = $this->strToTime($val->date);
-                    if (!$data) {
-                        $data = $val->timestamp;
-                    }
-                } else {
-                    $data = $val->$field;
-                    if (is_string($data)) {
-                        $data = str_replace('"', '', $data);
-                        if ($field == 'subject') {
-                            $data = preg_replace('/^(Re: \s*|Fwd:\s*|Fw:\s*)+/i', '', $data);
-                        }
-                        $data = strtoupper($data);
-                    }
-                }
-                $index[$key] = $data;
-            }
-
-            // sort index
-            if ($flag == 'ASC') {
-                asort($index);
-            } else {
-                arsort($index);
-            }
-
-            // form new array based on index
-            $result = array();
-            reset($index);
-            while (list($key, $val) = each($index)) {
-                $result[$key] = $a[$key];
-            }
-        }
-
-        return $result;
-    }
-
-    function fetchMIMEHeaders($mailbox, $uid, $parts, $mime=true)
-    {
-        if (!$this->select($mailbox)) {
-            return false;
-        }
-
-        $result = false;
-        $parts  = (array) $parts;
-        $key    = $this->nextTag();
-        $peeks  = array();
-        $type   = $mime ? 'MIME' : 'HEADER';
-
-        // format request
-        foreach ($parts as $part) {
-            $peeks[] = "BODY.PEEK[$part.$type]";
-        }
-
-        $request = "$key UID FETCH $uid (" . implode(' ', $peeks) . ')';
-
-        // send request
-        if (!$this->putLine($request)) {
-            $this->setError(self::ERROR_COMMAND, "Unable to send command: $request");
-            return false;
-        }
-
-        do {
-            $line = $this->readLine(1024);
-
-            if (preg_match('/^\* [0-9]+ FETCH [0-9UID( ]+BODY\[([0-9\.]+)\.'.$type.'\]/', $line, $matches)) {
-                $idx     = $matches[1];
-                $headers = '';
-
-                // get complete entry
-                if (preg_match('/\{([0-9]+)\}\r\n$/', $line, $m)) {
-                    $bytes = $m[1];
-                    $out   = '';
-
-                    while (strlen($out) < $bytes) {
-                        $out = $this->readBytes($bytes);
-                        if ($out === null)
-                            break;
-                        $headers .= $out;
-                    }
-                }
-
-                $result[$idx] = trim($headers);
-            }
-        } while (!$this->startsWith($line, $key, true));
-
-        return $result;
-    }
-
-    function fetchPartHeader($mailbox, $id, $is_uid=false, $part=NULL)
-    {
-        $part = empty($part) ? 'HEADER' : $part.'.MIME';
-
-        return $this->handlePartBody($mailbox, $id, $is_uid, $part);
-    }
-
-    function handlePartBody($mailbox, $id, $is_uid=false, $part='', $encoding=NULL, $print=NULL, $file=NULL, $formatted=false, $max_bytes=0)
-    {
-        if (!$this->select($mailbox)) {
-            return false;
-        }
-
-        switch ($encoding) {
-        case 'base64':
-            $mode = 1;
-            break;
-        case 'quoted-printable':
-            $mode = 2;
-            break;
-        case 'x-uuencode':
-        case 'x-uue':
-        case 'uue':
-        case 'uuencode':
-            $mode = 3;
-            break;
-        default:
-            $mode = 0;
-        }
-
-        // Use BINARY extension when possible (and safe)
-        $binary     = $mode && preg_match('/^[0-9.]+$/', $part) && $this->hasCapability('BINARY');
-        $fetch_mode = $binary ? 'BINARY' : 'BODY';
-        $partial    = $max_bytes ? sprintf('<0.%d>', $max_bytes) : '';
-
-        // format request
-        $key     = $this->nextTag();
-        $request = $key . ($is_uid ? ' UID' : '') . " FETCH $id ($fetch_mode.PEEK[$part]$partial)";
-        $result  = false;
-        $found   = false;
-
-        // send request
-        if (!$this->putLine($request)) {
-            $this->setError(self::ERROR_COMMAND, "Unable to send command: $request");
-            return false;
-        }
-
-        if ($binary) {
-            // WARNING: Use $formatted argument with care, this may break binary data stream
-            $mode = -1;
-        }
-
-        do {
-            $line = trim($this->readLine(1024));
-
-            if (!$line) {
-                break;
-            }
-
-            // skip irrelevant untagged responses (we have a result already)
-            if ($found || !preg_match('/^\* ([0-9]+) FETCH (.*)$/', $line, $m)) {
-                continue;
-            }
-
-            $line = $m[2];
-
-            // handle one line response
-            if ($line[0] == '(' && substr($line, -1) == ')') {
-                // tokenize content inside brackets
-                // the content can be e.g.: (UID 9844 BODY[2.4] NIL)
-                $tokens = $this->tokenizeResponse(preg_replace('/(^\(|\)$)/', '', $line));
-
-                for ($i=0; $i<count($tokens); $i+=2) {
-                    if (preg_match('/^(BODY|BINARY)/i', $tokens[$i])) {
-                        $result = $tokens[$i+1];
-                        $found  = true;
-                        break;
-                    }
-                }
-
-                if ($result !== false) {
-                    if ($mode == 1) {
-                        $result = base64_decode($result);
-                    }
-                    else if ($mode == 2) {
-                        $result = quoted_printable_decode($result);
-                    }
-                    else if ($mode == 3) {
-                        $result = convert_uudecode($result);
-                    }
-                }
-            }
-            // response with string literal
-            else if (preg_match('/\{([0-9]+)\}$/', $line, $m)) {
-                $bytes = (int) $m[1];
-                $prev  = '';
-                $found = true;
-
-                // empty body
-                if (!$bytes) {
-                    $result = '';
-                }
-                else while ($bytes > 0) {
-                    $line = $this->readLine(8192);
-
-                    if ($line === NULL) {
-                        break;
-                    }
-
-                    $len = strlen($line);
-
-                    if ($len > $bytes) {
-                        $line = substr($line, 0, $bytes);
-                        $len  = strlen($line);
-                    }
-                    $bytes -= $len;
-
-                    // BASE64
-                    if ($mode == 1) {
-                        $line = rtrim($line, "\t\r\n\0\x0B");
-                        // create chunks with proper length for base64 decoding
-                        $line = $prev.$line;
-                        $length = strlen($line);
-                        if ($length % 4) {
-                            $length = floor($length / 4) * 4;
-                            $prev = substr($line, $length);
-                            $line = substr($line, 0, $length);
-                        }
-                        else {
-                            $prev = '';
-                        }
-                        $line = base64_decode($line);
-                    }
-                    // QUOTED-PRINTABLE
-                    else if ($mode == 2) {
-                        $line = rtrim($line, "\t\r\0\x0B");
-                        $line = quoted_printable_decode($line);
-                    }
-                    // UUENCODE
-                    else if ($mode == 3) {
-                        $line = rtrim($line, "\t\r\n\0\x0B");
-                        if ($line == 'end' || preg_match('/^begin\s+[0-7]+\s+.+$/', $line)) {
-                            continue;
-                        }
-                        $line = convert_uudecode($line);
-                    }
-                    // default
-                    else if ($formatted) {
-                        $line = rtrim($line, "\t\r\n\0\x0B") . "\n";
-                    }
-
-                    if ($file) {
-                        if (fwrite($file, $line) === false) {
-                            break;
-                        }
-                    }
-                    else if ($print) {
-                        echo $line;
-                    }
-                    else {
-                        $result .= $line;
-                    }
-                }
-            }
-        } while (!$this->startsWith($line, $key, true));
-
-        if ($result !== false) {
-            if ($file) {
-                return fwrite($file, $result);
-            }
-            else if ($print) {
-                echo $result;
-                return true;
-            }
-
-            return $result;
-        }
-
-        return false;
-    }
-
-    /**
-     * Handler for IMAP APPEND command
-     *
-     * @param string       $mailbox Mailbox name
-     * @param string|array $message The message source string or array (of strings and file pointers)
-     * @param array        $flags   Message flags
-     * @param string       $date    Message internal date
-     * @param bool         $binary  Enable BINARY append (RFC3516)
-     *
-     * @return string|bool On success APPENDUID response (if available) or True, False on failure
-     */
-    function append($mailbox, &$message, $flags = array(), $date = null, $binary = false)
-    {
-        unset($this->data['APPENDUID']);
-
-        if ($mailbox === null || $mailbox === '') {
-            return false;
-        }
-
-        $binary       = $binary && $this->getCapability('BINARY');
-        $literal_plus = !$binary && $this->prefs['literal+'];
-        $len          = 0;
-        $msg          = is_array($message) ? $message : array(&$message);
-        $chunk_size   = 512000;
-
-        for ($i=0, $cnt=count($msg); $i<$cnt; $i++) {
-            if (is_resource($msg[$i])) {
-                $stat = fstat($msg[$i]);
-                if ($stat === false) {
-                    return false;
-                }
-                $len += $stat['size'];
-            }
-            else {
-                if (!$binary) {
-                    $msg[$i] = str_replace("\r", '', $msg[$i]);
-                    $msg[$i] = str_replace("\n", "\r\n", $msg[$i]);
-                }
-
-                $len += strlen($msg[$i]);
-            }
-        }
-
-        if (!$len) {
-            return false;
-        }
-
-        // build APPEND command
-        $key = $this->nextTag();
-        $request = "$key APPEND " . $this->escape($mailbox) . ' (' . $this->flagsToStr($flags) . ')';
-        if (!empty($date)) {
-            $request .= ' ' . $this->escape($date);
-        }
-        $request .= ' ' . ($binary ? '~' : '') . '{' . $len . ($literal_plus ? '+' : '') . '}';
-
-        // send APPEND command
-        if ($this->putLine($request)) {
-            // Do not wait when LITERAL+ is supported
-            if (!$literal_plus) {
-                $line = $this->readReply();
-
-                if ($line[0] != '+') {
-                    $this->parseResult($line, 'APPEND: ');
-                    return false;
-                }
-            }
-
-            foreach ($msg as $msg_part) {
-                // file pointer
-                if (is_resource($msg_part)) {
-                    rewind($msg_part);
-                    while (!feof($msg_part) && $this->fp) {
-                        $buffer = fread($msg_part, $chunk_size);
-                        $this->putLine($buffer, false);
-                    }
-                    fclose($msg_part);
-                }
-                // string
-                else {
-                    $size = strlen($msg_part);
-
-                    // Break up the data by sending one chunk (up to 512k) at a time.
-                    // This approach reduces our peak memory usage
-                    for ($offset = 0; $offset < $size; $offset += $chunk_size) {
-                        $chunk = substr($msg_part, $offset, $chunk_size);
-                        if (!$this->putLine($chunk, false)) {
-                            return false;
-                        }
-                    }
-                }
-            }
-
-            if (!$this->putLine('')) { // \r\n
-                return false;
-            }
-
-            do {
-                $line = $this->readLine();
-            } while (!$this->startsWith($line, $key, true, true));
-
-            // Clear internal status cache
-            unset($this->data['STATUS:'.$mailbox]);
-
-            if ($this->parseResult($line, 'APPEND: ') != self::ERROR_OK)
-                return false;
-            else if (!empty($this->data['APPENDUID']))
-                return $this->data['APPENDUID'];
-            else
-                return true;
-        }
-        else {
-            $this->setError(self::ERROR_COMMAND, "Unable to send command: $request");
-        }
-
-        return false;
-    }
-
-    /**
-     * Handler for IMAP APPEND command.
-     *
-     * @param string $mailbox Mailbox name
-     * @param string $path    Path to the file with message body
-     * @param string $headers Message headers
-     * @param array  $flags   Message flags
-     * @param string $date    Message internal date
-     * @param bool   $binary  Enable BINARY append (RFC3516)
-     *
-     * @return string|bool On success APPENDUID response (if available) or True, False on failure
-     */
-    function appendFromFile($mailbox, $path, $headers=null, $flags = array(), $date = null, $binary = false)
-    {
-        // open message file
-        if (file_exists(realpath($path))) {
-            $fp = fopen($path, 'r');
-        }
-
-        if (!$fp) {
-            $this->setError(self::ERROR_UNKNOWN, "Couldn't open $path for reading");
-            return false;
-        }
-
-        $message = array();
-        if ($headers) {
-            $message[] = trim($headers, "\r\n") . "\r\n\r\n";
-        }
-        $message[] = $fp;
-
-        return $this->append($mailbox, $message, $flags, $date, $binary);
-    }
-
-    /**
-     * Returns QUOTA information
-     *
-     * @return array Quota information
-     */
-    function getQuota()
-    {
-        /*
-         * GETQUOTAROOT "INBOX"
-         * QUOTAROOT INBOX user/rchijiiwa1
-         * QUOTA user/rchijiiwa1 (STORAGE 654 9765)
-         * OK Completed
-         */
-        $result      = false;
-        $quota_lines = array();
-        $key         = $this->nextTag();
-        $command     = $key . ' GETQUOTAROOT INBOX';
-
-        // get line(s) containing quota info
-        if ($this->putLine($command)) {
-            do {
-                $line = rtrim($this->readLine(5000));
-                if (preg_match('/^\* QUOTA /', $line)) {
-                    $quota_lines[] = $line;
-                }
-            } while (!$this->startsWith($line, $key, true, true));
-        }
-        else {
-            $this->setError(self::ERROR_COMMAND, "Unable to send command: $command");
-        }
-
-        // return false if not found, parse if found
-        $min_free = PHP_INT_MAX;
-        foreach ($quota_lines as $key => $quota_line) {
-            $quota_line   = str_replace(array('(', ')'), '', $quota_line);
-            $parts        = explode(' ', $quota_line);
-            $storage_part = array_search('STORAGE', $parts);
-
-            if (!$storage_part) {
-                continue;
-            }
-
-            $used  = intval($parts[$storage_part+1]);
-            $total = intval($parts[$storage_part+2]);
-            $free  = $total - $used;
-
-            // return lowest available space from all quotas
-            if ($free < $min_free) {
-                $min_free          = $free;
-                $result['used']    = $used;
-                $result['total']   = $total;
-                $result['percent'] = min(100, round(($used/max(1,$total))*100));
-                $result['free']    = 100 - $result['percent'];
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Send the SETACL command (RFC4314)
-     *
-     * @param string $mailbox Mailbox name
-     * @param string $user    User name
-     * @param mixed  $acl     ACL string or array
-     *
-     * @return boolean True on success, False on failure
-     *
-     * @since 0.5-beta
-     */
-    function setACL($mailbox, $user, $acl)
-    {
-        if (is_array($acl)) {
-            $acl = implode('', $acl);
-        }
-
-        $result = $this->execute('SETACL', array(
-            $this->escape($mailbox), $this->escape($user), strtolower($acl)),
-            self::COMMAND_NORESPONSE);
-
-        return ($result == self::ERROR_OK);
-    }
-
-    /**
-     * Send the DELETEACL command (RFC4314)
-     *
-     * @param string $mailbox Mailbox name
-     * @param string $user    User name
-     *
-     * @return boolean True on success, False on failure
-     *
-     * @since 0.5-beta
-     */
-    function deleteACL($mailbox, $user)
-    {
-        $result = $this->execute('DELETEACL', array(
-            $this->escape($mailbox), $this->escape($user)),
-            self::COMMAND_NORESPONSE);
-
-        return ($result == self::ERROR_OK);
-    }
-
-    /**
-     * Send the GETACL command (RFC4314)
-     *
-     * @param string $mailbox Mailbox name
-     *
-     * @return array User-rights array on success, NULL on error
-     * @since 0.5-beta
-     */
-    function getACL($mailbox)
-    {
-        list($code, $response) = $this->execute('GETACL', array($this->escape($mailbox)));
-
-        if ($code == self::ERROR_OK && preg_match('/^\* ACL /i', $response)) {
-            // Parse server response (remove "* ACL ")
-            $response = substr($response, 6);
-            $ret  = $this->tokenizeResponse($response);
-            $mbox = array_shift($ret);
-            $size = count($ret);
-
-            // Create user-rights hash array
-            // @TODO: consider implementing fixACL() method according to RFC4314.2.1.1
-            // so we could return only standard rights defined in RFC4314,
-            // excluding 'c' and 'd' defined in RFC2086.
-            if ($size % 2 == 0) {
-                for ($i=0; $i<$size; $i++) {
-                    $ret[$ret[$i]] = str_split($ret[++$i]);
-                    unset($ret[$i-1]);
-                    unset($ret[$i]);
-                }
-                return $ret;
-            }
-
-            $this->setError(self::ERROR_COMMAND, "Incomplete ACL response");
-            return NULL;
-        }
-
-        return NULL;
-    }
-
-    /**
-     * Send the LISTRIGHTS command (RFC4314)
-     *
-     * @param string $mailbox Mailbox name
-     * @param string $user    User name
-     *
-     * @return array List of user rights
-     * @since 0.5-beta
-     */
-    function listRights($mailbox, $user)
-    {
-        list($code, $response) = $this->execute('LISTRIGHTS', array(
-            $this->escape($mailbox), $this->escape($user)));
-
-        if ($code == self::ERROR_OK && preg_match('/^\* LISTRIGHTS /i', $response)) {
-            // Parse server response (remove "* LISTRIGHTS ")
-            $response = substr($response, 13);
-
-            $ret_mbox = $this->tokenizeResponse($response, 1);
-            $ret_user = $this->tokenizeResponse($response, 1);
-            $granted  = $this->tokenizeResponse($response, 1);
-            $optional = trim($response);
-
-            return array(
-                'granted'  => str_split($granted),
-                'optional' => explode(' ', $optional),
-            );
-        }
-
-        return NULL;
-    }
-
-    /**
-     * Send the MYRIGHTS command (RFC4314)
-     *
-     * @param string $mailbox Mailbox name
-     *
-     * @return array MYRIGHTS response on success, NULL on error
-     * @since 0.5-beta
-     */
-    function myRights($mailbox)
-    {
-        list($code, $response) = $this->execute('MYRIGHTS', array($this->escape($mailbox)));
-
-        if ($code == self::ERROR_OK && preg_match('/^\* MYRIGHTS /i', $response)) {
-            // Parse server response (remove "* MYRIGHTS ")
-            $response = substr($response, 11);
-
-            $ret_mbox = $this->tokenizeResponse($response, 1);
-            $rights   = $this->tokenizeResponse($response, 1);
-
-            return str_split($rights);
-        }
-
-        return NULL;
-    }
-
-    /**
-     * Send the SETMETADATA command (RFC5464)
-     *
-     * @param string $mailbox Mailbox name
-     * @param array  $entries Entry-value array (use NULL value as NIL)
-     *
-     * @return boolean True on success, False on failure
-     * @since 0.5-beta
-     */
-    function setMetadata($mailbox, $entries)
-    {
-        if (!is_array($entries) || empty($entries)) {
-            $this->setError(self::ERROR_COMMAND, "Wrong argument for SETMETADATA command");
-            return false;
-        }
-
-        foreach ($entries as $name => $value) {
-            $entries[$name] = $this->escape($name) . ' ' . $this->escape($value, true);
-        }
-
-        $entries = implode(' ', $entries);
-        $result = $this->execute('SETMETADATA', array(
-            $this->escape($mailbox), '(' . $entries . ')'),
-            self::COMMAND_NORESPONSE);
-
-        return ($result == self::ERROR_OK);
-    }
-
-    /**
-     * Send the SETMETADATA command with NIL values (RFC5464)
-     *
-     * @param string $mailbox Mailbox name
-     * @param array  $entries Entry names array
-     *
-     * @return boolean True on success, False on failure
-     *
-     * @since 0.5-beta
-     */
-    function deleteMetadata($mailbox, $entries)
-    {
-        if (!is_array($entries) && !empty($entries)) {
-            $entries = explode(' ', $entries);
-        }
-
-        if (empty($entries)) {
-            $this->setError(self::ERROR_COMMAND, "Wrong argument for SETMETADATA command");
-            return false;
-        }
-
-        foreach ($entries as $entry) {
-            $data[$entry] = NULL;
-        }
-
-        return $this->setMetadata($mailbox, $data);
-    }
-
-    /**
-     * Send the GETMETADATA command (RFC5464)
-     *
-     * @param string $mailbox Mailbox name
-     * @param array  $entries Entries
-     * @param array  $options Command options (with MAXSIZE and DEPTH keys)
-     *
-     * @return array GETMETADATA result on success, NULL on error
-     *
-     * @since 0.5-beta
-     */
-    function getMetadata($mailbox, $entries, $options=array())
-    {
-        if (!is_array($entries)) {
-            $entries = array($entries);
-        }
-
-        // create entries string
-        foreach ($entries as $idx => $name) {
-            $entries[$idx] = $this->escape($name);
-        }
-
-        $optlist = '';
-        $entlist = '(' . implode(' ', $entries) . ')';
-
-        // create options string
-        if (is_array($options)) {
-            $options = array_change_key_case($options, CASE_UPPER);
-            $opts = array();
-
-            if (!empty($options['MAXSIZE'])) {
-                $opts[] = 'MAXSIZE '.intval($options['MAXSIZE']);
-            }
-            if (!empty($options['DEPTH'])) {
-                $opts[] = 'DEPTH '.intval($options['DEPTH']);
-            }
-
-            if ($opts) {
-                $optlist = '(' . implode(' ', $opts) . ')';
-            }
-        }
-
-        $optlist .= ($optlist ? ' ' : '') . $entlist;
-
-        list($code, $response) = $this->execute('GETMETADATA', array(
-            $this->escape($mailbox), $optlist));
-
-        if ($code == self::ERROR_OK) {
-            $result = array();
-            $data   = $this->tokenizeResponse($response);
-
-            // The METADATA response can contain multiple entries in a single
-            // response or multiple responses for each entry or group of entries
-            if (!empty($data) && ($size = count($data))) {
-                for ($i=0; $i<$size; $i++) {
-                    if (isset($mbox) && is_array($data[$i])) {
-                        $size_sub = count($data[$i]);
-                        for ($x=0; $x<$size_sub; $x++) {
-                            $result[$mbox][$data[$i][$x]] = $data[$i][++$x];
-                        }
-                        unset($data[$i]);
-                    }
-                    else if ($data[$i] == '*') {
-                        if ($data[$i+1] == 'METADATA') {
-                            $mbox = $data[$i+2];
-                            unset($data[$i]);   // "*"
-                            unset($data[++$i]); // "METADATA"
-                            unset($data[++$i]); // Mailbox
-                        }
-                        // get rid of other untagged responses
-                        else {
-                            unset($mbox);
-                            unset($data[$i]);
-                        }
-                    }
-                    else if (isset($mbox)) {
-                        $result[$mbox][$data[$i]] = $data[++$i];
-                        unset($data[$i]);
-                        unset($data[$i-1]);
-                    }
-                    else {
-                        unset($data[$i]);
-                    }
-                }
-            }
-
-            return $result;
-        }
-
-        return NULL;
-    }
-
-    /**
-     * Send the SETANNOTATION command (draft-daboo-imap-annotatemore)
-     *
-     * @param string $mailbox Mailbox name
-     * @param array  $data    Data array where each item is an array with
-     *                        three elements: entry name, attribute name, value
-     *
-     * @return boolean True on success, False on failure
-     * @since 0.5-beta
-     */
-    function setAnnotation($mailbox, $data)
-    {
-        if (!is_array($data) || empty($data)) {
-            $this->setError(self::ERROR_COMMAND, "Wrong argument for SETANNOTATION command");
-            return false;
-        }
-
-        foreach ($data as $entry) {
-            // Workaround cyrus-murder bug, the entry[2] string needs to be escaped
-            if (self::$mupdate) {
-                $entry[2] = addcslashes($entry[2], '\\"');
-            }
-
-            // ANNOTATEMORE drafts before version 08 require quoted parameters
-            $entries[] = sprintf('%s (%s %s)', $this->escape($entry[0], true),
-                $this->escape($entry[1], true), $this->escape($entry[2], true));
-        }
-
-        $entries = implode(' ', $entries);
-        $result  = $this->execute('SETANNOTATION', array(
-            $this->escape($mailbox), $entries), self::COMMAND_NORESPONSE);
-
-        return ($result == self::ERROR_OK);
-    }
-
-    /**
-     * Send the SETANNOTATION command with NIL values (draft-daboo-imap-annotatemore)
-     *
-     * @param string $mailbox Mailbox name
-     * @param array  $data    Data array where each item is an array with
-     *                        two elements: entry name and attribute name
-     *
-     * @return boolean True on success, False on failure
-     *
-     * @since 0.5-beta
-     */
-    function deleteAnnotation($mailbox, $data)
-    {
-        if (!is_array($data) || empty($data)) {
-            $this->setError(self::ERROR_COMMAND, "Wrong argument for SETANNOTATION command");
-            return false;
-        }
-
-        return $this->setAnnotation($mailbox, $data);
-    }
-
-    /**
-     * Send the GETANNOTATION command (draft-daboo-imap-annotatemore)
-     *
-     * @param string $mailbox Mailbox name
-     * @param array  $entries Entries names
-     * @param array  $attribs Attribs names
-     *
-     * @return array Annotations result on success, NULL on error
-     *
-     * @since 0.5-beta
-     */
-    function getAnnotation($mailbox, $entries, $attribs)
-    {
-        if (!is_array($entries)) {
-            $entries = array($entries);
-        }
-        // create entries string
-        // ANNOTATEMORE drafts before version 08 require quoted parameters
-        foreach ($entries as $idx => $name) {
-            $entries[$idx] = $this->escape($name, true);
-        }
-        $entries = '(' . implode(' ', $entries) . ')';
-
-        if (!is_array($attribs)) {
-            $attribs = array($attribs);
-        }
-        // create entries string
-        foreach ($attribs as $idx => $name) {
-            $attribs[$idx] = $this->escape($name, true);
-        }
-        $attribs = '(' . implode(' ', $attribs) . ')';
-
-        list($code, $response) = $this->execute('GETANNOTATION', array(
-            $this->escape($mailbox), $entries, $attribs));
-
-        if ($code == self::ERROR_OK) {
-            $result = array();
-            $data   = $this->tokenizeResponse($response);
-
-            // Here we returns only data compatible with METADATA result format
-            if (!empty($data) && ($size = count($data))) {
-                for ($i=0; $i<$size; $i++) {
-                    $entry = $data[$i];
-                    if (isset($mbox) && is_array($entry)) {
-                        $attribs = $entry;
-                        $entry   = $last_entry;
-                    }
-                    else if ($entry == '*') {
-                        if ($data[$i+1] == 'ANNOTATION') {
-                            $mbox = $data[$i+2];
-                            unset($data[$i]);   // "*"
-                            unset($data[++$i]); // "ANNOTATION"
-                            unset($data[++$i]); // Mailbox
-                        }
-                        // get rid of other untagged responses
-                        else {
-                            unset($mbox);
-                            unset($data[$i]);
-                        }
-                        continue;
-                    }
-                    else if (isset($mbox)) {
-                        $attribs = $data[++$i];
-                    }
-                    else {
-                        unset($data[$i]);
-                        continue;
-                    }
-
-                    if (!empty($attribs)) {
-                        for ($x=0, $len=count($attribs); $x<$len;) {
-                            $attr  = $attribs[$x++];
-                            $value = $attribs[$x++];
-                            if ($attr == 'value.priv') {
-                                $result[$mbox]['/private' . $entry] = $value;
-                            }
-                            else if ($attr == 'value.shared') {
-                                $result[$mbox]['/shared' . $entry] = $value;
-                            }
-                        }
-                    }
-                    $last_entry = $entry;
-                    unset($data[$i]);
-                }
-            }
-
-            return $result;
-        }
-
-        return NULL;
-    }
-
-    /**
-     * Returns BODYSTRUCTURE for the specified message.
-     *
-     * @param string $mailbox Folder name
-     * @param int    $id      Message sequence number or UID
-     * @param bool   $is_uid  True if $id is an UID
-     *
-     * @return array/bool Body structure array or False on error.
-     * @since 0.6
-     */
-    function getStructure($mailbox, $id, $is_uid = false)
-    {
-        $result = $this->fetch($mailbox, $id, $is_uid, array('BODYSTRUCTURE'));
-        if (is_array($result)) {
-            $result = array_shift($result);
-            return $result->bodystructure;
-        }
-        return false;
-    }
-
-    /**
-     * Returns data of a message part according to specified structure.
-     *
-     * @param array  $structure Message structure (getStructure() result)
-     * @param string $part      Message part identifier
-     *
-     * @return array Part data as hash array (type, encoding, charset, size)
-     */
-    static function getStructurePartData($structure, $part)
-    {
-        $part_a = self::getStructurePartArray($structure, $part);
-        $data   = array();
-
-        if (empty($part_a)) {
-            return $data;
-        }
-
-        // content-type
-        if (is_array($part_a[0])) {
-            $data['type'] = 'multipart';
-        }
-        else {
-            $data['type'] = strtolower($part_a[0]);
-
-            // encoding
-            $data['encoding'] = strtolower($part_a[5]);
-
-            // charset
-            if (is_array($part_a[2])) {
-               while (list($key, $val) = each($part_a[2])) {
-                    if (strcasecmp($val, 'charset') == 0) {
-                        $data['charset'] = $part_a[2][$key+1];
-                        break;
-                    }
-                }
-            }
-        }
-
-        // size
-        $data['size'] = intval($part_a[6]);
-
-        return $data;
-    }
-
-    static function getStructurePartArray($a, $part)
-    {
-        if (!is_array($a)) {
-            return false;
-        }
-
-        if (empty($part)) {
-            return $a;
-        }
-
-        $ctype = is_string($a[0]) && is_string($a[1]) ? $a[0] . '/' . $a[1] : '';
-
-        if (strcasecmp($ctype, 'message/rfc822') == 0) {
-            $a = $a[8];
-        }
-
-        if (strpos($part, '.') > 0) {
-            $orig_part = $part;
-            $pos       = strpos($part, '.');
-            $rest      = substr($orig_part, $pos+1);
-            $part      = substr($orig_part, 0, $pos);
-
-            return self::getStructurePartArray($a[$part-1], $rest);
-        }
-        else if ($part > 0) {
-            return (is_array($a[$part-1])) ? $a[$part-1] : $a;
-        }
-    }
-
-    /**
-     * Creates next command identifier (tag)
-     *
-     * @return string Command identifier
-     * @since 0.5-beta
-     */
-    function nextTag()
-    {
-        $this->cmd_num++;
-        $this->cmd_tag = sprintf('A%04d', $this->cmd_num);
-
-        return $this->cmd_tag;
-    }
-
-    /**
-     * Sends IMAP command and parses result
-     *
-     * @param string $command   IMAP command
-     * @param array  $arguments Command arguments
-     * @param int    $options   Execution options
-     *
-     * @return mixed Response code or list of response code and data
-     * @since 0.5-beta
-     */
-    function execute($command, $arguments=array(), $options=0)
-    {
-        $tag      = $this->nextTag();
-        $query    = $tag . ' ' . $command;
-        $noresp   = ($options & self::COMMAND_NORESPONSE);
-        $response = $noresp ? null : '';
-
-        if (!empty($arguments)) {
-            foreach ($arguments as $arg) {
-                $query .= ' ' . self::r_implode($arg);
-            }
-        }
-
-        // Send command
-        if (!$this->putLineC($query)) {
-            $this->setError(self::ERROR_COMMAND, "Unable to send command: $query");
-            return $noresp ? self::ERROR_COMMAND : array(self::ERROR_COMMAND, '');
-        }
-
-        // Parse response
-        do {
-            $line = $this->readLine(4096);
-            if ($response !== null) {
-                $response .= $line;
-            }
-        } while (!$this->startsWith($line, $tag . ' ', true, true));
-
-        $code = $this->parseResult($line, $command . ': ');
-
-        // Remove last line from response
-        if ($response) {
-            $line_len = min(strlen($response), strlen($line) + 2);
-            $response = substr($response, 0, -$line_len);
-        }
-
-        // optional CAPABILITY response
-        if (($options & self::COMMAND_CAPABILITY) && $code == self::ERROR_OK
-            && preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)
-        ) {
-            $this->parseCapability($matches[1], true);
-        }
-
-        // return last line only (without command tag, result and response code)
-        if ($line && ($options & self::COMMAND_LASTLINE)) {
-            $response = preg_replace("/^$tag (OK|NO|BAD|BYE|PREAUTH)?\s*(\[[a-z-]+\])?\s*/i", '', trim($line));
-        }
-
-        return $noresp ? $code : array($code, $response);
-    }
-
-    /**
-     * Splits IMAP response into string tokens
-     *
-     * @param string &$str The IMAP's server response
-     * @param int    $num  Number of tokens to return
-     *
-     * @return mixed Tokens array or string if $num=1
-     * @since 0.5-beta
-     */
-    static function tokenizeResponse(&$str, $num=0)
-    {
-        $result = array();
-
-        while (!$num || count($result) < $num) {
-            // remove spaces from the beginning of the string
-            $str = ltrim($str);
-
-            switch ($str[0]) {
-
-            // String literal
-            case '{':
-                if (($epos = strpos($str, "}\r\n", 1)) == false) {
-                    // error
-                }
-                if (!is_numeric(($bytes = substr($str, 1, $epos - 1)))) {
-                    // error
-                }
-                $result[] = $bytes ? substr($str, $epos + 3, $bytes) : '';
-                // Advance the string
-                $str = substr($str, $epos + 3 + $bytes);
-                break;
-
-            // Quoted string
-            case '"':
-                $len = strlen($str);
-
-                for ($pos=1; $pos<$len; $pos++) {
-                    if ($str[$pos] == '"') {
-                        break;
-                    }
-                    if ($str[$pos] == "\\") {
-                        if ($str[$pos + 1] == '"' || $str[$pos + 1] == "\\") {
-                            $pos++;
-                        }
-                    }
-                }
-                if ($str[$pos] != '"') {
-                    // error
-                }
-                // we need to strip slashes for a quoted string
-                $result[] = stripslashes(substr($str, 1, $pos - 1));
-                $str      = substr($str, $pos + 1);
-                break;
-
-            // Parenthesized list
-            case '(':
-                $str = substr($str, 1);
-                $result[] = self::tokenizeResponse($str);
-                break;
-            case ')':
-                $str = substr($str, 1);
-                return $result;
-                break;
-
-            // String atom, number, astring, NIL, *, %
-            default:
-                // empty string
-                if ($str === '' || $str === null) {
-                    break 2;
-                }
-
-                // excluded chars: SP, CTL, ), DEL
-                // we do not exclude [ and ] (#1489223)
-                if (preg_match('/^([^\x00-\x20\x29\x7F]+)/', $str, $m)) {
-                    $result[] = $m[1] == 'NIL' ? NULL : $m[1];
-                    $str = substr($str, strlen($m[1]));
-                }
-                break;
-            }
-        }
-
-        return $num == 1 ? $result[0] : $result;
-    }
-
-    static function r_implode($element)
-    {
-        $string = '';
-
-        if (is_array($element)) {
-            reset($element);
-            foreach ($element as $value) {
-                $string .= ' ' . self::r_implode($value);
-            }
-        }
-        else {
-            return $element;
-        }
-
-        return '(' . trim($string) . ')';
-    }
-
-    /**
-     * Converts message identifiers array into sequence-set syntax
-     *
-     * @param array $messages Message identifiers
-     * @param bool  $force    Forces compression of any size
-     *
-     * @return string Compressed sequence-set
-     */
-    static function compressMessageSet($messages, $force=false)
-    {
-        // given a comma delimited list of independent mid's,
-        // compresses by grouping sequences together
-
-        if (!is_array($messages)) {
-            // if less than 255 bytes long, let's not bother
-            if (!$force && strlen($messages)<255) {
-                return $messages;
-            }
-
-            // see if it's already been compressed
-            if (strpos($messages, ':') !== false) {
-                return $messages;
-            }
-
-            // separate, then sort
-            $messages = explode(',', $messages);
-        }
-
-        sort($messages);
-
-        $result = array();
-        $start  = $prev = $messages[0];
-
-        foreach ($messages as $id) {
-            $incr = $id - $prev;
-            if ($incr > 1) { // found a gap
-                if ($start == $prev) {
-                    $result[] = $prev; // push single id
-                } else {
-                    $result[] = $start . ':' . $prev; // push sequence as start_id:end_id
-                }
-                $start = $id; // start of new sequence
-            }
-            $prev = $id;
-        }
-
-        // handle the last sequence/id
-        if ($start == $prev) {
-            $result[] = $prev;
-        } else {
-            $result[] = $start.':'.$prev;
-        }
-
-        // return as comma separated string
-        return implode(',', $result);
-    }
-
-    /**
-     * Converts message sequence-set into array
-     *
-     * @param string $messages Message identifiers
-     *
-     * @return array List of message identifiers
-     */
-    static function uncompressMessageSet($messages)
-    {
-        if (empty($messages)) {
-            return array();
-        }
-
-        $result   = array();
-        $messages = explode(',', $messages);
-
-        foreach ($messages as $idx => $part) {
-            $items = explode(':', $part);
-            $max   = max($items[0], $items[1]);
-
-            for ($x=$items[0]; $x<=$max; $x++) {
-                $result[] = (int)$x;
-            }
-            unset($messages[$idx]);
-        }
-
-        return $result;
-    }
-
-    private function _xor($string, $string2)
-    {
-        $result = '';
-        $size   = strlen($string);
-
-        for ($i=0; $i<$size; $i++) {
-            $result .= chr(ord($string[$i]) ^ ord($string2[$i]));
-        }
-
-        return $result;
-    }
-
-    /**
-     * Converts flags array into string for inclusion in IMAP command
-     *
-     * @param array $flags Flags (see self::flags)
-     *
-     * @return string Space-separated list of flags
-     */
-    private function flagsToStr($flags)
-    {
-        foreach ((array)$flags as $idx => $flag) {
-            if ($flag = $this->flags[strtoupper($flag)]) {
-                $flags[$idx] = $flag;
-            }
-        }
-
-        return implode(' ', (array)$flags);
-    }
-
-    /**
-     * Converts datetime string into unix timestamp
-     *
-     * @param string $date Date string
-     *
-     * @return int Unix timestamp
-     */
-    static function strToTime($date)
-    {
-        // Clean malformed data
-        $date = preg_replace(
-            array(
-                '/GMT\s*([+-][0-9]+)/',                     // support non-standard "GMTXXXX" literal
-                '/[^a-z0-9\x20\x09:+-]/i',                  // remove any invalid characters
-                '/\s*(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*/i',   // remove weekday names
-            ),
-            array(
-                '\\1',
-                '',
-                '',
-            ), $date);
-
-        $date = trim($date);
-
-        // if date parsing fails, we have a date in non-rfc format
-        // remove token from the end and try again
-        while (($ts = intval(@strtotime($date))) <= 0) {
-            $d = explode(' ', $date);
-            array_pop($d);
-            if (empty($d)) {
-                break;
-            }
-            $date = implode(' ', $d);
-        }
-
-        return $ts < 0 ? 0 : $ts;
-    }
-
-    /**
-     * CAPABILITY response parser
-     */
-    private function parseCapability($str, $trusted=false)
-    {
-        $str = preg_replace('/^\* CAPABILITY /i', '', $str);
-
-        $this->capability = explode(' ', strtoupper($str));
-
-        if (!empty($this->prefs['disabled_caps'])) {
-            $this->capability = array_diff($this->capability, $this->prefs['disabled_caps']);
-        }
-
-        if (!isset($this->prefs['literal+']) && in_array('LITERAL+', $this->capability)) {
-            $this->prefs['literal+'] = true;
-        }
-
-        if (preg_match('/(\[| )MUPDATE=.*/', $str)) {
-            self::$mupdate = true;
-        }
-
-        if ($trusted) {
-            $this->capability_readed = true;
-        }
-    }
-
-    /**
-     * Escapes a string when it contains special characters (RFC3501)
-     *
-     * @param string  $string       IMAP string
-     * @param boolean $force_quotes Forces string quoting (for atoms)
-     *
-     * @return string String atom, quoted-string or string literal
-     * @todo lists
-     */
-    static function escape($string, $force_quotes=false)
-    {
-        if ($string === null) {
-            return 'NIL';
-        }
-
-        if ($string === '') {
-            return '""';
-        }
-
-        // atom-string (only safe characters)
-        if (!$force_quotes && !preg_match('/[\x00-\x20\x22\x25\x28-\x2A\x5B-\x5D\x7B\x7D\x80-\xFF]/', $string)) {
-            return $string;
-        }
-
-        // quoted-string
-        if (!preg_match('/[\r\n\x00\x80-\xFF]/', $string)) {
-            return '"' . addcslashes($string, '\\"') . '"';
-        }
-
-        // literal-string
-        return sprintf("{%d}\r\n%s", strlen($string), $string);
-    }
-
-    /**
-     * Set the value of the debugging flag.
-     *
-     * @param boolean  $debug   New value for the debugging flag.
-     * @param callback $handler Logging handler function
-     *
-     * @since 0.5-stable
-     */
-    function setDebug($debug, $handler = null)
-    {
-        $this->_debug = $debug;
-        $this->_debug_handler = $handler;
-    }
-
-    /**
-     * Write the given debug text to the current debug output handler.
-     *
-     * @param string $message Debug mesage text.
-     *
-     * @since 0.5-stable
-     */
-    private function debug($message)
-    {
-        if (($len = strlen($message)) > self::DEBUG_LINE_LENGTH) {
-            $diff    = $len - self::DEBUG_LINE_LENGTH;
-            $message = substr($message, 0, self::DEBUG_LINE_LENGTH)
-                . "... [truncated $diff bytes]";
-        }
-
-        if ($this->resourceid) {
-            $message = sprintf('[%s] %s', $this->resourceid, $message);
-        }
-
-        if ($this->_debug_handler) {
-            call_user_func_array($this->_debug_handler, array(&$this, $message));
-        } else {
-            echo "DEBUG: $message\n";
-        }
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_ldap.php b/lib/ext/Roundcube/rcube_ldap.php
deleted file mode 100644
index b733e24..0000000
--- a/lib/ext/Roundcube/rcube_ldap.php
+++ /dev/null
@@ -1,1995 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2013, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2013, Kolab Systems AG                             |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Interface to an LDAP address directory                              |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- |         Andreas Dick <andudi (at) gmx (dot) ch>                       |
- |         Aleksander Machniak <machniak@kolabsys.com>                   |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Model class to access an LDAP address directory
- *
- * @package    Framework
- * @subpackage Addressbook
- */
-class rcube_ldap extends rcube_addressbook
-{
-    // public properties
-    public $primary_key = 'ID';
-    public $groups      = false;
-    public $readonly    = true;
-    public $ready       = false;
-    public $group_id    = 0;
-    public $coltypes    = array();
-    public $export_groups = false;
-
-    // private properties
-    protected $ldap;
-    protected $prop     = array();
-    protected $fieldmap = array();
-    protected $filter   = '';
-    protected $sub_filter;
-    protected $result;
-    protected $ldap_result;
-    protected $mail_domain = '';
-    protected $debug = false;
-
-    /**
-     * Group objectclass (lowercase) to member attribute mapping
-     *
-     * @var array
-     */
-    private $group_types = array(
-        'group'                   => 'member',
-        'groupofnames'            => 'member',
-        'kolabgroupofnames'       => 'member',
-        'groupofuniquenames'      => 'uniqueMember',
-        'kolabgroupofuniquenames' => 'uniqueMember',
-        'univentiongroup'         => 'uniqueMember',
-        'groupofurls'             => null,
-    );
-
-    private $base_dn        = '';
-    private $groups_base_dn = '';
-    private $group_url;
-    private $cache;
-
-
-    /**
-    * Object constructor
-    *
-    * @param array   $p            LDAP connection properties
-    * @param boolean $debug        Enables debug mode
-    * @param string  $mail_domain  Current user mail domain name
-    */
-    function __construct($p, $debug = false, $mail_domain = null)
-    {
-        $this->prop = $p;
-
-        $fetch_attributes = array('objectClass');
-
-        // check if groups are configured
-        if (is_array($p['groups']) && count($p['groups'])) {
-            $this->groups = true;
-            // set member field
-            if (!empty($p['groups']['member_attr']))
-                $this->prop['member_attr'] = strtolower($p['groups']['member_attr']);
-            else if (empty($p['member_attr']))
-                $this->prop['member_attr'] = 'member';
-            // set default name attribute to cn
-            if (empty($this->prop['groups']['name_attr']))
-                $this->prop['groups']['name_attr'] = 'cn';
-            if (empty($this->prop['groups']['scope']))
-                $this->prop['groups']['scope'] = 'sub';
-            // extend group objectclass => member attribute mapping
-            if (!empty($this->prop['groups']['class_member_attr']))
-                $this->group_types = array_merge($this->group_types, $this->prop['groups']['class_member_attr']);
-
-            // add group name attrib to the list of attributes to be fetched
-            $fetch_attributes[] = $this->prop['groups']['name_attr'];
-        }
-        if (is_array($p['group_filters']) && count($p['group_filters'])) {
-            $this->groups = true;
-
-            foreach ($p['group_filters'] as $k => $group_filter) {
-                // set default name attribute to cn
-                if (empty($group_filter['name_attr']) && empty($this->prop['groups']['name_attr']))
-                    $this->prop['group_filters'][$k]['name_attr'] = $group_filter['name_attr'] = 'cn';
-
-                if ($group_filter['name_attr'])
-                    $fetch_attributes[] = $group_filter['name_attr'];
-            }
-        }
-
-        // fieldmap property is given
-        if (is_array($p['fieldmap'])) {
-            foreach ($p['fieldmap'] as $rf => $lf)
-                $this->fieldmap[$rf] = $this->_attr_name(strtolower($lf));
-        }
-        else if (!empty($p)) {
-            // read deprecated *_field properties to remain backwards compatible
-            foreach ($p as $prop => $value)
-                if (preg_match('/^(.+)_field$/', $prop, $matches))
-                    $this->fieldmap[$matches[1]] = $this->_attr_name(strtolower($value));
-        }
-
-        // use fieldmap to advertise supported coltypes to the application
-        foreach ($this->fieldmap as $colv => $lfv) {
-            list($col, $type) = explode(':', $colv);
-            list($lf, $limit, $delim) = explode(':', $lfv);
-
-            if ($limit == '*') $limit = null;
-            else               $limit = max(1, intval($limit));
-
-            if (!is_array($this->coltypes[$col])) {
-                $subtypes = $type ? array($type) : null;
-                $this->coltypes[$col] = array('limit' => $limit, 'subtypes' => $subtypes, 'attributes' => array($lf));
-            }
-            elseif ($type) {
-                $this->coltypes[$col]['subtypes'][] = $type;
-                $this->coltypes[$col]['attributes'][] = $lf;
-                $this->coltypes[$col]['limit'] += $limit;
-            }
-
-            if ($delim)
-               $this->coltypes[$col]['serialized'][$type] = $delim;
-
-           $this->fieldmap[$colv] = $lf;
-        }
-
-        // support for composite address
-        if ($this->coltypes['street'] && $this->coltypes['locality']) {
-            $this->coltypes['address'] = array(
-               'limit'    => max(1, $this->coltypes['locality']['limit'] + $this->coltypes['address']['limit']),
-               'subtypes' => array_merge((array)$this->coltypes['address']['subtypes'], (array)$this->coltypes['locality']['subtypes']),
-               'childs' => array(),
-               ) + (array)$this->coltypes['address'];
-
-            foreach (array('street','locality','zipcode','region','country') as $childcol) {
-                if ($this->coltypes[$childcol]) {
-                    $this->coltypes['address']['childs'][$childcol] = array('type' => 'text');
-                    unset($this->coltypes[$childcol]);  // remove address child col from global coltypes list
-                }
-            }
-
-            // at least one address type must be specified
-            if (empty($this->coltypes['address']['subtypes'])) {
-                $this->coltypes['address']['subtypes'] = array('home');
-            }
-        }
-        else if ($this->coltypes['address']) {
-            $this->coltypes['address'] += array('type' => 'textarea', 'childs' => null, 'size' => 40);
-
-            // 'serialized' means the UI has to present a composite address field
-            if ($this->coltypes['address']['serialized']) {
-                $childprop = array('type' => 'text');
-                $this->coltypes['address']['type'] = 'composite';
-                $this->coltypes['address']['childs'] = array('street' => $childprop, 'locality' => $childprop, 'zipcode' => $childprop, 'country' => $childprop);
-            }
-        }
-
-        // make sure 'required_fields' is an array
-        if (!is_array($this->prop['required_fields'])) {
-            $this->prop['required_fields'] = (array) $this->prop['required_fields'];
-        }
-
-        // make sure LDAP_rdn field is required
-        if (!empty($this->prop['LDAP_rdn']) && !in_array($this->prop['LDAP_rdn'], $this->prop['required_fields'])
-            && !in_array($this->prop['LDAP_rdn'], array_keys((array)$this->prop['autovalues']))) {
-            $this->prop['required_fields'][] = $this->prop['LDAP_rdn'];
-        }
-
-        foreach ($this->prop['required_fields'] as $key => $val) {
-            $this->prop['required_fields'][$key] = $this->_attr_name(strtolower($val));
-        }
-
-        // Build sub_fields filter
-        if (!empty($this->prop['sub_fields']) && is_array($this->prop['sub_fields'])) {
-            $this->sub_filter = '';
-            foreach ($this->prop['sub_fields'] as $class) {
-                if (!empty($class)) {
-                    $class = is_array($class) ? array_pop($class) : $class;
-                    $this->sub_filter .= '(objectClass=' . $class . ')';
-                }
-            }
-            if (count($this->prop['sub_fields']) > 1) {
-                $this->sub_filter = '(|' . $this->sub_filter . ')';
-            }
-        }
-
-        $this->sort_col    = is_array($p['sort']) ? $p['sort'][0] : $p['sort'];
-        $this->debug       = $debug;
-        $this->mail_domain = $mail_domain;
-
-        // initialize cache
-        $rcube = rcube::get_instance();
-        if ($cache_type = $rcube->config->get('ldap_cache', 'db')) {
-            $cache_ttl  = $rcube->config->get('ldap_cache_ttl', '10m');
-            $cache_name = 'LDAP.' . asciiwords($this->prop['name']);
-
-            $this->cache = $rcube->get_cache($cache_name, $cache_type, $cache_ttl);
-        }
-
-        // determine which attributes to fetch
-        $this->prop['list_attributes'] = array_unique($fetch_attributes);
-        $this->prop['attributes'] = array_merge(array_values($this->fieldmap), $fetch_attributes);
-        foreach ($rcube->config->get('contactlist_fields') as $col) {
-            $this->prop['list_attributes'] = array_merge($this->prop['list_attributes'], $this->_map_field($col));
-        }
-
-        // initialize ldap wrapper object
-        $this->ldap = new rcube_ldap_generic($this->prop);
-        $this->ldap->set_cache($this->cache);
-        $this->ldap->set_debug($this->debug);
-
-        $this->_connect();
-    }
-
-
-    /**
-    * Establish a connection to the LDAP server
-    */
-    private function _connect()
-    {
-        $rcube = rcube::get_instance();
-
-        if ($this->ready)
-            return true;
-
-        if (!is_array($this->prop['hosts']))
-            $this->prop['hosts'] = array($this->prop['hosts']);
-
-        // try to connect + bind for every host configured
-        // with OpenLDAP 2.x ldap_connect() always succeeds but ldap_bind will fail if host isn't reachable
-        // see http://www.php.net/manual/en/function.ldap-connect.php
-        foreach ($this->prop['hosts'] as $host) {
-            // skip host if connection failed
-            if (!$this->ldap->connect($host)) {
-                continue;
-            }
-
-            // See if the directory is writeable.
-            if ($this->prop['writable']) {
-                $this->readonly = false;
-            }
-
-            $bind_pass = $this->prop['bind_pass'];
-            $bind_user = $this->prop['bind_user'];
-            $bind_dn   = $this->prop['bind_dn'];
-
-            $this->base_dn        = $this->prop['base_dn'];
-            $this->groups_base_dn = ($this->prop['groups']['base_dn']) ?
-                $this->prop['groups']['base_dn'] : $this->base_dn;
-
-            // User specific access, generate the proper values to use.
-            if ($this->prop['user_specific']) {
-                // No password set, use the session password
-                if (empty($bind_pass)) {
-                    $bind_pass = $rcube->get_user_password();
-                }
-
-                // Get the pieces needed for variable replacement.
-                if ($fu = $rcube->get_user_email())
-                    list($u, $d) = explode('@', $fu);
-                else
-                    $d = $this->mail_domain;
-
-                $dc = 'dc='.strtr($d, array('.' => ',dc=')); // hierarchal domain string
-
-                $replaces = array('%dn' => '', '%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u);
-
-                // Search for the dn to use to authenticate
-                if ($this->prop['search_base_dn'] && $this->prop['search_filter']
-                    && (strstr($bind_dn, '%dn') || strstr($this->base_dn, '%dn') || strstr($this->groups_base_dn, '%dn'))
-                ) {
-                    $search_attribs = array('uid');
-                     if ($search_bind_attrib = (array)$this->prop['search_bind_attrib']) {
-                         foreach ($search_bind_attrib as $r => $attr) {
-                             $search_attribs[] = $attr;
-                             $replaces[$r] = '';
-                         }
-                     }
-
-                    $search_bind_dn = strtr($this->prop['search_bind_dn'], $replaces);
-                    $search_base_dn = strtr($this->prop['search_base_dn'], $replaces);
-                    $search_filter  = strtr($this->prop['search_filter'], $replaces);
-
-                    $cache_key = 'DN.' . md5("$host:$search_bind_dn:$search_base_dn:$search_filter:"
-                        .$this->prop['search_bind_pw']);
-
-                    if ($this->cache && ($dn = $this->cache->get($cache_key))) {
-                        $replaces['%dn'] = $dn;
-                    }
-                    else {
-                        $ldap = $this->ldap;
-                        if (!empty($search_bind_dn) && !empty($this->prop['search_bind_pw'])) {
-                            // To protect from "Critical extension is unavailable" error
-                            // we need to use a separate LDAP connection
-                            if (!empty($this->prop['vlv'])) {
-                                $ldap = new rcube_ldap_generic($this->prop);
-                                $ldap->set_debug($this->debug);
-                                $ldap->set_cache($this->cache);
-                                if (!$ldap->connect($host)) {
-                                    continue;
-                                }
-                            }
-
-                            if (!$ldap->bind($search_bind_dn, $this->prop['search_bind_pw'])) {
-                                continue;  // bind failed, try next host
-                            }
-                        }
-
-                        $res = $ldap->search($search_base_dn, $search_filter, 'sub', $search_attribs);
-                        if ($res) {
-                            $res->rewind();
-                            $replaces['%dn'] = $res->get_dn();
-
-                            // add more replacements from 'search_bind_attrib' config
-                            if ($search_bind_attrib) {
-                                $res = $res->current();
-                                foreach ($search_bind_attrib as $r => $attr) {
-                                    $replaces[$r] = $res[$attr][0];
-                                }
-                            }
-                        }
-
-                        if ($ldap != $this->ldap) {
-                            $ldap->close();
-                        }
-                    }
-
-                    // DN not found
-                    if (empty($replaces['%dn'])) {
-                        if (!empty($this->prop['search_dn_default']))
-                            $replaces['%dn'] = $this->prop['search_dn_default'];
-                        else {
-                            rcube::raise_error(array(
-                                'code' => 100, 'type' => 'ldap',
-                                'file' => __FILE__, 'line' => __LINE__,
-                                'message' => "DN not found using LDAP search."), true);
-                            continue;
-                        }
-                    }
-
-                    if ($this->cache && !empty($replaces['%dn'])) {
-                        $this->cache->set($cache_key, $replaces['%dn']);
-                    }
-                }
-
-                // Replace the bind_dn and base_dn variables.
-                $bind_dn              = strtr($bind_dn, $replaces);
-                $this->base_dn        = strtr($this->base_dn, $replaces);
-                $this->groups_base_dn = strtr($this->groups_base_dn, $replaces);
-
-                // replace placeholders in filter settings
-                if (!empty($this->prop['filter']))
-                    $this->prop['filter'] = strtr($this->prop['filter'], $replaces);
-                if (!empty($this->prop['groups']['filter']))
-                    $this->prop['groups']['filter'] = strtr($this->prop['groups']['filter'], $replaces);
-                if (!empty($this->prop['groups']['member_filter']))
-                    $this->prop['groups']['member_filter'] = strtr($this->prop['groups']['member_filter'], $replaces);
-
-                if (!empty($this->prop['group_filters'])) {
-                    foreach ($this->prop['group_filters'] as $i => $gf) {
-                        if (!empty($gf['base_dn']))
-                            $this->prop['group_filters'][$i]['base_dn'] = strtr($gf['base_dn'], $replaces);
-                        if (!empty($gf['filter']))
-                            $this->prop['group_filters'][$i]['filter'] = strtr($gf['filter'], $replaces);
-                    }
-                }
-
-                if (empty($bind_user)) {
-                    $bind_user = $u;
-                }
-            }
-
-            if (empty($bind_pass)) {
-                $this->ready = true;
-            }
-            else {
-                if (!empty($bind_dn)) {
-                    $this->ready = $this->ldap->bind($bind_dn, $bind_pass);
-                }
-                else if (!empty($this->prop['auth_cid'])) {
-                    $this->ready = $this->ldap->sasl_bind($this->prop['auth_cid'], $bind_pass, $bind_user);
-                }
-                else {
-                    $this->ready = $this->ldap->sasl_bind($bind_user, $bind_pass);
-                }
-            }
-
-            // connection established, we're done here
-            if ($this->ready) {
-                break;
-            }
-
-        }  // end foreach hosts
-
-        if (!is_resource($this->ldap->conn)) {
-            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Could not connect to any LDAP server, last tried $host"), true);
-
-            return false;
-        }
-
-        return $this->ready;
-    }
-
-
-    /**
-     * Close connection to LDAP server
-     */
-    function close()
-    {
-        if ($this->ldap) {
-            $this->ldap->close();
-        }
-    }
-
-
-    /**
-     * Returns address book name
-     *
-     * @return string Address book name
-     */
-    function get_name()
-    {
-        return $this->prop['name'];
-    }
-
-
-    /**
-     * Set internal list page
-     *
-     * @param  number  Page number to list
-     */
-    function set_page($page)
-    {
-        $this->list_page = (int)$page;
-        $this->ldap->set_vlv_page($this->list_page, $this->page_size);
-    }
-
-    /**
-     * Set internal page size
-     *
-     * @param  number  Number of records to display on one page
-     */
-    function set_pagesize($size)
-    {
-        $this->page_size = (int)$size;
-        $this->ldap->set_vlv_page($this->list_page, $this->page_size);
-    }
-
-
-    /**
-     * Set internal sort settings
-     *
-     * @param string $sort_col Sort column
-     * @param string $sort_order Sort order
-     */
-    function set_sort_order($sort_col, $sort_order = null)
-    {
-        if ($this->coltypes[$sort_col]['attributes'])
-            $this->sort_col = $this->coltypes[$sort_col]['attributes'][0];
-    }
-
-
-    /**
-     * Save a search string for future listings
-     *
-     * @param string $filter Filter string
-     */
-    function set_search_set($filter)
-    {
-        $this->filter = $filter;
-    }
-
-
-    /**
-     * Getter for saved search properties
-     *
-     * @return mixed Search properties used by this class
-     */
-    function get_search_set()
-    {
-        return $this->filter;
-    }
-
-
-    /**
-     * Reset all saved results and search parameters
-     */
-    function reset()
-    {
-        $this->result = null;
-        $this->ldap_result = null;
-        $this->filter = '';
-    }
-
-
-    /**
-     * List the current set of contact records
-     *
-     * @param  array  List of cols to show
-     * @param  int    Only return this number of records
-     *
-     * @return array  Indexed list of contact records, each a hash array
-     */
-    function list_records($cols=null, $subset=0)
-    {
-        if ($this->prop['searchonly'] && empty($this->filter) && !$this->group_id) {
-            $this->result = new rcube_result_set(0);
-            $this->result->searchonly = true;
-            return $this->result;
-        }
-
-        // fetch group members recursively
-        if ($this->group_id && $this->group_data['dn']) {
-            $entries = $this->list_group_members($this->group_data['dn']);
-
-            // make list of entries unique and sort it
-            $seen = array();
-            foreach ($entries as $i => $rec) {
-                if ($seen[$rec['dn']]++)
-                    unset($entries[$i]);
-            }
-            usort($entries, array($this, '_entry_sort_cmp'));
-
-            $entries['count'] = count($entries);
-            $this->result = new rcube_result_set($entries['count'], ($this->list_page-1) * $this->page_size);
-        }
-        else {
-            $prop    = $this->group_id ? $this->group_data : $this->prop;
-            $base_dn = $this->group_id ? $this->group_base_dn : $this->base_dn;
-
-            // use global search filter
-            if (!empty($this->filter))
-                $prop['filter'] = $this->filter;
-
-            // exec LDAP search if no result resource is stored
-            if ($this->ready && !$this->ldap_result)
-                $this->ldap_result = $this->ldap->search($base_dn, $prop['filter'], $prop['scope'], $this->prop['attributes'], $prop);
-
-            // count contacts for this user
-            $this->result = $this->count();
-
-            // we have a search result resource
-            if ($this->ldap_result && $this->result->count > 0) {
-                // sorting still on the ldap server
-                if ($this->sort_col && $prop['scope'] !== 'base' && !$this->ldap->vlv_active)
-                    $this->ldap_result->sort($this->sort_col);
-
-                // get all entries from the ldap server
-                $entries = $this->ldap_result->entries();
-            }
-
-        }  // end else
-
-        // start and end of the page
-        $start_row = $this->ldap->vlv_active ? 0 : $this->result->first;
-        $start_row = $subset < 0 ? $start_row + $this->page_size + $subset : $start_row;
-        $last_row = $this->result->first + $this->page_size;
-        $last_row = $subset != 0 ? $start_row + abs($subset) : $last_row;
-
-        // filter entries for this page
-        for ($i = $start_row; $i < min($entries['count'], $last_row); $i++)
-            $this->result->add($this->_ldap2result($entries[$i]));
-
-        return $this->result;
-    }
-
-    /**
-     * Get all members of the given group
-     *
-     * @param string  Group DN
-     * @param boolean Count only
-     * @param array   Group entries (if called recursively)
-     * @return array  Accumulated group members
-     */
-    function list_group_members($dn, $count = false, $entries = null)
-    {
-        $group_members = array();
-
-        // fetch group object
-        if (empty($entries)) {
-            $attribs = array_merge(array('dn','objectClass','memberURL'), array_values($this->group_types));
-            $entries = $this->ldap->read_entries($dn, '(objectClass=*)', $attribs);
-            if ($entries === false) {
-                return $group_members;
-            }
-        }
-
-        for ($i=0; $i < $entries['count']; $i++) {
-            $entry = $entries[$i];
-            $attrs = array();
-
-            foreach ((array)$entry['objectclass'] as $objectclass) {
-                if (($member_attr = $this->get_group_member_attr(array($objectclass), ''))
-                    && ($member_attr = strtolower($member_attr)) && !in_array($member_attr, $attrs)
-                ) {
-                    $members       = $this->_list_group_members($dn, $entry, $member_attr, $count);
-                    $group_members = array_merge($group_members, $members);
-                    $attrs[]       = $member_attr;
-                }
-                else if (!empty($entry['memberurl'])) {
-                    $members       = $this->_list_group_memberurl($dn, $entry, $count);
-                    $group_members = array_merge($group_members, $members);
-                }
-
-                if ($this->prop['sizelimit'] && count($group_members) > $this->prop['sizelimit']) {
-                    break 2;
-                }
-            }
-        }
-
-        return array_filter($group_members);
-    }
-
-    /**
-     * Fetch members of the given group entry from server
-     *
-     * @param string Group DN
-     * @param array  Group entry
-     * @param string Member attribute to use
-     * @param boolean Count only
-     * @return array Accumulated group members
-     */
-    private function _list_group_members($dn, $entry, $attr, $count)
-    {
-        // Use the member attributes to return an array of member ldap objects
-        // NOTE that the member attribute is supposed to contain a DN
-        $group_members = array();
-        if (empty($entry[$attr])) {
-            return $group_members;
-        }
-
-        // read these attributes for all members
-        $attrib = $count ? array('dn','objectClass') : $this->prop['list_attributes'];
-        $attrib = array_merge($attrib, array_values($this->group_types));
-        $attrib[] = 'memberURL';
-
-        $filter = $this->prop['groups']['member_filter'] ? $this->prop['groups']['member_filter'] : '(objectclass=*)';
-
-        for ($i=0; $i < $entry[$attr]['count']; $i++) {
-            if (empty($entry[$attr][$i]))
-                continue;
-
-            $members = $this->ldap->read_entries($entry[$attr][$i], $filter, $attrib);
-            if ($members == false) {
-                $members = array();
-            }
-
-            // for nested groups, call recursively
-            $nested_group_members = $this->list_group_members($entry[$attr][$i], $count, $members);
-
-            unset($members['count']);
-            $group_members = array_merge($group_members, array_filter($members), $nested_group_members);
-        }
-
-        return $group_members;
-    }
-
-    /**
-     * List members of group class groupOfUrls
-     *
-     * @param string Group DN
-     * @param array  Group entry
-     * @param boolean True if only used for counting
-     * @return array Accumulated group members
-     */
-    private function _list_group_memberurl($dn, $entry, $count)
-    {
-        $group_members = array();
-
-        for ($i=0; $i < $entry['memberurl']['count']; $i++) {
-            // extract components from url
-            if (!preg_match('!ldap:///([^\?]+)\?\?(\w+)\?(.*)$!', $entry['memberurl'][$i], $m))
-                continue;
-
-            // add search filter if any
-            $filter = $this->filter ? '(&(' . $m[3] . ')(' . $this->filter . '))' : $m[3];
-            $attrs = $count ? array('dn','objectClass') : $this->prop['list_attributes'];
-            if ($result = $this->ldap->search($m[1], $filter, $m[2], $attrs, $this->group_data)) {
-                $entries = $result->entries();
-                for ($j = 0; $j < $entries['count']; $j++) {
-                    if ($this->is_group_entry($entries[$j]) && ($nested_group_members = $this->list_group_members($entries[$j]['dn'], $count)))
-                        $group_members = array_merge($group_members, $nested_group_members);
-                    else
-                        $group_members[] = $entries[$j];
-                }
-            }
-        }
-
-        return $group_members;
-    }
-
-    /**
-     * Callback for sorting entries
-     */
-    function _entry_sort_cmp($a, $b)
-    {
-        return strcmp($a[$this->sort_col][0], $b[$this->sort_col][0]);
-    }
-
-
-    /**
-     * Search contacts
-     *
-     * @param mixed   $fields   The field name of array of field names to search in
-     * @param mixed   $value    Search value (or array of values when $fields is array)
-     * @param int     $mode     Matching mode:
-     *                          0 - partial (*abc*),
-     *                          1 - strict (=),
-     *                          2 - prefix (abc*)
-     * @param boolean $select   True if results are requested, False if count only
-     * @param boolean $nocount  (Not used)
-     * @param array   $required List of fields that cannot be empty
-     *
-     * @return array  Indexed list of contact records and 'count' value
-     */
-    function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array())
-    {
-        $mode = intval($mode);
-
-        // special treatment for ID-based search
-        if ($fields == 'ID' || $fields == $this->primary_key) {
-            $ids = !is_array($value) ? explode(',', $value) : $value;
-            $result = new rcube_result_set();
-            foreach ($ids as $id) {
-                if ($rec = $this->get_record($id, true)) {
-                    $result->add($rec);
-                    $result->count++;
-                }
-            }
-            return $result;
-        }
-
-        // use VLV pseudo-search for autocompletion
-        $rcube = rcube::get_instance();
-        $list_fields = $rcube->config->get('contactlist_fields');
-
-        if ($this->prop['vlv_search'] && $this->ready && join(',', (array)$fields) == join(',', $list_fields)) {
-            $this->result = new rcube_result_set(0);
-
-            $search_suffix = $this->prop['fuzzy_search'] && $mode != 1 ? '*' : '';
-            $ldap_data = $this->ldap->search($this->base_dn, $this->prop['filter'], $this->prop['scope'], $this->prop['attributes'],
-                array('search' => $value . $search_suffix /*, 'sort' => $this->prop['sort'] */));
-            if ($ldap_data === false) {
-                return $this->result;
-            }
-
-            // get all entries of this page and post-filter those that really match the query
-            $search = mb_strtolower($value);
-            foreach ($ldap_data as $i => $entry) {
-                $rec = $this->_ldap2result($entry);
-                foreach ($fields as $f) {
-                    foreach ((array)$rec[$f] as $val) {
-                        if ($this->compare_search_value($f, $val, $search, $mode)) {
-                            $this->result->add($rec);
-                            $this->result->count++;
-                            break 2;
-                        }
-                    }
-                }
-            }
-
-            return $this->result;
-        }
-
-        // use AND operator for advanced searches
-        $filter = is_array($value) ? '(&' : '(|';
-        // set wildcards
-        $wp = $ws = '';
-        if (!empty($this->prop['fuzzy_search']) && $mode != 1) {
-            $ws = '*';
-            if (!$mode) {
-                $wp = '*';
-            }
-        }
-
-        if ($fields == '*') {
-            // search_fields are required for fulltext search
-            if (empty($this->prop['search_fields'])) {
-                $this->set_error(self::ERROR_SEARCH, 'nofulltextsearch');
-                $this->result = new rcube_result_set();
-                return $this->result;
-            }
-            if (is_array($this->prop['search_fields'])) {
-                foreach ($this->prop['search_fields'] as $field) {
-                    $filter .= "($field=$wp" . rcube_ldap_generic::quote_string($value) . "$ws)";
-                }
-            }
-        }
-        else {
-            foreach ((array)$fields as $idx => $field) {
-                $val = is_array($value) ? $value[$idx] : $value;
-                if ($attrs = $this->_map_field($field)) {
-                    if (count($attrs) > 1)
-                        $filter .= '(|';
-                    foreach ($attrs as $f)
-                        $filter .= "($f=$wp" . rcube_ldap_generic::quote_string($val) . "$ws)";
-                    if (count($attrs) > 1)
-                        $filter .= ')';
-                }
-            }
-        }
-        $filter .= ')';
-
-        // add required (non empty) fields filter
-        $req_filter = '';
-        foreach ((array)$required as $field) {
-            if (in_array($field, (array)$fields))  // required field is already in search filter
-                continue;
-            if ($attrs = $this->_map_field($field)) {
-                if (count($attrs) > 1)
-                    $req_filter .= '(|';
-                foreach ($attrs as $f)
-                    $req_filter .= "($f=*)";
-                if (count($attrs) > 1)
-                    $req_filter .= ')';
-            }
-        }
-
-        if (!empty($req_filter))
-            $filter = '(&' . $req_filter . $filter . ')';
-
-        // avoid double-wildcard if $value is empty
-        $filter = preg_replace('/\*+/', '*', $filter);
-
-        // add general filter to query
-        if (!empty($this->prop['filter']))
-            $filter = '(&(' . preg_replace('/^\(|\)$/', '', $this->prop['filter']) . ')' . $filter . ')';
-
-        // set filter string and execute search
-        $this->set_search_set($filter);
-
-        if ($select)
-            $this->list_records();
-        else
-            $this->result = $this->count();
-
-        return $this->result;
-    }
-
-
-    /**
-     * Count number of available contacts in database
-     *
-     * @return object rcube_result_set Resultset with values for 'count' and 'first'
-     */
-    function count()
-    {
-        $count = 0;
-        if ($this->ldap_result) {
-            $count = $this->ldap_result->count();
-        }
-        else if ($this->group_id && $this->group_data['dn']) {
-            $count = count($this->list_group_members($this->group_data['dn'], true));
-        }
-        // We have a connection but no result set, attempt to get one.
-        else if ($this->ready) {
-            $prop    = $this->group_id ? $this->group_data : $this->prop;
-            $base_dn = $this->group_id ? $this->group_base_dn : $this->base_dn;
-
-            if (!empty($this->filter)) {  // Use global search filter
-                $prop['filter'] = $this->filter;
-            }
-            $count = $this->ldap->search($base_dn, $prop['filter'], $prop['scope'], array('dn'), $prop, true);
-        }
-
-        return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
-    }
-
-
-    /**
-     * Return the last result set
-     *
-     * @return object rcube_result_set Current resultset or NULL if nothing selected yet
-     */
-    function get_result()
-    {
-        return $this->result;
-    }
-
-
-    /**
-     * Get a specific contact record
-     *
-     * @param mixed   Record identifier
-     * @param boolean Return as associative array
-     *
-     * @return mixed  Hash array or rcube_result_set with all record fields
-     */
-    function get_record($dn, $assoc=false)
-    {
-        $res = $this->result = null;
-
-        if ($this->ready && $dn) {
-            $dn = self::dn_decode($dn);
-
-            if ($rec = $this->ldap->get_entry($dn)) {
-                $rec = array_change_key_case($rec, CASE_LOWER);
-            }
-
-            // Use ldap_list to get subentries like country (c) attribute (#1488123)
-            if (!empty($rec) && $this->sub_filter) {
-                if ($entries = $this->ldap->list_entries($dn, $this->sub_filter, array_keys($this->prop['sub_fields']))) {
-                    foreach ($entries as $entry) {
-                        $lrec = array_change_key_case($entry, CASE_LOWER);
-                        $rec  = array_merge($lrec, $rec);
-                    }
-                }
-            }
-
-            if (!empty($rec)) {
-                // Add in the dn for the entry.
-                $rec['dn'] = $dn;
-                $res = $this->_ldap2result($rec);
-                $this->result = new rcube_result_set(1);
-                $this->result->add($res);
-            }
-        }
-
-        return $assoc ? $res : $this->result;
-    }
-
-
-    /**
-     * Check the given data before saving.
-     * If input not valid, the message to display can be fetched using get_error()
-     *
-     * @param array Assoziative array with data to save
-     * @param boolean Try to fix/complete record automatically
-     * @return boolean True if input is valid, False if not.
-     */
-    public function validate(&$save_data, $autofix = false)
-    {
-        // validate e-mail addresses
-        if (!parent::validate($save_data, $autofix)) {
-            return false;
-        }
-
-        // check for name input
-        if (empty($save_data['name'])) {
-            $this->set_error(self::ERROR_VALIDATE, 'nonamewarning');
-            return false;
-        }
-
-        // Verify that the required fields are set.
-        $missing = null;
-        $ldap_data = $this->_map_data($save_data);
-        foreach ($this->prop['required_fields'] as $fld) {
-            if (!isset($ldap_data[$fld]) || $ldap_data[$fld] === '') {
-                $missing[$fld] = 1;
-            }
-        }
-
-        if ($missing) {
-            // try to complete record automatically
-            if ($autofix) {
-                $sn_field    = $this->fieldmap['surname'];
-                $fn_field    = $this->fieldmap['firstname'];
-                $mail_field  = $this->fieldmap['email'];
-
-                // try to extract surname and firstname from displayname
-                $name_parts  = preg_split('/[\s,.]+/', $save_data['name']);
-
-                if ($sn_field && $missing[$sn_field]) {
-                    $save_data['surname'] = array_pop($name_parts);
-                    unset($missing[$sn_field]);
-                }
-
-                if ($fn_field && $missing[$fn_field]) {
-                    $save_data['firstname'] = array_shift($name_parts);
-                    unset($missing[$fn_field]);
-                }
-
-                // try to fix missing e-mail, very often on import
-                // from vCard we have email:other only defined
-                if ($mail_field && $missing[$mail_field]) {
-                    $emails = $this->get_col_values('email', $save_data, true);
-                    if (!empty($emails) && ($email = array_shift($emails))) {
-                        $save_data['email'] = $email;
-                        unset($missing[$mail_field]);
-                    }
-                }
-            }
-
-            // TODO: generate message saying which fields are missing
-            if (!empty($missing)) {
-                $this->set_error(self::ERROR_VALIDATE, 'formincomplete');
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Create a new contact record
-     *
-     * @param array    Hash array with save data
-     *
-     * @return encoded record ID on success, False on error
-     */
-    function insert($save_cols)
-    {
-        // Map out the column names to their LDAP ones to build the new entry.
-        $newentry = $this->_map_data($save_cols);
-        $newentry['objectClass'] = $this->prop['LDAP_Object_Classes'];
-
-        // add automatically generated attributes
-        $this->add_autovalues($newentry);
-
-        // Verify that the required fields are set.
-        $missing = null;
-        foreach ($this->prop['required_fields'] as $fld) {
-            if (!isset($newentry[$fld])) {
-                $missing[] = $fld;
-            }
-        }
-
-        // abort process if requiered fields are missing
-        // TODO: generate message saying which fields are missing
-        if ($missing) {
-            $this->set_error(self::ERROR_VALIDATE, 'formincomplete');
-            return false;
-        }
-
-        // Build the new entries DN.
-        $dn = $this->prop['LDAP_rdn'].'='.rcube_ldap_generic::quote_string($newentry[$this->prop['LDAP_rdn']], true).','.$this->base_dn;
-
-        // Remove attributes that need to be added separately (child objects)
-        $xfields = array();
-        if (!empty($this->prop['sub_fields']) && is_array($this->prop['sub_fields'])) {
-            foreach (array_keys($this->prop['sub_fields']) as $xf) {
-                if (!empty($newentry[$xf])) {
-                    $xfields[$xf] = $newentry[$xf];
-                    unset($newentry[$xf]);
-                }
-            }
-        }
-
-        if (!$this->ldap->add($dn, $newentry)) {
-            $this->set_error(self::ERROR_SAVING, 'errorsaving');
-            return false;
-        }
-
-        foreach ($xfields as $xidx => $xf) {
-            $xdn = $xidx.'='.rcube_ldap_generic::quote_string($xf).','.$dn;
-            $xf = array(
-                $xidx => $xf,
-                'objectClass' => (array) $this->prop['sub_fields'][$xidx],
-            );
-
-            $this->ldap->add($xdn, $xf);
-        }
-
-        $dn = self::dn_encode($dn);
-
-        // add new contact to the selected group
-        if ($this->group_id)
-            $this->add_to_group($this->group_id, $dn);
-
-        return $dn;
-    }
-
-
-    /**
-     * Update a specific contact record
-     *
-     * @param mixed Record identifier
-     * @param array Hash array with save data
-     *
-     * @return boolean True on success, False on error
-     */
-    function update($id, $save_cols)
-    {
-        $record = $this->get_record($id, true);
-
-        $newdata     = array();
-        $replacedata = array();
-        $deletedata  = array();
-        $subdata     = array();
-        $subdeldata  = array();
-        $subnewdata  = array();
-
-        $ldap_data = $this->_map_data($save_cols);
-        $old_data  = $record['_raw_attrib'];
-
-        // special handling of photo col
-        if ($photo_fld = $this->fieldmap['photo']) {
-            // undefined means keep old photo
-            if (!array_key_exists('photo', $save_cols)) {
-                $ldap_data[$photo_fld] = $record['photo'];
-            }
-        }
-
-        foreach ($this->fieldmap as $fld) {
-            if ($fld) {
-                $val = $ldap_data[$fld];
-                $old = $old_data[$fld];
-                // remove empty array values
-                if (is_array($val))
-                    $val = array_filter($val);
-                // $this->_map_data() result and _raw_attrib use different format
-                // make sure comparing array with one element with a string works as expected
-                if (is_array($old) && count($old) == 1 && !is_array($val)) {
-                    $old = array_pop($old);
-                }
-                if (is_array($val) && count($val) == 1 && !is_array($old)) {
-                    $val = array_pop($val);
-                }
-                // Subentries must be handled separately
-                if (!empty($this->prop['sub_fields']) && isset($this->prop['sub_fields'][$fld])) {
-                    if ($old != $val) {
-                        if ($old !== null) {
-                            $subdeldata[$fld] = $old;
-                        }
-                        if ($val) {
-                            $subnewdata[$fld] = $val;
-                        }
-                    }
-                    else if ($old !== null) {
-                        $subdata[$fld] = $old;
-                    }
-                    continue;
-                }
-
-                // The field does exist compare it to the ldap record.
-                if ($old != $val) {
-                    // Changed, but find out how.
-                    if ($old === null) {
-                        // Field was not set prior, need to add it.
-                        $newdata[$fld] = $val;
-                    }
-                    else if ($val == '') {
-                        // Field supplied is empty, verify that it is not required.
-                        if (!in_array($fld, $this->prop['required_fields'])) {
-                            // ...It is not, safe to clear.
-                            // #1488420: Workaround "ldap_mod_del(): Modify: Inappropriate matching in..."
-                            // jpegPhoto attribute require an array() here. It looks to me that it works for other attribs too
-                            $deletedata[$fld] = array();
-                            //$deletedata[$fld] = $old_data[$fld];
-                        }
-                    }
-                    else {
-                        // The data was modified, save it out.
-                        $replacedata[$fld] = $val;
-                    }
-                } // end if
-            } // end if
-        } // end foreach
-
-        // console($old_data, $ldap_data, '----', $newdata, $replacedata, $deletedata, '----', $subdata, $subnewdata, $subdeldata);
-
-        $dn = self::dn_decode($id);
-
-        // Update the entry as required.
-        if (!empty($deletedata)) {
-            // Delete the fields.
-            if (!$this->ldap->mod_del($dn, $deletedata)) {
-                $this->set_error(self::ERROR_SAVING, 'errorsaving');
-                return false;
-            }
-        } // end if
-
-        if (!empty($replacedata)) {
-            // Handle RDN change
-            if ($replacedata[$this->prop['LDAP_rdn']]) {
-                $newdn = $this->prop['LDAP_rdn'].'='
-                    .rcube_ldap_generic::quote_string($replacedata[$this->prop['LDAP_rdn']], true)
-                    .','.$this->base_dn;
-                if ($dn != $newdn) {
-                    $newrdn = $this->prop['LDAP_rdn'].'='
-                    .rcube_ldap_generic::quote_string($replacedata[$this->prop['LDAP_rdn']], true);
-                    unset($replacedata[$this->prop['LDAP_rdn']]);
-                }
-            }
-            // Replace the fields.
-            if (!empty($replacedata)) {
-                if (!$this->ldap->mod_replace($dn, $replacedata)) {
-                    $this->set_error(self::ERROR_SAVING, 'errorsaving');
-                    return false;
-                }
-            }
-        } // end if
-
-        // RDN change, we need to remove all sub-entries
-        if (!empty($newrdn)) {
-            $subdeldata = array_merge($subdeldata, $subdata);
-            $subnewdata = array_merge($subnewdata, $subdata);
-        }
-
-        // remove sub-entries
-        if (!empty($subdeldata)) {
-            foreach ($subdeldata as $fld => $val) {
-                $subdn = $fld.'='.rcube_ldap_generic::quote_string($val).','.$dn;
-                if (!$this->ldap->delete($subdn)) {
-                    return false;
-                }
-            }
-        }
-
-        if (!empty($newdata)) {
-            // Add the fields.
-            if (!$this->ldap->mod_add($dn, $newdata)) {
-                $this->set_error(self::ERROR_SAVING, 'errorsaving');
-                return false;
-            }
-        } // end if
-
-        // Handle RDN change
-        if (!empty($newrdn)) {
-            if (!$this->ldap->rename($dn, $newrdn, null, true)) {
-                $this->set_error(self::ERROR_SAVING, 'errorsaving');
-                return false;
-            }
-
-            $dn    = self::dn_encode($dn);
-            $newdn = self::dn_encode($newdn);
-
-            // change the group membership of the contact
-            if ($this->groups) {
-                $group_ids = $this->get_record_groups($dn);
-                foreach (array_keys($group_ids) as $group_id) {
-                    $this->remove_from_group($group_id, $dn);
-                    $this->add_to_group($group_id, $newdn);
-                }
-            }
-
-            $dn = self::dn_decode($newdn);
-        }
-
-        // add sub-entries
-        if (!empty($subnewdata)) {
-            foreach ($subnewdata as $fld => $val) {
-                $subdn = $fld.'='.rcube_ldap_generic::quote_string($val).','.$dn;
-                $xf = array(
-                    $fld => $val,
-                    'objectClass' => (array) $this->prop['sub_fields'][$fld],
-                );
-                $this->ldap->add($subdn, $xf);
-            }
-        }
-
-        return $newdn ? $newdn : true;
-    }
-
-
-    /**
-     * Mark one or more contact records as deleted
-     *
-     * @param array   Record identifiers
-     * @param boolean Remove record(s) irreversible (unsupported)
-     *
-     * @return boolean True on success, False on error
-     */
-    function delete($ids, $force=true)
-    {
-        if (!is_array($ids)) {
-            // Not an array, break apart the encoded DNs.
-            $ids = explode(',', $ids);
-        } // end if
-
-        foreach ($ids as $id) {
-            $dn = self::dn_decode($id);
-
-            // Need to delete all sub-entries first
-            if ($this->sub_filter) {
-                if ($entries = $this->ldap->list_entries($dn, $this->sub_filter)) {
-                    foreach ($entries as $entry) {
-                        if (!$this->ldap->delete($entry['dn'])) {
-                            $this->set_error(self::ERROR_SAVING, 'errorsaving');
-                            return false;
-                        }
-                    }
-                }
-            }
-
-            // Delete the record.
-            if (!$this->ldap->delete($dn)) {
-                $this->set_error(self::ERROR_SAVING, 'errorsaving');
-                return false;
-            }
-
-            // remove contact from all groups where he was member
-            if ($this->groups) {
-                $dn = self::dn_encode($dn);
-                $group_ids = $this->get_record_groups($dn);
-                foreach (array_keys($group_ids) as $group_id) {
-                    $this->remove_from_group($group_id, $dn);
-                }
-            }
-        } // end foreach
-
-        return count($ids);
-    }
-
-
-    /**
-     * Remove all contact records
-     */
-    function delete_all()
-    {
-        // searching for contact entries
-        $dn_list = $this->ldap->list_entries($this->base_dn, $this->prop['filter'] ? $this->prop['filter'] : '(objectclass=*)');
-
-        if (!empty($dn_list)) {
-            foreach ($dn_list as $idx => $entry) {
-                $dn_list[$idx] = self::dn_encode($entry['dn']);
-            }
-            $this->delete($dn_list);
-        }
-    }
-
-    /**
-     * Generate missing attributes as configured
-     *
-     * @param array LDAP record attributes
-     */
-    protected function add_autovalues(&$attrs)
-    {
-        if (empty($this->prop['autovalues'])) {
-            return;
-        }
-
-        $attrvals = array();
-        foreach ($attrs as $k => $v) {
-            $attrvals['{'.$k.'}'] = is_array($v) ? $v[0] : $v;
-        }
-
-        foreach ((array)$this->prop['autovalues'] as $lf => $templ) {
-            if (empty($attrs[$lf])) {
-                if (strpos($templ, '(') !== false) {
-                    // replace {attr} placeholders with (escaped!) attribute values to be safely eval'd
-                    $code = preg_replace('/\{\w+\}/', '', strtr($templ, array_map('addslashes', $attrvals)));
-                    $fn   = create_function('', "return ($code);");
-                    if (!$fn) {
-                        rcube::raise_error(array(
-                            'code' => 505, 'type' => 'php',
-                            'file' => __FILE__, 'line' => __LINE__,
-                            'message' => "Expression parse error on: ($code)"), true, false);
-                        continue;
-                    }
-
-                    $attrs[$lf] = $fn();
-                }
-                else {
-                    // replace {attr} placeholders with concrete attribute values
-                    $attrs[$lf] = preg_replace('/\{\w+\}/', '', strtr($templ, $attrvals));
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Converts LDAP entry into an array
-     */
-    private function _ldap2result($rec)
-    {
-        $out = array('_type' => 'person');
-        $fieldmap = $this->fieldmap;
-
-        if ($rec['dn'])
-            $out[$this->primary_key] = self::dn_encode($rec['dn']);
-
-        // determine record type
-        if ($this->is_group_entry($rec)) {
-            $out['_type'] = 'group';
-            $out['readonly'] = true;
-            $fieldmap['name'] = $this->group_data['name_attr'] ? $this->group_data['name_attr'] : $this->prop['groups']['name_attr'];
-        }
-
-        foreach ($fieldmap as $rf => $lf)
-        {
-            for ($i=0; $i < $rec[$lf]['count']; $i++) {
-                if (!($value = $rec[$lf][$i]))
-                    continue;
-
-                list($col, $subtype) = explode(':', $rf);
-                $out['_raw_attrib'][$lf][$i] = $value;
-
-                if ($col == 'email' && $this->mail_domain && !strpos($value, '@'))
-                    $out[$rf][] = sprintf('%s@%s', $value, $this->mail_domain);
-                else if (in_array($col, array('street','zipcode','locality','country','region')))
-                    $out['address'.($subtype?':':'').$subtype][$i][$col] = $value;
-                else if ($col == 'address' && strpos($value, '$') !== false)  // address data is represented as string separated with $
-                    list($out[$rf][$i]['street'], $out[$rf][$i]['locality'], $out[$rf][$i]['zipcode'], $out[$rf][$i]['country']) = explode('$', $value);
-                else if ($rec[$lf]['count'] > 1)
-                    $out[$rf][] = $value;
-                else
-                    $out[$rf] = $value;
-            }
-
-            // Make sure name fields aren't arrays (#1488108)
-            if (is_array($out[$rf]) && in_array($rf, array('name', 'surname', 'firstname', 'middlename', 'nickname'))) {
-                $out[$rf] = $out['_raw_attrib'][$lf] = $out[$rf][0];
-            }
-        }
-
-        return $out;
-    }
-
-
-    /**
-     * Return LDAP attribute(s) for the given field
-     */
-    private function _map_field($field)
-    {
-        return (array)$this->coltypes[$field]['attributes'];
-    }
-
-
-    /**
-     * Convert a record data set into LDAP field attributes
-     */
-    private function _map_data($save_cols)
-    {
-        // flatten composite fields first
-        foreach ($this->coltypes as $col => $colprop) {
-            if (is_array($colprop['childs']) && ($values = $this->get_col_values($col, $save_cols, false))) {
-                foreach ($values as $subtype => $childs) {
-                    $subtype = $subtype ? ':'.$subtype : '';
-                    foreach ($childs as $i => $child_values) {
-                        foreach ((array)$child_values as $childcol => $value) {
-                            $save_cols[$childcol.$subtype][$i] = $value;
-                        }
-                    }
-                }
-            }
-
-            // if addresses are to be saved as serialized string, do so
-            if (is_array($colprop['serialized'])) {
-               foreach ($colprop['serialized'] as $subtype => $delim) {
-                  $key = $col.':'.$subtype;
-                  foreach ((array)$save_cols[$key] as $i => $val) {
-                     $values = array($val['street'], $val['locality'], $val['zipcode'], $val['country']);
-                     $save_cols[$key][$i] = count(array_filter($values)) ? join($delim, $values) : null;
-                 }
-               }
-            }
-        }
-
-        $ldap_data = array();
-        foreach ($this->fieldmap as $rf => $fld) {
-            $val = $save_cols[$rf];
-
-            // check for value in base field (eg.g email instead of email:foo)
-            list($col, $subtype) = explode(':', $rf);
-            if (!$val && !empty($save_cols[$col])) {
-                $val = $save_cols[$col];
-                unset($save_cols[$col]);  // only use this value once
-            }
-            else if (!$val && !$subtype) { // extract values from subtype cols
-                $val = $this->get_col_values($col, $save_cols, true);
-            }
-
-            if (is_array($val))
-                $val = array_filter($val);  // remove empty entries
-            if ($fld && $val) {
-                // The field does exist, add it to the entry.
-                $ldap_data[$fld] = $val;
-            }
-        }
-
-        return $ldap_data;
-    }
-
-
-    /**
-     * Returns unified attribute name (resolving aliases)
-     */
-    private static function _attr_name($namev)
-    {
-        // list of known attribute aliases
-        static $aliases = array(
-            'gn'            => 'givenname',
-            'rfc822mailbox' => 'email',
-            'userid'        => 'uid',
-            'emailaddress'  => 'email',
-            'pkcs9email'    => 'email',
-        );
-
-        list($name, $limit) = explode(':', $namev, 2);
-        $suffix = $limit ? ':'.$limit : '';
-
-        return (isset($aliases[$name]) ? $aliases[$name] : $name) . $suffix;
-    }
-
-    /**
-     * Determines whether the given LDAP entry is a group record
-     */
-    private function is_group_entry($entry)
-    {
-        $classes = array_map('strtolower', (array)$entry['objectclass']);
-
-        return count(array_intersect(array_keys($this->group_types), $classes)) > 0;
-    }
-
-    /**
-     * Prints debug info to the log
-     */
-    private function _debug($str)
-    {
-        if ($this->debug) {
-            rcube::write_log('ldap', $str);
-        }
-    }
-
-
-    /**
-     * Activate/deactivate debug mode
-     *
-     * @param boolean $dbg True if LDAP commands should be logged
-     */
-    function set_debug($dbg = true)
-    {
-        $this->debug = $dbg;
-
-        if ($this->ldap) {
-            $this->ldap->set_debug($dbg);
-        }
-    }
-
-
-    /**
-     * Setter for the current group
-     */
-    function set_group($group_id)
-    {
-        if ($group_id) {
-            $this->group_id = $group_id;
-            $this->group_data = $this->get_group_entry($group_id);
-        }
-        else {
-            $this->group_id = 0;
-            $this->group_data = null;
-        }
-    }
-
-    /**
-     * List all active contact groups of this source
-     *
-     * @param string  Optional search string to match group name
-     * @param int     Matching mode:
-     *                0 - partial (*abc*),
-     *                1 - strict (=),
-     *                2 - prefix (abc*)
-     *
-     * @return array  Indexed list of contact groups, each a hash array
-     */
-    function list_groups($search = null, $mode = 0)
-    {
-        if (!$this->groups) {
-            return array();
-        }
-
-        $group_cache = $this->_fetch_groups();
-        $groups      = array();
-
-        if ($search) {
-            foreach ($group_cache as $group) {
-                if ($this->compare_search_value('name', $group['name'], $search, $mode)) {
-                    $groups[] = $group;
-                }
-            }
-        }
-        else {
-            $groups = $group_cache;
-        }
-
-        return array_values($groups);
-    }
-
-    /**
-     * Fetch groups from server
-     */
-    private function _fetch_groups($vlv_page = null)
-    {
-        // special case: list groups from 'group_filters' config
-        if ($vlv_page === null && !empty($this->prop['group_filters'])) {
-            $groups = array();
-
-            // list regular groups configuration as special filter
-            if (!empty($this->prop['groups']['filter'])) {
-                $id = '__groups__';
-                $groups[$id] = array('ID' => $id, 'name' => rcube_label('groups'), 'virtual' => true) + $this->prop['groups'];
-            }
-
-            foreach ($this->prop['group_filters'] as $id => $prop) {
-                $groups[$id] = $prop + array('ID' => $id, 'name' => ucfirst($id), 'virtual' => true, 'base_dn' => $this->base_dn);
-            }
-
-            return $groups;
-        }
-
-        if ($this->cache && $vlv_page === null && ($groups = $this->cache->get('groups')) !== null) {
-            return $groups;
-        }
-
-        $base_dn    = $this->groups_base_dn;
-        $filter     = $this->prop['groups']['filter'];
-        $scope      = $this->prop['groups']['scope'];
-        $name_attr  = $this->prop['groups']['name_attr'];
-        $email_attr = $this->prop['groups']['email_attr'] ? $this->prop['groups']['email_attr'] : 'mail';
-        $sort_attrs = $this->prop['groups']['sort'] ? (array)$this->prop['groups']['sort'] : array($name_attr);
-        $sort_attr  = $sort_attrs[0];
-
-        $ldap = $this->ldap;
-
-        // use vlv to list groups
-        if ($this->prop['groups']['vlv']) {
-            $page_size = 200;
-            if (!$this->prop['groups']['sort']) {
-                $this->prop['groups']['sort'] = $sort_attrs;
-            }
-
-            $ldap = clone $this->ldap;
-            $ldap->set_config($this->prop['groups']);
-            $ldap->set_vlv_page($vlv_page+1, $page_size);
-        }
-
-        $attrs     = array_unique(array('dn', 'objectClass', $name_attr, $email_attr, $sort_attr));
-        $ldap_data = $ldap->search($base_dn, $filter, $scope, $attrs, $this->prop['groups']);
-
-        if ($ldap_data === false) {
-            return array();
-        }
-
-        $groups          = array();
-        $group_sortnames = array();
-        $group_count     = $ldap_data->count();
-
-        foreach ($ldap_data as $entry) {
-            if (!$entry['dn'])  // DN is mandatory
-                $entry['dn'] = $ldap_data->get_dn();
-
-            $group_name = is_array($entry[$name_attr]) ? $entry[$name_attr][0] : $entry[$name_attr];
-            $group_id = self::dn_encode($entry['dn']);
-            $groups[$group_id]['ID'] = $group_id;
-            $groups[$group_id]['dn'] = $entry['dn'];
-            $groups[$group_id]['name'] = $group_name;
-            $groups[$group_id]['member_attr'] = $this->get_group_member_attr($entry['objectclass']);
-
-            // list email attributes of a group
-            for ($j=0; $entry[$email_attr] && $j < $entry[$email_attr]['count']; $j++) {
-                if (strpos($entry[$email_attr][$j], '@') > 0)
-                    $groups[$group_id]['email'][] = $entry[$email_attr][$j];
-            }
-
-            $group_sortnames[] = mb_strtolower($entry[$sort_attr][0]);
-        }
-
-        // recursive call can exit here
-        if ($vlv_page > 0) {
-            return $groups;
-        }
-
-        // call recursively until we have fetched all groups
-        while ($this->prop['groups']['vlv'] && $group_count == $page_size) {
-            $next_page   = $this->_fetch_groups(++$vlv_page);
-            $groups      = array_merge($groups, $next_page);
-            $group_count = count($next_page);
-        }
-
-        // when using VLV the list of groups is already sorted
-        if (!$this->prop['groups']['vlv']) {
-            array_multisort($group_sortnames, SORT_ASC, SORT_STRING, $groups);
-        }
-
-        // cache this
-        if ($this->cache) {
-            $this->cache->set('groups', $groups);
-        }
-
-        return $groups;
-    }
-
-    /**
-     * Fetch a group entry from LDAP and save in local cache
-     */
-    private function get_group_entry($group_id)
-    {
-        $group_cache = $this->_fetch_groups();
-
-        // add group record to cache if it isn't yet there
-        if (!isset($group_cache[$group_id])) {
-            $name_attr = $this->prop['groups']['name_attr'];
-            $dn = self::dn_decode($group_id);
-
-            if ($list = $this->ldap->read_entries($dn, '(objectClass=*)', array('dn','objectClass','member','uniqueMember','memberURL',$name_attr,$this->fieldmap['email']))) {
-                $entry = $list[0];
-                $group_name = is_array($entry[$name_attr]) ? $entry[$name_attr][0] : $entry[$name_attr];
-                $group_cache[$group_id]['ID'] = $group_id;
-                $group_cache[$group_id]['dn'] = $dn;
-                $group_cache[$group_id]['name'] = $group_name;
-                $group_cache[$group_id]['member_attr'] = $this->get_group_member_attr($entry['objectclass']);
-            }
-            else {
-                $group_cache[$group_id] = false;
-            }
-
-            if ($this->cache) {
-                $this->cache->set('groups', $group_cache);
-            }
-        }
-
-        return $group_cache[$group_id];
-    }
-
-    /**
-     * Get group properties such as name and email address(es)
-     *
-     * @param string Group identifier
-     * @return array Group properties as hash array
-     */
-    function get_group($group_id)
-    {
-        $group_data = $this->get_group_entry($group_id);
-        unset($group_data['dn'], $group_data['member_attr']);
-
-        return $group_data;
-    }
-
-    /**
-     * Create a contact group with the given name
-     *
-     * @param string The group name
-     * @return mixed False on error, array with record props in success
-     */
-    function create_group($group_name)
-    {
-        $new_dn      = 'cn=' . rcube_ldap_generic::quote_string($group_name, true) . ',' . $this->groups_base_dn;
-        $new_gid     = self::dn_encode($new_dn);
-        $member_attr = $this->get_group_member_attr();
-        $name_attr   = $this->prop['groups']['name_attr'] ? $this->prop['groups']['name_attr'] : 'cn';
-        $new_entry   = array(
-            'objectClass' => $this->prop['groups']['object_classes'],
-            $name_attr => $group_name,
-            $member_attr => '',
-        );
-
-        if (!$this->ldap->add($new_dn, $new_entry)) {
-            $this->set_error(self::ERROR_SAVING, 'errorsaving');
-            return false;
-        }
-
-        if ($this->cache) {
-            $this->cache->remove('groups');
-        }
-
-        return array('id' => $new_gid, 'name' => $group_name);
-    }
-
-    /**
-     * Delete the given group and all linked group members
-     *
-     * @param string Group identifier
-     * @return boolean True on success, false if no data was changed
-     */
-    function delete_group($group_id)
-    {
-        $group_cache = $this->_fetch_groups();
-        $del_dn      = $group_cache[$group_id]['dn'];
-
-        if (!$this->ldap->delete($del_dn)) {
-            $this->set_error(self::ERROR_SAVING, 'errorsaving');
-            return false;
-        }
-
-        if ($this->cache) {
-            unset($group_cache[$group_id]);
-            $this->cache->set('groups', $group_cache);
-        }
-
-        return true;
-    }
-
-    /**
-     * Rename a specific contact group
-     *
-     * @param string Group identifier
-     * @param string New name to set for this group
-     * @param string New group identifier (if changed, otherwise don't set)
-     * @return boolean New name on success, false if no data was changed
-     */
-    function rename_group($group_id, $new_name, &$new_gid)
-    {
-        $group_cache = $this->_fetch_groups();
-        $old_dn      = $group_cache[$group_id]['dn'];
-        $new_rdn     = "cn=" . rcube_ldap_generic::quote_string($new_name, true);
-        $new_gid     = self::dn_encode($new_rdn . ',' . $this->groups_base_dn);
-
-        if (!$this->ldap->rename($old_dn, $new_rdn, null, true)) {
-            $this->set_error(self::ERROR_SAVING, 'errorsaving');
-            return false;
-        }
-
-        if ($this->cache) {
-            $this->cache->remove('groups');
-        }
-
-        return $new_name;
-    }
-
-    /**
-     * Add the given contact records the a certain group
-     *
-     * @param string       Group identifier
-     * @param array|string List of contact identifiers to be added
-     *
-     * @return int Number of contacts added
-     */
-    function add_to_group($group_id, $contact_ids)
-    {
-        $group_cache = $this->_fetch_groups();
-        $member_attr = $group_cache[$group_id]['member_attr'];
-        $group_dn    = $group_cache[$group_id]['dn'];
-        $new_attrs   = array();
-
-        if (!is_array($contact_ids)) {
-            $contact_ids = explode(',', $contact_ids);
-        }
-
-        foreach ($contact_ids as $id) {
-            $new_attrs[$member_attr][] = self::dn_decode($id);
-        }
-
-        if (!$this->ldap->mod_add($group_dn, $new_attrs)) {
-            $this->set_error(self::ERROR_SAVING, 'errorsaving');
-            return 0;
-        }
-
-        if ($this->cache) {
-            $this->cache->remove('groups');
-        }
-
-        return count($new_attrs[$member_attr]);
-    }
-
-    /**
-     * Remove the given contact records from a certain group
-     *
-     * @param string       Group identifier
-     * @param array|string List of contact identifiers to be removed
-     *
-     * @return int Number of deleted group members
-     */
-    function remove_from_group($group_id, $contact_ids)
-    {
-        $group_cache = $this->_fetch_groups();
-        $member_attr = $group_cache[$group_id]['member_attr'];
-        $group_dn    = $group_cache[$group_id]['dn'];
-        $del_attrs   = array();
-
-        if (!is_array($contact_ids)) {
-            $contact_ids = explode(',', $contact_ids);
-        }
-
-        foreach ($contact_ids as $id) {
-            $del_attrs[$member_attr][] = self::dn_decode($id);
-        }
-
-        if (!$this->ldap->mod_del($group_dn, $del_attrs)) {
-            $this->set_error(self::ERROR_SAVING, 'errorsaving');
-            return 0;
-        }
-
-        if ($this->cache) {
-            $this->cache->remove('groups');
-        }
-
-        return count($del_attrs[$member_attr]);
-    }
-
-    /**
-     * Get group assignments of a specific contact record
-     *
-     * @param mixed Record identifier
-     *
-     * @return array List of assigned groups as ID=>Name pairs
-     * @since 0.5-beta
-     */
-    function get_record_groups($contact_id)
-    {
-        if (!$this->groups) {
-            return array();
-        }
-
-        $base_dn     = $this->groups_base_dn;
-        $contact_dn  = self::dn_decode($contact_id);
-        $name_attr   = $this->prop['groups']['name_attr'] ? $this->prop['groups']['name_attr'] : 'cn';
-        $member_attr = $this->get_group_member_attr();
-        $add_filter  = '';
-
-        if ($member_attr != 'member' && $member_attr != 'uniqueMember')
-            $add_filter = "($member_attr=$contact_dn)";
-        $filter = strtr("(|(member=$contact_dn)(uniqueMember=$contact_dn)$add_filter)", array('\\' => '\\\\'));
-
-        $ldap_data = $this->ldap->search($base_dn, $filter, 'sub', array('dn', $name_attr));
-        if ($res === false) {
-            return array();
-        }
-
-        $groups = array();
-        foreach ($ldap_data as $entry) {
-            if (!$entry['dn'])
-                $entry['dn'] = $ldap_data->get_dn();
-            $group_name = $entry[$name_attr][0];
-            $group_id = self::dn_encode($entry['dn']);
-            $groups[$group_id] = $group_name;
-        }
-
-        return $groups;
-    }
-
-    /**
-     * Detects group member attribute name
-     */
-    private function get_group_member_attr($object_classes = array(), $default = 'member')
-    {
-        if (empty($object_classes)) {
-            $object_classes = $this->prop['groups']['object_classes'];
-        }
-
-        if (!empty($object_classes)) {
-            foreach ((array)$object_classes as $oc) {
-                if ($attr = $this->group_types[strtolower($oc)]) {
-                    return $attr;
-                }
-            }
-        }
-
-        if (!empty($this->prop['groups']['member_attr'])) {
-            return $this->prop['groups']['member_attr'];
-        }
-
-        return $default;
-    }
-
-
-    /**
-     * HTML-safe DN string encoding
-     *
-     * @param string $str DN string
-     *
-     * @return string Encoded HTML identifier string
-     */
-    static function dn_encode($str)
-    {
-        // @TODO: to make output string shorter we could probably
-        //        remove dc=* items from it
-        return rtrim(strtr(base64_encode($str), '+/', '-_'), '=');
-    }
-
-    /**
-     * Decodes DN string encoded with _dn_encode()
-     *
-     * @param string $str Encoded HTML identifier string
-     *
-     * @return string DN string
-     */
-    static function dn_decode($str)
-    {
-        $str = str_pad(strtr($str, '-_', '+/'), strlen($str) % 4, '=', STR_PAD_RIGHT);
-        return base64_decode($str);
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_ldap_generic.php b/lib/ext/Roundcube/rcube_ldap_generic.php
deleted file mode 100644
index 923a12a..0000000
--- a/lib/ext/Roundcube/rcube_ldap_generic.php
+++ /dev/null
@@ -1,1055 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | Roundcube/rcube_ldap_generic.php                                      |
- |                                                                       |
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2013, The Roundcube Dev Team                       |
- | Copyright (C) 2012-2013, Kolab Systems AG                             |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Provide basic functionality for accessing LDAP directories          |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- |         Aleksander Machniak <machniak@kolabsys.com>                   |
- +-----------------------------------------------------------------------+
-*/
-
-
-/*
-  LDAP connection properties
-  --------------------------
-
-  $prop = array(
-      'host'            => '<ldap-server-address>',
-      // or
-      'hosts'           => array('directory.verisign.com'),
-      'port'            => 389,
-      'use_tls'         => true|false,
-      'ldap_version'    => 3,             // using LDAPv3
-      'auth_method'     => '',            // SASL authentication method (for proxy auth), e.g. DIGEST-MD5
-      'attributes'      => array('dn'),   // List of attributes to read from the server
-      'vlv'             => false,         // Enable Virtual List View to more efficiently fetch paginated data (if server supports it)
-      'config_root_dn'  => 'cn=config',   // Root DN to read config (e.g. vlv indexes) from
-      'numsub_filter'   => '(objectClass=organizationalUnit)',   // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting
-      'sizelimit'       => '0',           // Enables you to limit the count of entries fetched. Setting this to 0 means no limit.
-      'timelimit'       => '0',           // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit.
-      'network_timeout' => 10,            // The timeout (in seconds) for connect + bind arrempts. This is only supported in PHP >= 5.3.0 with OpenLDAP 2.x
-      'referrals'       => true|false,    // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups
-  );
-*/
-
-/**
- * Model class to access an LDAP directories
- *
- * @package    Framework
- * @subpackage LDAP
- */
-class rcube_ldap_generic
-{
-    const UPDATE_MOD_ADD = 1;
-    const UPDATE_MOD_DELETE = 2;
-    const UPDATE_MOD_REPLACE = 4;
-    const UPDATE_MOD_FULL = 7;
-
-    public $conn;
-    public $vlv_active = false;
-
-    /** private properties */
-    protected $cache = null;
-    protected $config = array();
-    protected $attributes = array('dn');
-    protected $entries = null;
-    protected $result = null;
-    protected $debug = false;
-    protected $list_page = 1;
-    protected $page_size = 10;
-    protected $vlv_config = null;
-
-
-    /**
-    * Object constructor
-    *
-    * @param array $p LDAP connection properties
-    */
-    function __construct($p)
-    {
-        $this->config = $p;
-
-        if (is_array($p['attributes']))
-            $this->attributes = $p['attributes'];
-
-        if (!is_array($p['hosts']) && !empty($p['host']))
-            $this->config['hosts'] = array($p['host']);
-    }
-
-    /**
-     * Activate/deactivate debug mode
-     *
-     * @param boolean $dbg True if LDAP commands should be logged
-     */
-    public function set_debug($dbg = true)
-    {
-        $this->debug = $dbg;
-    }
-
-    /**
-     * Set connection options
-     *
-     * @param mixed $opt Option name as string or hash array with multiple options
-     * @param mixed $val Option value
-     */
-    public function set_config($opt, $val = null)
-    {
-        if (is_array($opt))
-            $this->config = array_merge($this->config, $opt);
-        else
-            $this->config[$opt] = $value;
-    }
-
-    /**
-     * Enable caching by passing an instance of rcube_cache to be used by this object
-     *
-     * @param object rcube_cache Instance or False to disable caching
-     */
-    public function set_cache($cache_engine)
-    {
-        $this->cache = $cache_engine;
-    }
-
-    /**
-     * Set properties for VLV-based paging
-     *
-     * @param  number $page  Page number to list (starting at 1)
-     * @param  number $size  Number of entries to display on one page
-     */
-    public function set_vlv_page($page, $size = 10)
-    {
-        $this->list_page = $page;
-        $this->page_size = $size;
-    }
-
-    /**
-    * Establish a connection to the LDAP server
-    */
-    public function connect($host = null)
-    {
-        if (!function_exists('ldap_connect')) {
-            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "No ldap support in this installation of PHP"),
-                true);
-            return false;
-        }
-
-        if (is_resource($this->conn) && $this->config['host'] == $host)
-            return true;
-
-        if (empty($this->config['ldap_version']))
-            $this->config['ldap_version'] = 3;
-
-        // iterate over hosts if none specified
-        if (!$host) {
-            if (!is_array($this->config['hosts']))
-                $this->config['hosts'] = array($this->config['hosts']);
-
-            foreach ($this->config['hosts'] as $host) {
-                if ($this->connect($host)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        // open connection to the given $host
-        $host     = rcube_utils::idn_to_ascii(rcube_utils::parse_host($host));
-        $hostname = $host . ($this->config['port'] ? ':'.$this->config['port'] : '');
-
-        $this->_debug("C: Connect to $hostname [{$this->config['name']}]");
-
-        if ($lc = @ldap_connect($host, $this->config['port'])) {
-            if ($this->config['use_tls'] === true)
-                if (!ldap_start_tls($lc))
-                    continue;
-
-            $this->_debug("S: OK");
-
-            ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, $this->config['ldap_version']);
-            $this->config['host'] = $host;
-            $this->conn = $lc;
-
-            if (!empty($this->config['network_timeout']))
-              ldap_set_option($lc, LDAP_OPT_NETWORK_TIMEOUT, $this->config['network_timeout']);
-
-            if (isset($this->config['referrals']))
-                ldap_set_option($lc, LDAP_OPT_REFERRALS, $this->config['referrals']);
-        }
-        else {
-            $this->_debug("S: NOT OK");
-        }
-
-        if (!is_resource($this->conn)) {
-            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Could not connect to any LDAP server, last tried $hostname"),
-                true);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Bind connection with (SASL-) user and password
-     *
-     * @param string $authc Authentication user
-     * @param string $pass  Bind password
-     * @param string $authz Autorization user
-     *
-     * @return boolean True on success, False on error
-     */
-    public function sasl_bind($authc, $pass, $authz=null)
-    {
-        if (!$this->conn) {
-            return false;
-        }
-
-        if (!function_exists('ldap_sasl_bind')) {
-            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Unable to bind: ldap_sasl_bind() not exists"),
-                true);
-            return false;
-        }
-
-        if (!empty($authz)) {
-            $authz = 'u:' . $authz;
-        }
-
-        if (!empty($this->config['auth_method'])) {
-            $method = $this->config['auth_method'];
-        }
-        else {
-            $method = 'DIGEST-MD5';
-        }
-
-        $this->_debug("C: SASL Bind [mech: $method, authc: $authc, authz: $authz, pass: $pass]");
-
-        if (ldap_sasl_bind($this->conn, NULL, $pass, $method, NULL, $authc, $authz)) {
-            $this->_debug("S: OK");
-            return true;
-        }
-
-        $this->_debug("S: ".ldap_error($this->conn));
-
-        rcube::raise_error(array(
-            'code' => ldap_errno($this->conn), 'type' => 'ldap',
-            'file' => __FILE__, 'line' => __LINE__,
-            'message' => "SASL Bind failed for authcid=$authc ".ldap_error($this->conn)),
-            true);
-        return false;
-    }
-
-    /**
-     * Bind connection with DN and password
-     *
-     * @param string $dn   Bind DN
-     * @param string $pass Bind password
-     *
-     * @return boolean True on success, False on error
-     */
-    public function bind($dn, $pass)
-    {
-        if (!$this->conn) {
-            return false;
-        }
-
-        $this->_debug("C: Bind $dn [pass: $pass]");
-
-        if (@ldap_bind($this->conn, $dn, $pass)) {
-            $this->_debug("S: OK");
-            return true;
-        }
-
-        $this->_debug("S: ".ldap_error($this->conn));
-
-        rcube::raise_error(array(
-            'code' => ldap_errno($this->conn), 'type' => 'ldap',
-            'file' => __FILE__, 'line' => __LINE__,
-            'message' => "Bind failed for dn=$dn: ".ldap_error($this->conn)),
-            true);
-
-        return false;
-    }
-
-    /**
-     * Close connection to LDAP server
-     */
-    public function close()
-    {
-        if ($this->conn) {
-            $this->_debug("C: Close");
-            ldap_unbind($this->conn);
-            $this->conn = null;
-        }
-    }
-
-    /**
-     * Return the last result set
-     *
-     * @return object rcube_ldap_result Result object
-     */
-    function get_result()
-    {
-        return $this->result;
-    }
-
-    /**
-     * Get a specific LDAP entry, identified by its DN
-     *
-     * @param string $dn Record identifier
-     * @return array     Hash array
-     */
-    function get_entry($dn)
-    {
-        $rec = null;
-
-        if ($this->conn && $dn) {
-            $this->_debug("C: Read $dn [(objectclass=*)]");
-
-            if ($ldap_result = @ldap_read($this->conn, $dn, '(objectclass=*)', $this->attributes)) {
-                $this->_debug("S: OK");
-
-                if ($entry = ldap_first_entry($this->conn, $ldap_result)) {
-                    $rec = ldap_get_attributes($this->conn, $entry);
-                }
-            }
-            else {
-                $this->_debug("S: ".ldap_error($this->conn));
-            }
-
-            if (!empty($rec)) {
-                $rec['dn'] = $dn; // Add in the dn for the entry.
-            }
-        }
-
-        return $rec;
-    }
-
-    /**
-     * Execute the LDAP search based on the stored credentials
-     *
-     * @param string $base_dn  The base DN to query
-     * @param string $filter   The LDAP filter for search
-     * @param string $scope    The LDAP scope (list|sub|base)
-     * @param array  $attrs    List of entry attributes to read
-     * @param array  $prop     Hash array with query configuration properties:
-     *   - sort: array of sort attributes (has to be in sync with the VLV index)
-     *   - search: search string used for VLV controls
-     * @param boolean $count_only Set to true if only entry count is requested
-     *
-     * @return mixed  rcube_ldap_result object or number of entries (if count_only=true) or false on error
-     */
-    public function search($base_dn, $filter = '', $scope = 'sub', $attrs = array('dn'), $prop = array(), $count_only = false)
-    {
-        if (!$this->conn) {
-            return false;
-        }
-
-        if (empty($filter)) {
-            $filter = '(objectclass=*)';
-        }
-
-        $this->_debug("C: Search $base_dn for $filter");
-
-        $function = self::scope2func($scope, $ns_function);
-
-        // find available VLV index for this query
-        if (!$count_only && ($vlv_sort = $this->_find_vlv($base_dn, $filter, $scope, $prop['sort']))) {
-            // when using VLV, we get the total count by...
-            // ...either reading numSubOrdinates attribute
-            if (($sub_filter = $this->config['numsub_filter']) &&
-                ($result_count = @$ns_function($this->conn, $base_dn, $sub_filter, array('numSubOrdinates'), 0, 0, 0))
-            ) {
-                $counts = ldap_get_entries($this->conn, $result_count);
-                for ($vlv_count = $j = 0; $j < $counts['count']; $j++)
-                    $vlv_count += $counts[$j]['numsubordinates'][0];
-                $this->_debug("D: total numsubordinates = " . $vlv_count);
-            }
-            // ...or by fetching all records dn and count them
-            else if (!function_exists('ldap_parse_virtuallist_control')) {
-                $vlv_count = $this->search($base_dn, $filter, $scope, array('dn'), $prop, true);
-            }
-
-            $this->vlv_active = $this->_vlv_set_controls($vlv_sort, $this->list_page, $this->page_size, $prop['search']);
-        }
-        else {
-            $this->vlv_active = false;
-        }
-
-        // only fetch dn for count (should keep the payload low)
-        if ($ldap_result = @$function($this->conn, $base_dn, $filter,
-            $attrs, 0, (int)$this->config['sizelimit'], (int)$this->config['timelimit'])
-        ) {
-            // when running on a patched PHP we can use the extended functions
-            // to retrieve the total count from the LDAP search result
-            if ($this->vlv_active && function_exists('ldap_parse_virtuallist_control')) {
-                if (ldap_parse_result($this->conn, $ldap_result, $errcode, $matcheddn, $errmsg, $referrals, $serverctrls)) {
-                    ldap_parse_virtuallist_control($this->conn, $serverctrls, $last_offset, $vlv_count, $vresult);
-                    $this->_debug("S: VLV result: last_offset=$last_offset; content_count=$vlv_count");
-                }
-                else {
-                    $this->_debug("S: ".($errmsg ? $errmsg : ldap_error($this->conn)));
-                }
-            }
-            else if ($this->debug) {
-                $this->_debug("S: ".ldap_count_entries($this->conn, $ldap_result)." record(s) found");
-            }
-
-            $this->result = new rcube_ldap_result($this->conn, $ldap_result, $base_dn, $filter, $vlv_count);
-
-            return $count_only ? $this->result->count() : $this->result;
-        }
-        else {
-            $this->_debug("S: ".ldap_error($this->conn));
-        }
-
-        return false;
-    }
-
-    /**
-     * Modify an LDAP entry on the server
-     *
-     * @param string $dn      Entry DN
-     * @param array  $params  Hash array of entry attributes
-     * @param int    $mode    Update mode (UPDATE_MOD_ADD | UPDATE_MOD_DELETE | UPDATE_MOD_REPLACE)
-     */
-    public function modify($dn, $parms, $mode = 255)
-    {
-        // TODO: implement this
-
-        return false;
-    }
-
-    /**
-     * Wrapper for ldap_add()
-     *
-     * @see ldap_add()
-     */
-    public function add($dn, $entry)
-    {
-        $this->_debug("C: Add $dn: ".print_r($entry, true));
-
-        $res = ldap_add($this->conn, $dn, $entry);
-        if ($res === false) {
-            $this->_debug("S: ".ldap_error($this->conn));
-            return false;
-        }
-
-        $this->_debug("S: OK");
-        return true;
-    }
-
-    /**
-     * Wrapper for ldap_delete()
-     *
-     * @see ldap_delete()
-     */
-    public function delete($dn)
-    {
-        $this->_debug("C: Delete $dn");
-
-        $res = ldap_delete($this->conn, $dn);
-        if ($res === false) {
-            $this->_debug("S: ".ldap_error($this->conn));
-            return false;
-        }
-
-        $this->_debug("S: OK");
-        return true;
-    }
-
-    /**
-     * Wrapper for ldap_mod_replace()
-     *
-     * @see ldap_mod_replace()
-     */
-    public function mod_replace($dn, $entry)
-    {
-        $this->_debug("C: Replace $dn: ".print_r($entry, true));
-
-        if (!ldap_mod_replace($this->conn, $dn, $entry)) {
-            $this->_debug("S: ".ldap_error($this->conn));
-            return false;
-        }
-
-        $this->_debug("S: OK");
-        return true;
-    }
-
-    /**
-     * Wrapper for ldap_mod_add()
-     *
-     * @see ldap_mod_add()
-     */
-    public function mod_add($dn, $entry)
-    {
-        $this->_debug("C: Add $dn: ".print_r($entry, true));
-
-        if (!ldap_mod_add($this->conn, $dn, $entry)) {
-            $this->_debug("S: ".ldap_error($this->conn));
-            return false;
-        }
-
-        $this->_debug("S: OK");
-        return true;
-    }
-
-    /**
-     * Wrapper for ldap_mod_del()
-     *
-     * @see ldap_mod_del()
-     */
-    public function mod_del($dn, $entry)
-    {
-        $this->_debug("C: Delete $dn: ".print_r($entry, true));
-
-        if (!ldap_mod_del($this->conn, $dn, $entry)) {
-            $this->_debug("S: ".ldap_error($this->conn));
-            return false;
-        }
-
-        $this->_debug("S: OK");
-        return true;
-    }
-
-    /**
-     * Wrapper for ldap_rename()
-     *
-     * @see ldap_rename()
-     */
-    public function rename($dn, $newrdn, $newparent = null, $deleteoldrdn = true)
-    {
-        $this->_debug("C: Rename $dn to $newrdn");
-
-        if (!ldap_rename($this->conn, $dn, $newrdn, $newparent, $deleteoldrdn)) {
-            $this->_debug("S: ".ldap_error($this->conn));
-            return false;
-        }
-
-        $this->_debug("S: OK");
-        return true;
-    }
-
-    /**
-     * Wrapper for ldap_list() + ldap_get_entries()
-     *
-     * @see ldap_list()
-     * @see ldap_get_entries()
-     */
-    public function list_entries($dn, $filter, $attributes = array('dn'))
-    {
-        $list = array();
-        $this->_debug("C: List $dn [{$filter}]");
-
-        if ($result = ldap_list($this->conn, $dn, $filter, $attributes)) {
-            $list = ldap_get_entries($this->conn, $result);
-
-            if ($list === false) {
-                $this->_debug("S: ".ldap_error($this->conn));
-                return array();
-            }
-
-            $count = $list['count'];
-            unset($list['count']);
-
-            $this->_debug("S: $count record(s)");
-        }
-        else {
-            $this->_debug("S: ".ldap_error($this->conn));
-        }
-
-        return $list;
-    }
-
-    /**
-     * Wrapper for ldap_read() + ldap_get_entries()
-     *
-     * @see ldap_read()
-     * @see ldap_get_entries()
-     */
-    public function read_entries($dn, $filter, $attributes = null)
-    {
-        $this->_debug("C: Read $dn [{$filter}]");
-
-        if ($this->conn && $dn) {
-            if (!$attributes)
-                $attributes = $this->attributes;
-
-            $result = @ldap_read($this->conn, $dn, $filter, $attributes, 0, (int)$this->config['sizelimit'], (int)$this->config['timelimit']);
-            if ($result === false) {
-                $this->_debug("S: ".ldap_error($this->conn));
-                return false;
-            }
-
-            $this->_debug("S: OK");
-            return ldap_get_entries($this->conn, $result);
-        }
-
-        return false;
-    }
-
-    /**
-     * Choose the right PHP function according to scope property
-     *
-     * @param string $scope         The LDAP scope (sub|base|list)
-     * @param string $ns_function   Function to be used for numSubOrdinates queries
-     * @return string  PHP function to be used to query directory
-     */
-    public static function scope2func($scope, &$ns_function = null)
-    {
-        switch ($scope) {
-          case 'sub':
-            $function = $ns_function  = 'ldap_search';
-            break;
-          case 'base':
-            $function = $ns_function = 'ldap_read';
-            break;
-          default:
-            $function = 'ldap_list';
-            $ns_function = 'ldap_read';
-            break;
-        }
-
-        return $function;
-    }
-
-    /**
-     * Convert the given scope integer value to a string representation
-     */
-    public static function scopeint2str($scope)
-    {
-        switch ($scope) {
-            case 2:  return 'sub';
-            case 1:  return 'one';
-            case 0:  return 'base';
-            default: $this->_debug("Scope $scope is not a valid scope integer");
-        }
-
-        return '';
-    }
-
-    /**
-     * Escapes the given value according to RFC 2254 so that it can be safely used in LDAP filters.
-     *
-     * @param string $val Value to quote
-     * @return string The escaped value
-     */
-    public static function escape_value($val)
-    {
-        return strtr($str, array('*'=>'\2a', '('=>'\28', ')'=>'\29',
-            '\\'=>'\5c', '/'=>'\2f'));
-    }
-
-    /**
-     * Escapes a DN value according to RFC 2253
-     *
-     * @param string $dn DN value o quote
-     * @return string The escaped value
-     */
-    public static function escape_dn($dn)
-    {
-        return strtr($str, array(','=>'\2c', '='=>'\3d', '+'=>'\2b',
-            '<'=>'\3c', '>'=>'\3e', ';'=>'\3b', '\\'=>'\5c',
-            '"'=>'\22', '#'=>'\23'));
-    }
-
-    /**
-     * Normalize a LDAP result by converting entry attributes arrays into single values
-     *
-     * @param array $result LDAP result set fetched with ldap_get_entries()
-     * @return array        Hash array with normalized entries, indexed by their DNs
-     */
-    public static function normalize_result($result)
-    {
-        if (!is_array($result)) {
-            return array();
-        }
-
-        $entries  = array();
-        for ($i = 0; $i < $result['count']; $i++) {
-            $key = $result[$i]['dn'] ? $result[$i]['dn'] : $i;
-            $entries[$key] = self::normalize_entry($result[$i]);
-        }
-
-        return $entries;
-    }
-
-    /**
-     * Turn an LDAP entry into a regular PHP array with attributes as keys.
-     *
-     * @param array $entry Attributes array as retrieved from ldap_get_attributes() or ldap_get_entries()
-     *
-     * @return array       Hash array with attributes as keys
-     */
-    public static function normalize_entry($entry)
-    {
-        if (!isset($entry['count'])) {
-            return $entry;
-        }
-
-        $rec = array();
-
-        for ($i=0; $i < $entry['count']; $i++) {
-            $attr = $entry[$i];
-            if ($entry[$attr]['count'] == 1) {
-                switch ($attr) {
-                    case 'objectclass':
-                        $rec[$attr] = array(strtolower($entry[$attr][0]));
-                        break;
-                    default:
-                        $rec[$attr] = $entry[$attr][0];
-                        break;
-                }
-            }
-            else {
-                for ($j=0; $j < $entry[$attr]['count']; $j++) {
-                    $rec[$attr][$j] = $entry[$attr][$j];
-                }
-            }
-        }
-
-        return $rec;
-    }
-
-    /**
-     * Set server controls for Virtual List View (paginated listing)
-     */
-    private function _vlv_set_controls($sort, $list_page, $page_size, $search = null)
-    {
-        $sort_ctrl = array('oid' => "1.2.840.113556.1.4.473",  'value' => self::_sort_ber_encode((array)$sort));
-        $vlv_ctrl  = array('oid' => "2.16.840.1.113730.3.4.9", 'value' => self::_vlv_ber_encode(($offset = ($list_page-1) * $page_size + 1), $page_size, $search), 'iscritical' => true);
-
-        $this->_debug("C: Set controls sort=" . join(' ', unpack('H'.(strlen($sort_ctrl['value'])*2), $sort_ctrl['value'])) . " ($sort[0]);"
-            . " vlv=" . join(' ', (unpack('H'.(strlen($vlv_ctrl['value'])*2), $vlv_ctrl['value']))) . " ($offset/$page_size; $search)");
-
-        if (!ldap_set_option($this->conn, LDAP_OPT_SERVER_CONTROLS, array($sort_ctrl, $vlv_ctrl))) {
-            $this->_debug("S: ".ldap_error($this->conn));
-            $this->set_error(self::ERROR_SEARCH, 'vlvnotsupported');
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns unified attribute name (resolving aliases)
-     */
-    private static function _attr_name($namev)
-    {
-        // list of known attribute aliases
-        static $aliases = array(
-            'gn' => 'givenname',
-            'rfc822mailbox' => 'email',
-            'userid' => 'uid',
-            'emailaddress' => 'email',
-            'pkcs9email' => 'email',
-        );
-
-        list($name, $limit) = explode(':', $namev, 2);
-        $suffix = $limit ? ':'.$limit : '';
-
-        return (isset($aliases[$name]) ? $aliases[$name] : $name) . $suffix;
-    }
-
-    /**
-     * Quotes attribute value string
-     *
-     * @param string $str Attribute value
-     * @param bool   $dn  True if the attribute is a DN
-     *
-     * @return string Quoted string
-     */
-    public static function quote_string($str, $dn=false)
-    {
-        // take firt entry if array given
-        if (is_array($str))
-            $str = reset($str);
-
-        if ($dn)
-            $replace = array(','=>'\2c', '='=>'\3d', '+'=>'\2b', '<'=>'\3c',
-                '>'=>'\3e', ';'=>'\3b', '\\'=>'\5c', '"'=>'\22', '#'=>'\23');
-        else
-            $replace = array('*'=>'\2a', '('=>'\28', ')'=>'\29', '\\'=>'\5c',
-                '/'=>'\2f');
-
-        return strtr($str, $replace);
-    }
-
-    /**
-     * Prints debug info to the log
-     */
-    private function _debug($str)
-    {
-        if ($this->debug && class_exists('rcube')) {
-            rcube::write_log('ldap', $str);
-        }
-    }
-
-
-    /*****************  Virtual List View (VLV) related utility functions  **************** */
-
-    /**
-     * Return the search string value to be used in VLV controls
-     */
-    private function _vlv_search($sort, $search)
-    {
-        foreach ($search as $attr => $value) {
-            if (!in_array(strtolower($attr), $sort)) {
-                $this->_debug("d: Cannot use VLV search using attribute not indexed: $attr (not in " . var_export($sort, true) . ")");
-                return null;
-            } else {
-                return $value;
-            }
-        }
-    }
-
-    /**
-     * Find a VLV index matching the given query attributes
-     *
-     * @return string Sort attribute or False if no match
-     */
-    private function _find_vlv($base_dn, $filter, $scope, $sort_attrs = null)
-    {
-        if (!$this->config['vlv'] || $scope == 'base') {
-            return false;
-        }
-
-        // get vlv config
-        $vlv_config = $this->_read_vlv_config();
-
-        if ($vlv = $vlv_config[$base_dn]) {
-            $this->_debug("D: Found a VLV for $base_dn");
-
-            if ($vlv['filter'] == strtolower($filter) || stripos($filter, '(&'.$vlv['filter'].'(') === 0) {
-                $this->_debug("D: Filter matches");
-                if ($vlv['scope'] == $scope) {
-                    // Not passing any sort attributes means you don't care
-                    if (empty($sort_attrs) || in_array($sort_attrs, $vlv['sort'])) {
-                        return $vlv['sort'][0];
-                    }
-                }
-                else {
-                    $this->_debug("D: Scope does not match");
-                }
-            }
-            else {
-                $this->_debug("D: Filter does not match");
-            }
-        }
-        else {
-            $this->_debug("D: No VLV for $base_dn");
-        }
-
-        return false;
-    }
-
-    /**
-     * Return VLV indexes and searches including necessary configuration
-     * details.
-     */
-    private function _read_vlv_config()
-    {
-        if (empty($this->config['vlv']) || empty($this->config['config_root_dn'])) {
-            return array();
-        }
-        // return hard-coded VLV config
-        else if (is_array($this->config['vlv'])) {
-            return $this->config['vlv'];
-        }
-
-        // return cached result
-        if (is_array($this->vlv_config)) {
-            return $this->vlv_config;
-        }
-
-        if ($this->cache && ($cached_config = $this->cache->get('vlvconfig'))) {
-            $this->vlv_config = $cached_config;
-            return $this->vlv_config;
-        }
-
-        $this->vlv_config = array();
-
-        $ldap_result = ldap_search($this->conn, $this->config['config_root_dn'], '(objectclass=vlvsearch)', array('*'), 0, 0, 0);
-        $vlv_searches = new rcube_ldap_result($this->conn, $ldap_result, $this->config['config_root_dn'], '(objectclass=vlvsearch)');
-
-        if ($vlv_searches->count() < 1) {
-            $this->_debug("D: Empty result from search for '(objectclass=vlvsearch)' on '$config_root_dn'");
-            return array();
-        }
-
-        foreach ($vlv_searches->entries(true) as $vlv_search_dn => $vlv_search_attrs) {
-            // Multiple indexes may exist
-            $ldap_result = ldap_search($this->conn, $vlv_search_dn, '(objectclass=vlvindex)', array('*'), 0, 0, 0);
-            $vlv_indexes = new rcube_ldap_result($this->conn, $ldap_result, $vlv_search_dn, '(objectclass=vlvindex)');
-
-            // Reset this one for each VLV search.
-            $_vlv_sort = array();
-            foreach ($vlv_indexes->entries(true) as $vlv_index_dn => $vlv_index_attrs) {
-                $_vlv_sort[] = explode(' ', $vlv_index_attrs['vlvsort']);
-            }
-
-            $this->vlv_config[$vlv_search_attrs['vlvbase']] = array(
-                'scope'  => self::scopeint2str($vlv_search_attrs['vlvscope']),
-                'filter' => strtolower($vlv_search_attrs['vlvfilter']),
-                'sort'   => $_vlv_sort,
-            );
-        }
-
-        // cache this
-        if ($this->cache)
-            $this->cache->set('vlvconfig', $this->vlv_config);
-
-        $this->_debug("D: Refreshed VLV config: " . var_export($this->vlv_config, true));
-
-        return $this->vlv_config;
-    }
-
-    /**
-     * Generate BER encoded string for Virtual List View option
-     *
-     * @param integer List offset (first record)
-     * @param integer Records per page
-     *
-     * @return string BER encoded option value
-     */
-    private static function _vlv_ber_encode($offset, $rpp, $search = '')
-    {
-        /*
-            this string is ber-encoded, php will prefix this value with:
-            04 (octet string) and 10 (length of 16 bytes)
-            the code behind this string is broken down as follows:
-            30 = ber sequence with a length of 0e (14) bytes following
-            02 = type integer (in two's complement form) with 2 bytes following (beforeCount): 01 00 (ie 0)
-            02 = type integer (in two's complement form) with 2 bytes following (afterCount):  01 18 (ie 25-1=24)
-            a0 = type context-specific/constructed with a length of 06 (6) bytes following
-            02 = type integer with 2 bytes following (offset): 01 01 (ie 1)
-            02 = type integer with 2 bytes following (contentCount):  01 00
-
-            with a search string present:
-            81 = type context-specific/constructed with a length of 04 (4) bytes following (the length will change here)
-            81 indicates a user string is present where as a a0 indicates just a offset search
-            81 = type context-specific/constructed with a length of 06 (6) bytes following
-
-            The following info was taken from the ISO/IEC 8825-1:2003 x.690 standard re: the
-            encoding of integer values (note: these values are in
-            two-complement form so since offset will never be negative bit 8 of the
-            leftmost octet should never by set to 1):
-            8.3.2: If the contents octets of an integer value encoding consist
-            of more than one octet, then the bits of the first octet (rightmost)
-            and bit 8 of the second (to the left of first octet) octet:
-                a) shall not all be ones; and
-                b) shall not all be zero
-        */
-
-        if ($search) {
-            $search = preg_replace('/[^-[:alpha:] ,.()0-9]+/', '', $search);
-            $ber_val = self::_string2hex($search);
-            $str = self::_ber_addseq($ber_val, '81');
-        }
-        else {
-            // construct the string from right to left
-            $str = "020100"; # contentCount
-
-            $ber_val = self::_ber_encode_int($offset);  // returns encoded integer value in hex format
-
-            // calculate octet length of $ber_val
-            $str = self::_ber_addseq($ber_val, '02') . $str;
-
-            // now compute length over $str
-            $str = self::_ber_addseq($str, 'a0');
-        }
-
-        // now tack on records per page
-        $str = "020100" . self::_ber_addseq(self::_ber_encode_int($rpp-1), '02') . $str;
-
-        // now tack on sequence identifier and length
-        $str = self::_ber_addseq($str, '30');
-
-        return pack('H'.strlen($str), $str);
-    }
-
-    /**
-     * create ber encoding for sort control
-     *
-     * @param array List of cols to sort by
-     * @return string BER encoded option value
-     */
-    private static function _sort_ber_encode($sortcols)
-    {
-        $str = '';
-        foreach (array_reverse((array)$sortcols) as $col) {
-            $ber_val = self::_string2hex($col);
-
-            // 30 = ber sequence with a length of octet value
-            // 04 = octet string with a length of the ascii value
-            $oct = self::_ber_addseq($ber_val, '04');
-            $str = self::_ber_addseq($oct, '30') . $str;
-        }
-
-        // now tack on sequence identifier and length
-        $str = self::_ber_addseq($str, '30');
-
-        return pack('H'.strlen($str), $str);
-    }
-
-    /**
-     * Add BER sequence with correct length and the given identifier
-     */
-    private static function _ber_addseq($str, $identifier)
-    {
-        $len = dechex(strlen($str)/2);
-        if (strlen($len) % 2 != 0)
-            $len = '0'.$len;
-
-        return $identifier . $len . $str;
-    }
-
-    /**
-     * Returns BER encoded integer value in hex format
-     */
-    private static function _ber_encode_int($offset)
-    {
-        $val = dechex($offset);
-        $prefix = '';
-
-        // check if bit 8 of high byte is 1
-        if (preg_match('/^[89abcdef]/', $val))
-            $prefix = '00';
-
-        if (strlen($val)%2 != 0)
-            $prefix .= '0';
-
-        return $prefix . $val;
-    }
-
-    /**
-     * Returns ascii string encoded in hex
-     */
-    private static function _string2hex($str)
-    {
-        $hex = '';
-        for ($i=0; $i < strlen($str); $i++) {
-            $hex .= dechex(ord($str[$i]));
-        }
-        return $hex;
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_ldap_result.php b/lib/ext/Roundcube/rcube_ldap_result.php
deleted file mode 100644
index efc3331..0000000
--- a/lib/ext/Roundcube/rcube_ldap_result.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | Roundcube/rcube_ldap_result.php                                       |
- |                                                                       |
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2013, The Roundcube Dev Team                       |
- | Copyright (C) 2013, Kolab Systems AG                                  |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Model class that represents an LDAP search result                   |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-
-/**
- * Model class representing an LDAP search result
- *
- * @package    Framework
- * @subpackage LDAP
- */
-class rcube_ldap_result implements Iterator
-{
-    public $conn;
-    public $ldap;
-    public $base_dn;
-    public $filter;
-
-    private $count = null;
-    private $current = null;
-    private $iteratorkey = 0;
-
-    /**
-     * Default constructor
-     *
-     * @param resource $conn LDAP link identifier
-     * @param resource $ldap LDAP result entry identifier
-     * @param string   $base_dn   Base DN used to get this result
-     * @param string   $filter    Filter query used to get this result
-     * @param integer  $count     Record count value (pre-calculated)
-     */
-    function __construct($conn, $ldap, $base_dn, $filter, $count = null)
-    {
-        $this->conn = $conn;
-        $this->ldap = $ldap;
-        $this->base_dn = $base_dn;
-        $this->filter = $filter;
-        $this->count = $count;
-    }
-
-    /**
-     * Wrapper for ldap_sort()
-     */
-    public function sort($attr)
-    {
-        return ldap_sort($this->conn, $this->ldap, $attr);
-    }
-
-    /**
-     * Get entries count
-     */
-    public function count()
-    {
-        if (!isset($this->count))
-            $this->count = ldap_count_entries($this->conn, $this->ldap);
-
-        return $this->count;
-    }
-
-    /**
-     * Wrapper for ldap_get_entries()
-     *
-     * @param boolean $normalize Optionally normalize the entries to a list of hash arrays
-     * @return array  List of LDAP entries
-     */
-    public function entries($normalize = false)
-    {
-        $entries = ldap_get_entries($this->conn, $this->ldap);
-        return $normalize ? rcube_ldap_generic::normalize_result($entries) : $entries;
-    }
-
-    /**
-     * Wrapper for ldap_get_dn() using the current entry pointer
-     */
-    public function get_dn()
-    {
-        return $this->current ? ldap_get_dn($this->conn, $this->current) : null;
-    }
-
-
-    /***  Implements the PHP 5 Iterator interface to make foreach work  ***/
-
-    function current()
-    {
-        $attrib = ldap_get_attributes($this->conn, $this->current);
-        $attrib['dn'] = ldap_get_dn($this->conn, $this->current);
-        return $attrib;
-    }
-
-    function key()
-    {
-        return $this->iteratorkey;
-    }
-
-    function rewind()
-    {
-        $this->iteratorkey = 0;
-        $this->current = ldap_first_entry($this->conn, $this->ldap);
-    }
-
-    function next()
-    {
-        $this->iteratorkey++;
-        $this->current = ldap_next_entry($this->conn, $this->current);
-    }
-
-    function valid()
-    {
-        return (bool)$this->current;
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_message.php b/lib/ext/Roundcube/rcube_message.php
deleted file mode 100644
index 9b662a2..0000000
--- a/lib/ext/Roundcube/rcube_message.php
+++ /dev/null
@@ -1,821 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2010, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Logical representation of a mail message with all its data          |
- |   and related functions                                               |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Logical representation of a mail message with all its data
- * and related functions
- *
- * @package    Framework
- * @subpackage Storage
- * @author     Thomas Bruederli <roundcube@gmail.com>
- */
-class rcube_message
-{
-    /**
-     * Instace of framework class.
-     *
-     * @var rcube
-     */
-    private $app;
-
-    /**
-     * Instance of storage class
-     *
-     * @var rcube_storage
-     */
-    private $storage;
-
-    /**
-     * Instance of mime class
-     *
-     * @var rcube_mime
-     */
-    private $mime;
-    private $opt = array();
-    private $parse_alternative = false;
-
-    public $uid;
-    public $folder;
-    public $headers;
-    public $parts = array();
-    public $mime_parts = array();
-    public $inline_parts = array();
-    public $attachments = array();
-    public $subject = '';
-    public $sender = null;
-    public $is_safe = false;
-
-
-    /**
-     * __construct
-     *
-     * Provide a uid, and parse message structure.
-     *
-     * @param string $uid    The message UID.
-     * @param string $folder Folder name
-     *
-     * @see self::$app, self::$storage, self::$opt, self::$parts
-     */
-    function __construct($uid, $folder = null)
-    {
-        $this->uid  = $uid;
-        $this->app  = rcube::get_instance();
-        $this->storage = $this->app->get_storage();
-        $this->folder  = strlen($folder) ? $folder : $this->storage->get_folder();
-        $this->storage->set_options(array('all_headers' => true));
-
-        // Set current folder
-        $this->storage->set_folder($this->folder);
-
-        $this->headers = $this->storage->get_message($uid);
-
-        if (!$this->headers) {
-            return;
-        }
-
-        $this->mime = new rcube_mime($this->headers->charset);
-
-        $this->subject = $this->headers->get('subject');
-        list(, $this->sender) = each($this->mime->decode_address_list($this->headers->from, 1));
-
-        $this->set_safe((intval($_GET['_safe']) || $_SESSION['safe_messages'][$this->folder.':'.$uid]));
-        $this->opt = array(
-            'safe' => $this->is_safe,
-            'prefer_html' => $this->app->config->get('prefer_html'),
-            'get_url' => $this->app->url(array(
-                'action' => 'get',
-                'mbox'   => $this->storage->get_folder(),
-                'uid'    => $uid))
-        );
-
-        if (!empty($this->headers->structure)) {
-            $this->get_mime_numbers($this->headers->structure);
-            $this->parse_structure($this->headers->structure);
-        }
-        else {
-            $this->body = $this->storage->get_body($uid);
-        }
-
-        // notify plugins and let them analyze this structured message object
-        $this->app->plugins->exec_hook('message_load', array('object' => $this));
-    }
-
-
-    /**
-     * Return a (decoded) message header
-     *
-     * @param string $name Header name
-     * @param bool   $row  Don't mime-decode the value
-     * @return string Header value
-     */
-    public function get_header($name, $raw = false)
-    {
-        if (empty($this->headers)) {
-            return null;
-        }
-
-        return $this->headers->get($name, !$raw);
-    }
-
-
-    /**
-     * Set is_safe var and session data
-     *
-     * @param bool $safe enable/disable
-     */
-    public function set_safe($safe = true)
-    {
-        $_SESSION['safe_messages'][$this->folder.':'.$this->uid] = $this->is_safe = $safe;
-    }
-
-
-    /**
-     * Compose a valid URL for getting a message part
-     *
-     * @param string $mime_id Part MIME-ID
-     * @param mixed  $embed Mimetype class for parts to be embedded
-     * @return string URL or false if part does not exist
-     */
-    public function get_part_url($mime_id, $embed = false)
-    {
-        if ($this->mime_parts[$mime_id])
-            return $this->opt['get_url'] . '&_part=' . $mime_id . ($embed ? '&_embed=1&_mimeclass=' . $embed : '');
-        else
-            return false;
-    }
-
-
-    /**
-     * Get content of a specific part of this message
-     *
-     * @param string   $mime_id           Part MIME-ID
-     * @param resource $fp File           pointer to save the message part
-     * @param boolean  $skip_charset_conv Disables charset conversion
-     * @param int      $max_bytes         Only read this number of bytes
-     * @param boolean  $formatted         Enables formatting of text/* parts bodies
-     *
-     * @return string Part content
-     */
-    public function get_part_content($mime_id, $fp = null, $skip_charset_conv = false, $max_bytes = 0, $formatted = true)
-    {
-        if ($part = $this->mime_parts[$mime_id]) {
-            // stored in message structure (winmail/inline-uuencode)
-            if (!empty($part->body) || $part->encoding == 'stream') {
-                if ($fp) {
-                    fwrite($fp, $part->body);
-                }
-                return $fp ? true : $part->body;
-            }
-
-            // get from IMAP
-            $this->storage->set_folder($this->folder);
-
-            return $this->storage->get_message_part($this->uid, $mime_id, $part,
-                NULL, $fp, $skip_charset_conv, $max_bytes, $formatted);
-        }
-    }
-
-
-    /**
-     * Determine if the message contains a HTML part. This must to be
-     * a real part not an attachment (or its part)
-     *
-     * @param bool $enriched Enables checking for text/enriched parts too
-     *
-     * @return bool True if a HTML is available, False if not
-     */
-    function has_html_part($enriched = false)
-    {
-        // check all message parts
-        foreach ($this->mime_parts as $part) {
-            if ($part->mimetype == 'text/html' || ($enriched && $part->mimetype == 'text/enriched')) {
-                // Skip if part is an attachment, don't use is_attachment() here
-                if ($part->filename) {
-                    continue;
-                }
-
-                $level = explode('.', $part->mime_id);
-
-                // Check if the part belongs to higher-level's multipart part
-                // this can be alternative/related/signed/encrypted, but not mixed
-                while (array_pop($level) !== null) {
-                    if (!count($level)) {
-                        return true;
-                    }
-
-                    $parent = $this->mime_parts[join('.', $level)];
-                    if (!preg_match('/^multipart\/(alternative|related|signed|encrypted)$/', $parent->mimetype)) {
-                        continue 2;
-                    }
-                }
-
-                if ($part->size) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Determine if the message contains a text/plain part. This must to be
-     * a real part not an attachment (or its part)
-     *
-     * @return bool True if a plain text part is available, False if not
-     */
-    function has_text_part()
-    {
-        // check all message parts
-        foreach ($this->mime_parts as $part) {
-            if ($part->mimetype == 'text/plain') {
-                // Skip if part is an attachment, don't use is_attachment() here
-                if ($part->filename) {
-                    continue;
-                }
-
-                $level = explode('.', $part->mime_id);
-
-                // Check if the part belongs to higher-level's alternative/related
-                while (array_pop($level) !== null) {
-                    if (!count($level)) {
-                        return true;
-                    }
-
-                    $parent = $this->mime_parts[join('.', $level)];
-                    if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
-                        continue 2;
-                    }
-                }
-
-                if ($part->size) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Return the first HTML part of this message
-     *
-     * @return string HTML message part content
-     */
-    function first_html_part()
-    {
-        // check all message parts
-        foreach ($this->mime_parts as $pid => $part) {
-            if ($part->mimetype == 'text/html') {
-                return $this->get_part_content($pid);
-            }
-        }
-    }
-
-
-    /**
-     * Return the first text part of this message
-     *
-     * @param rcube_message_part $part Reference to the part if found
-     * @return string Plain text message/part content
-     */
-    function first_text_part(&$part=null)
-    {
-        // no message structure, return complete body
-        if (empty($this->parts))
-            return $this->body;
-
-        // check all message parts
-        foreach ($this->mime_parts as $mime_id => $part) {
-            if ($part->mimetype == 'text/plain') {
-                return $this->get_part_content($mime_id);
-            }
-            else if ($part->mimetype == 'text/html') {
-                $out = $this->get_part_content($mime_id);
-
-                // create instance of html2text class
-                $txt = new rcube_html2text($out);
-                return $txt->get_text();
-            }
-        }
-
-        $part = null;
-        return null;
-    }
-
-
-    /**
-     * Checks if part of the message is an attachment (or part of it)
-     *
-     * @param rcube_message_part $part Message part
-     *
-     * @return bool True if the part is an attachment part
-     */
-    public function is_attachment($part)
-    {
-        foreach ($this->attachments as $att_part) {
-            if ($att_part->mime_id == $part->mime_id) {
-                return true;
-            }
-
-            // check if the part is a subpart of another attachment part (message/rfc822)
-            if ($att_part->mimetype == 'message/rfc822') {
-                if (in_array($part, (array)$att_part->parts)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Read the message structure returend by the IMAP server
-     * and build flat lists of content parts and attachments
-     *
-     * @param rcube_message_part $structure Message structure node
-     * @param bool               $recursive True when called recursively
-     */
-    private function parse_structure($structure, $recursive = false)
-    {
-        // real content-type of message/rfc822 part
-        if ($structure->mimetype == 'message/rfc822' && $structure->real_mimetype) {
-            $mimetype = $structure->real_mimetype;
-
-            // parse headers from message/rfc822 part
-            if (!isset($structure->headers['subject']) && !isset($structure->headers['from'])) {
-                list($headers, ) = explode("\r\n\r\n", $this->get_part_content($structure->mime_id, null, true, 32768));
-                $structure->headers = rcube_mime::parse_headers($headers);
-            }
-        }
-        else
-            $mimetype = $structure->mimetype;
-
-        // show message headers
-        if ($recursive && is_array($structure->headers) &&
-                (isset($structure->headers['subject']) || $structure->headers['from'] || $structure->headers['to'])) {
-            $c = new stdClass;
-            $c->type = 'headers';
-            $c->headers = $structure->headers;
-            $this->parts[] = $c;
-        }
-
-        // Allow plugins to handle message parts
-        $plugin = $this->app->plugins->exec_hook('message_part_structure',
-            array('object' => $this, 'structure' => $structure,
-                'mimetype' => $mimetype, 'recursive' => $recursive));
-
-        if ($plugin['abort'])
-            return;
-
-        $structure = $plugin['structure'];
-        list($message_ctype_primary, $message_ctype_secondary) = explode('/', $plugin['mimetype']);
-
-        // print body if message doesn't have multiple parts
-        if ($message_ctype_primary == 'text' && !$recursive) {
-            // parts with unsupported type add to attachments list
-            if (!in_array($message_ctype_secondary, array('plain', 'html', 'enriched'))) {
-                $this->attachments[] = $structure;
-                return;
-            }
-
-            $structure->type = 'content';
-            $this->parts[] = $structure;
-
-            // Parse simple (plain text) message body
-            if ($message_ctype_secondary == 'plain') {
-                foreach ((array)$this->uu_decode($structure) as $uupart) {
-                    $this->mime_parts[$uupart->mime_id] = $uupart;
-                    $this->attachments[] = $uupart;
-                }
-            }
-        }
-        // the same for pgp signed messages
-        else if ($mimetype == 'application/pgp' && !$recursive) {
-            $structure->type = 'content';
-            $this->parts[] = $structure;
-        }
-        // message contains (more than one!) alternative parts
-        else if ($mimetype == 'multipart/alternative'
-            && is_array($structure->parts) && count($structure->parts) > 1
-        ) {
-            $plain_part   = null;
-            $html_part    = null;
-            $print_part   = null;
-            $related_part = null;
-            $attach_part  = null;
-
-            // get html/plaintext parts, other add to attachments list
-            foreach ($structure->parts as $p => $sub_part) {
-                $sub_mimetype = $sub_part->mimetype;
-                $is_multipart = preg_match('/^multipart\/(related|relative|mixed|alternative)/', $sub_mimetype);
-
-                // skip empty text parts
-                if (!$sub_part->size && !$is_multipart) {
-                    continue;
-                }
-
-                // We've encountered (malformed) messages with more than
-                // one text/plain or text/html part here. There's no way to choose
-                // which one is better, so we'll display first of them and add
-                // others as attachments (#1489358)
-
-                // check if sub part is
-                if ($is_multipart)
-                    $related_part = $p;
-                else if ($sub_mimetype == 'text/plain' && !$plain_part)
-                    $plain_part = $p;
-                else if ($sub_mimetype == 'text/html' && !$html_part)
-                    $html_part = $p;
-                else if ($sub_mimetype == 'text/enriched' && !$enriched_part)
-                    $enriched_part = $p;
-                else {
-                    // add unsupported/unrecognized parts to attachments list
-                    $this->attachments[] = $sub_part;
-                }
-            }
-
-            // parse related part (alternative part could be in here)
-            if ($related_part !== null && !$this->parse_alternative) {
-                $this->parse_alternative = true;
-                $this->parse_structure($structure->parts[$related_part], true);
-                $this->parse_alternative = false;
-
-                // if plain part was found, we should unset it if html is preferred
-                if ($this->opt['prefer_html'] && count($this->parts))
-                    $plain_part = null;
-            }
-
-            // choose html/plain part to print
-            if ($html_part !== null && $this->opt['prefer_html']) {
-                $print_part = $structure->parts[$html_part];
-            }
-            else if ($enriched_part !== null) {
-                $print_part = $structure->parts[$enriched_part];
-            }
-            else if ($plain_part !== null) {
-                $print_part = $structure->parts[$plain_part];
-            }
-
-            // add the right message body
-            if (is_object($print_part)) {
-                $print_part->type = 'content';
-                $this->parts[] = $print_part;
-            }
-            // show plaintext warning
-            else if ($html_part !== null && empty($this->parts)) {
-                $c = new stdClass;
-                $c->type            = 'content';
-                $c->ctype_primary   = 'text';
-                $c->ctype_secondary = 'plain';
-                $c->mimetype        = 'text/plain';
-                $c->realtype        = 'text/html';
-
-                $this->parts[] = $c;
-            }
-        }
-        // this is an ecrypted message -> create a plaintext body with the according message
-        else if ($mimetype == 'multipart/encrypted') {
-            $p = new stdClass;
-            $p->type            = 'content';
-            $p->ctype_primary   = 'text';
-            $p->ctype_secondary = 'plain';
-            $p->mimetype        = 'text/plain';
-            $p->realtype        = 'multipart/encrypted';
-
-            $this->parts[] = $p;
-        }
-        // this is an S/MIME ecrypted message -> create a plaintext body with the according message
-        else if ($mimetype == 'application/pkcs7-mime') {
-            $p = new stdClass;
-            $p->type            = 'content';
-            $p->ctype_primary   = 'text';
-            $p->ctype_secondary = 'plain';
-            $p->mimetype        = 'text/plain';
-            $p->realtype        = 'application/pkcs7-mime';
-
-            $this->parts[] = $p;
-        }
-        // message contains multiple parts
-        else if (is_array($structure->parts) && !empty($structure->parts)) {
-            // iterate over parts
-            for ($i=0; $i < count($structure->parts); $i++) {
-                $mail_part      = &$structure->parts[$i];
-                $primary_type   = $mail_part->ctype_primary;
-                $secondary_type = $mail_part->ctype_secondary;
-
-                // real content-type of message/rfc822
-                if ($mail_part->real_mimetype) {
-                    $part_orig_mimetype = $mail_part->mimetype;
-                    $part_mimetype = $mail_part->real_mimetype;
-                    list($primary_type, $secondary_type) = explode('/', $part_mimetype);
-                }
-                else
-                    $part_mimetype = $mail_part->mimetype;
-
-                // multipart/alternative
-                if ($primary_type == 'multipart') {
-                    $this->parse_structure($mail_part, true);
-
-                    // list message/rfc822 as attachment as well (mostly .eml)
-                    if ($part_orig_mimetype == 'message/rfc822' && !empty($mail_part->filename))
-                        $this->attachments[] = $mail_part;
-                }
-                // part text/[plain|html] or delivery status
-                else if ((($part_mimetype == 'text/plain' || $part_mimetype == 'text/html') && $mail_part->disposition != 'attachment') ||
-                    in_array($part_mimetype, array('message/delivery-status', 'text/rfc822-headers', 'message/disposition-notification'))
-                ) {
-                    // Allow plugins to handle also this part
-                    $plugin = $this->app->plugins->exec_hook('message_part_structure',
-                        array('object' => $this, 'structure' => $mail_part,
-                            'mimetype' => $part_mimetype, 'recursive' => true));
-
-                    if ($plugin['abort'])
-                        continue;
-
-                    if ($part_mimetype == 'text/html' && $mail_part->size) {
-                        $got_html_part = true;
-                    }
-
-                    $mail_part = $plugin['structure'];
-                    list($primary_type, $secondary_type) = explode('/', $plugin['mimetype']);
-
-                    // add text part if it matches the prefs
-                    if (!$this->parse_alternative ||
-                        ($secondary_type == 'html' && $this->opt['prefer_html']) ||
-                        ($secondary_type == 'plain' && !$this->opt['prefer_html'])
-                    ) {
-                        $mail_part->type = 'content';
-                        $this->parts[] = $mail_part;
-                    }
-
-                    // list as attachment as well
-                    if (!empty($mail_part->filename)) {
-                        $this->attachments[] = $mail_part;
-                    }
-                }
-                // part message/*
-                else if ($primary_type == 'message') {
-                    $this->parse_structure($mail_part, true);
-
-                    // list as attachment as well (mostly .eml)
-                    if (!empty($mail_part->filename))
-                        $this->attachments[] = $mail_part;
-                }
-                // ignore "virtual" protocol parts
-                else if ($primary_type == 'protocol') {
-                    continue;
-                }
-                // part is Microsoft Outlook TNEF (winmail.dat)
-                else if ($part_mimetype == 'application/ms-tnef') {
-                    foreach ((array)$this->tnef_decode($mail_part) as $tpart) {
-                        $this->mime_parts[$tpart->mime_id] = $tpart;
-                        $this->attachments[] = $tpart;
-                    }
-                }
-                // part is a file/attachment
-                else if (preg_match('/^(inline|attach)/', $mail_part->disposition) ||
-                    $mail_part->headers['content-id'] ||
-                    ($mail_part->filename &&
-                        (empty($mail_part->disposition) || preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))
-                ) {
-                    // skip apple resource forks
-                    if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
-                        continue;
-
-                    // part belongs to a related message and is linked
-                    if (preg_match('/^multipart\/(related|relative)/', $mimetype)
-                        && ($mail_part->headers['content-id'] || $mail_part->headers['content-location'])) {
-                        if ($mail_part->headers['content-id'])
-                            $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
-                        if ($mail_part->headers['content-location'])
-                            $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
-
-                        $this->inline_parts[] = $mail_part;
-                    }
-                    // attachment encapsulated within message/rfc822 part needs further decoding (#1486743)
-                    else if ($part_orig_mimetype == 'message/rfc822') {
-                        $this->parse_structure($mail_part, true);
-
-                        // list as attachment as well (mostly .eml)
-                        if (!empty($mail_part->filename))
-                            $this->attachments[] = $mail_part;
-                    }
-                    // regular attachment with valid content type
-                    // (content-type name regexp according to RFC4288.4.2)
-                    else if (preg_match('/^[a-z0-9!#$&.+^_-]+\/[a-z0-9!#$&.+^_-]+$/i', $part_mimetype)) {
-                        $this->attachments[] = $mail_part;
-                    }
-                    // attachment with invalid content type
-                    // replace malformed content type with application/octet-stream (#1487767)
-                    else if ($mail_part->filename) {
-                        $mail_part->ctype_primary   = 'application';
-                        $mail_part->ctype_secondary = 'octet-stream';
-                        $mail_part->mimetype        = 'application/octet-stream';
-
-                        $this->attachments[] = $mail_part;
-                    }
-                }
-                // attachment part as message/rfc822 (#1488026)
-                else if ($mail_part->mimetype == 'message/rfc822') {
-                    $this->parse_structure($mail_part);
-                }
-            }
-
-            // if this was a related part try to resolve references
-            if (preg_match('/^multipart\/(related|relative)/', $mimetype) && sizeof($this->inline_parts)) {
-                $a_replaces = array();
-                $img_regexp = '/^image\/(gif|jpe?g|png|tiff|bmp|svg)/';
-
-                foreach ($this->inline_parts as $inline_object) {
-                    $part_url = $this->get_part_url($inline_object->mime_id, $inline_object->ctype_primary);
-                    if (isset($inline_object->content_id))
-                        $a_replaces['cid:'.$inline_object->content_id] = $part_url;
-                    if ($inline_object->content_location) {
-                        $a_replaces[$inline_object->content_location] = $part_url;
-                    }
-
-                    if (!empty($inline_object->filename)) {
-                        // MS Outlook sends sometimes non-related attachments as related
-                        // In this case multipart/related message has only one text part
-                        // We'll add all such attachments to the attachments list
-                        if (!isset($got_html_part) && empty($inline_object->content_id)) {
-                            $this->attachments[] = $inline_object;
-                        }
-                        // MS Outlook sometimes also adds non-image attachments as related
-                        // We'll add all such attachments to the attachments list
-                        // Warning: some browsers support pdf in <img/>
-                        else if (!preg_match($img_regexp, $inline_object->mimetype)) {
-                            $this->attachments[] = $inline_object;
-                        }
-                        // @TODO: we should fetch HTML body and find attachment's content-id
-                        // to handle also image attachments without reference in the body
-                        // @TODO: should we list all image attachments in text mode?
-                    }
-                }
-
-                // add replace array to each content part
-                // (will be applied later when part body is available)
-                foreach ($this->parts as $i => $part) {
-                    if ($part->type == 'content')
-                        $this->parts[$i]->replaces = $a_replaces;
-                }
-            }
-        }
-        // message is a single part non-text
-        else if ($structure->filename) {
-            $this->attachments[] = $structure;
-        }
-        // message is a single part non-text (without filename)
-        else if (preg_match('/application\//i', $mimetype)) {
-            $this->attachments[] = $structure;
-        }
-    }
-
-
-    /**
-     * Fill aflat array with references to all parts, indexed by part numbers
-     *
-     * @param rcube_message_part $part Message body structure
-     */
-    private function get_mime_numbers(&$part)
-    {
-        if (strlen($part->mime_id))
-            $this->mime_parts[$part->mime_id] = &$part;
-
-        if (is_array($part->parts))
-            for ($i=0; $i<count($part->parts); $i++)
-                $this->get_mime_numbers($part->parts[$i]);
-    }
-
-
-    /**
-     * Decode a Microsoft Outlook TNEF part (winmail.dat)
-     *
-     * @param rcube_message_part $part Message part to decode
-     * @return array
-     */
-    function tnef_decode(&$part)
-    {
-        // @TODO: attachment may be huge, hadle it via file
-        if (!isset($part->body)) {
-            $this->storage->set_folder($this->folder);
-            $part->body = $this->storage->get_message_part($this->uid, $part->mime_id, $part);
-        }
-
-        $parts = array();
-        $tnef = new tnef_decoder;
-        $tnef_arr = $tnef->decompress($part->body);
-
-        foreach ($tnef_arr as $pid => $winatt) {
-            $tpart = new rcube_message_part;
-
-            $tpart->filename        = trim($winatt['name']);
-            $tpart->encoding        = 'stream';
-            $tpart->ctype_primary   = trim(strtolower($winatt['type']));
-            $tpart->ctype_secondary = trim(strtolower($winatt['subtype']));
-            $tpart->mimetype        = $tpart->ctype_primary . '/' . $tpart->ctype_secondary;
-            $tpart->mime_id         = 'winmail.' . $part->mime_id . '.' . $pid;
-            $tpart->size            = $winatt['size'];
-            $tpart->body            = $winatt['stream'];
-
-            $parts[] = $tpart;
-            unset($tnef_arr[$pid]);
-        }
-
-        return $parts;
-    }
-
-
-    /**
-     * Parse message body for UUencoded attachments bodies
-     *
-     * @param rcube_message_part $part Message part to decode
-     * @return array
-     */
-    function uu_decode(&$part)
-    {
-        // @TODO: messages may be huge, hadle body via file
-        if (!isset($part->body)) {
-            $this->storage->set_folder($this->folder);
-            $part->body = $this->storage->get_message_part($this->uid, $part->mime_id, $part);
-        }
-
-        $parts = array();
-        // FIXME: line length is max.65?
-        $uu_regexp = '/begin [0-7]{3,4} ([^\n]+)\n/s';
-
-        if (preg_match_all($uu_regexp, $part->body, $matches, PREG_SET_ORDER)) {
-            // update message content-type
-            $part->ctype_primary   = 'multipart';
-            $part->ctype_secondary = 'mixed';
-            $part->mimetype        = $part->ctype_primary . '/' . $part->ctype_secondary;
-            $uu_endstring = "`\nend\n";
-
-            // add attachments to the structure
-            foreach ($matches as $pid => $att) {
-                $startpos = strpos($part->body, $att[1]) + strlen($att[1]) + 1; // "\n"
-                $endpos = strpos($part->body, $uu_endstring);
-                $filebody = substr($part->body, $startpos, $endpos-$startpos);
-
-                // remove attachments bodies from the message body
-                $part->body = substr_replace($part->body, "", $startpos, $endpos+strlen($uu_endstring)-$startpos);
-
-                $uupart = new rcube_message_part;
-
-                $uupart->filename = trim($att[1]);
-                $uupart->encoding = 'stream';
-                $uupart->body     = convert_uudecode($filebody);
-                $uupart->size     = strlen($uupart->body);
-                $uupart->mime_id  = 'uu.' . $part->mime_id . '.' . $pid;
-
-                $ctype = rcube_mime::file_content_type($uupart->body, $uupart->filename, 'application/octet-stream', true);
-                $uupart->mimetype = $ctype;
-                list($uupart->ctype_primary, $uupart->ctype_secondary) = explode('/', $ctype);
-
-                $parts[] = $uupart;
-                unset($matches[$pid]);
-            }
-
-            // remove attachments bodies from the message body
-            $part->body = preg_replace($uu_regexp, '', $part->body);
-        }
-
-        return $parts;
-    }
-
-
-    /**
-     * Deprecated methods (to be removed)
-     */
-
-    public static function unfold_flowed($text)
-    {
-        return rcube_mime::unfold_flowed($text);
-    }
-
-    public static function format_flowed($text, $length = 72)
-    {
-        return rcube_mime::format_flowed($text, $length);
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_message_header.php b/lib/ext/Roundcube/rcube_message_header.php
deleted file mode 100644
index 2c5e2b6..0000000
--- a/lib/ext/Roundcube/rcube_message_header.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   E-mail message headers representation                               |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Struct representing an e-mail message header
- *
- * @package    Framework
- * @subpackage Storage
- * @author     Aleksander Machniak <alec@alec.pl>
- */
-class rcube_message_header
-{
-    /**
-     * Message sequence number
-     *
-     * @var int
-     */
-    public $id;
-
-    /**
-     * Message unique identifier
-     *
-     * @var int
-     */
-    public $uid;
-
-    /**
-     * Message subject
-     *
-     * @var string
-     */
-    public $subject;
-
-    /**
-     * Message sender (From)
-     *
-     * @var string
-     */
-    public $from;
-
-    /**
-     * Message recipient (To)
-     *
-     * @var string
-     */
-    public $to;
-
-    /**
-     * Message additional recipients (Cc)
-     *
-     * @var string
-     */
-    public $cc;
-
-    /**
-     * Message Reply-To header
-     *
-     * @var string
-     */
-    public $replyto;
-
-    /**
-     * Message In-Reply-To header
-     *
-     * @var string
-     */
-    public $in_reply_to;
-
-    /**
-     * Message date (Date)
-     *
-     * @var string
-     */
-    public $date;
-
-    /**
-     * Message identifier (Message-ID)
-     *
-     * @var string
-     */
-    public $messageID;
-
-    /**
-     * Message size
-     *
-     * @var int
-     */
-    public $size;
-
-    /**
-     * Message encoding
-     *
-     * @var string
-     */
-    public $encoding;
-
-    /**
-     * Message charset
-     *
-     * @var string
-     */
-    public $charset;
-
-    /**
-     * Message Content-type
-     *
-     * @var string
-     */
-    public $ctype;
-
-    /**
-     * Message timestamp (based on message date)
-     *
-     * @var int
-     */
-    public $timestamp;
-
-    /**
-     * IMAP bodystructure string
-     *
-     * @var string
-     */
-    public $bodystructure;
-
-    /**
-     * IMAP internal date
-     *
-     * @var string
-     */
-    public $internaldate;
-
-    /**
-     * Message References header
-     *
-     * @var string
-     */
-    public $references;
-
-    /**
-     * Message priority (X-Priority)
-     *
-     * @var int
-     */
-    public $priority;
-
-    /**
-     * Message receipt recipient
-     *
-     * @var string
-     */
-    public $mdn_to;
-
-    /**
-     * Other message headers
-     *
-     * @var array
-     */
-    public $others = array();
-
-    /**
-     * Message flags
-     *
-     * @var array
-     */
-    public $flags = array();
-
-    // map header to rcube_message_header object property
-    private $obj_headers = array(
-        'date'      => 'date',
-        'from'      => 'from',
-        'to'        => 'to',
-        'subject'   => 'subject',
-        'reply-to'  => 'replyto',
-        'cc'        => 'cc',
-        'bcc'       => 'bcc',
-        'content-transfer-encoding' => 'encoding',
-        'in-reply-to'               => 'in_reply_to',
-        'content-type'              => 'ctype',
-        'charset'                   => 'charset',
-        'references'                => 'references',
-        'return-receipt-to'         => 'mdn_to',
-        'disposition-notification-to' => 'mdn_to',
-        'x-confirm-reading-to'      => 'mdn_to',
-        'message-id'                => 'messageID',
-        'x-priority'                => 'priority',
-    );
-
-    /**
-     * Returns header value
-     */
-    public function get($name, $decode = true)
-    {
-        $name = strtolower($name);
-
-        if (isset($this->obj_headers[$name])) {
-            $value = $this->{$this->obj_headers[$name]};
-        }
-        else {
-            $value = $this->others[$name];
-        }
-
-        if ($decode) {
-            $value = rcube_mime::decode_header($value, $this->charset);
-            $value = rcube_charset::clean($value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Sets header value
-     */
-    public function set($name, $value)
-    {
-        $name = strtolower($name);
-
-        if (isset($this->obj_headers[$name])) {
-            $this->{$this->obj_headers[$name]} = $value;
-        }
-        else {
-            $this->others[$name] = $value;
-        }
-    }
-
-
-    /**
-     * Factory method to instantiate headers from a data array
-     *
-     * @param array Hash array with header values
-     * @return object rcube_message_header instance filled with headers values
-     */
-    public static function from_array($arr)
-    {
-        $obj = new rcube_message_header;
-        foreach ($arr as $k => $v)
-            $obj->set($k, $v);
-
-        return $obj;
-    }
-}
-
-
-/**
- * Class for sorting an array of rcube_message_header objects in a predetermined order.
- *
- * @package    Framework
- * @subpackage Storage
- * @author  Aleksander Machniak <alec@alec.pl>
- */
-class rcube_message_header_sorter
-{
-    private $uids = array();
-
-
-    /**
-     * Set the predetermined sort order.
-     *
-     * @param array $index  Numerically indexed array of IMAP UIDs
-     */
-    function set_index($index)
-    {
-        $index = array_flip($index);
-
-        $this->uids = $index;
-    }
-
-    /**
-     * Sort the array of header objects
-     *
-     * @param array $headers Array of rcube_message_header objects indexed by UID
-     */
-    function sort_headers(&$headers)
-    {
-        uksort($headers, array($this, "compare_uids"));
-    }
-
-    /**
-     * Sort method called by uksort()
-     *
-     * @param int $a Array key (UID)
-     * @param int $b Array key (UID)
-     */
-    function compare_uids($a, $b)
-    {
-        // then find each sequence number in my ordered list
-        $posa = isset($this->uids[$a]) ? intval($this->uids[$a]) : -1;
-        $posb = isset($this->uids[$b]) ? intval($this->uids[$b]) : -1;
-
-        // return the relative position as the comparison value
-        return $posa - $posb;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_message_part.php b/lib/ext/Roundcube/rcube_message_part.php
deleted file mode 100644
index 4222ba3..0000000
--- a/lib/ext/Roundcube/rcube_message_part.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Class representing a message part                                   |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Class representing a message part
- *
- * @package    Framework
- * @subpackage Storage
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- */
-class rcube_message_part
-{
-    /**
-     * Part MIME identifier
-     *
-     * @var string
-     */
-    public $mime_id = '';
-
-    /**
-     * Content main type
-     *
-     * @var string
-     */
-    public $ctype_primary = 'text';
-
-    /**
-     * Content subtype
-     *
-     * @var string
-     */
-    public $ctype_secondary = 'plain';
-
-    /**
-     * Complete content type
-     *
-     * @var string
-     */
-    public $mimetype = 'text/plain';
-
-    public $disposition = '';
-    public $filename = '';
-    public $encoding = '8bit';
-    public $charset = '';
-
-    /**
-     * Part size in bytes
-     *
-     * @var int
-     */
-    public $size = 0;
-
-    /**
-     * Part headers
-     *
-     * @var array
-     */
-    public $headers = array();
-
-    public $d_parameters = array();
-    public $ctype_parameters = array();
-
-
-    /**
-     * Clone handler.
-     */
-    function __clone()
-    {
-        if (isset($this->parts)) {
-            foreach ($this->parts as $idx => $part) {
-                if (is_object($part)) {
-                    $this->parts[$idx] = clone $part;
-                }
-            }
-        }
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_mime.php b/lib/ext/Roundcube/rcube_mime.php
deleted file mode 100644
index a931c27..0000000
--- a/lib/ext/Roundcube/rcube_mime.php
+++ /dev/null
@@ -1,884 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   MIME message parsing utilities                                      |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Class for parsing MIME messages
- *
- * @package    Framework
- * @subpackage Storage
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- */
-class rcube_mime
-{
-    private static $default_charset;
-
-
-    /**
-     * Object constructor.
-     */
-    function __construct($default_charset = null)
-    {
-        self::$default_charset = $default_charset;
-    }
-
-
-    /**
-     * Returns message/object character set name
-     *
-     * @return string Characted set name
-     */
-    public static function get_charset()
-    {
-        if (self::$default_charset) {
-            return self::$default_charset;
-        }
-
-        if ($charset = rcube::get_instance()->config->get('default_charset')) {
-            return $charset;
-        }
-
-        return RCUBE_CHARSET;
-    }
-
-
-    /**
-     * Parse the given raw message source and return a structure
-     * of rcube_message_part objects.
-     *
-     * It makes use of the PEAR:Mail_mimeDecode library
-     *
-     * @param string  The message source
-     * @return object rcube_message_part The message structure
-     */
-    public static function parse_message($raw_body)
-    {
-        $mime = new Mail_mimeDecode($raw_body);
-        $struct = $mime->decode(array('include_bodies' => true, 'decode_bodies' => true));
-        return self::structure_part($struct);
-    }
-
-
-    /**
-     * Recursive method to convert a Mail_mimeDecode part into a rcube_message_part object
-     *
-     * @param object  A message part struct
-     * @param int     Part count
-     * @param string  Parent MIME ID
-     *
-     * @return object rcube_message_part
-     */
-    private static function structure_part($part, $count=0, $parent='')
-    {
-        $struct = new rcube_message_part;
-        $struct->mime_id = $part->mime_id ? $part->mime_id : (empty($parent) ? (string)$count : "$parent.$count");
-        $struct->headers = $part->headers;
-        $struct->ctype_primary = $part->ctype_primary;
-        $struct->ctype_secondary = $part->ctype_secondary;
-        $struct->mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
-        $struct->ctype_parameters = $part->ctype_parameters;
-
-        if ($part->headers['content-transfer-encoding'])
-            $struct->encoding = $part->headers['content-transfer-encoding'];
-        if ($part->ctype_parameters['charset'])
-            $struct->charset = $part->ctype_parameters['charset'];
-
-        $part_charset = $struct->charset ? $struct->charset : self::get_charset();
-
-        // determine filename
-        if (($filename = $part->d_parameters['filename']) || ($filename = $part->ctype_parameters['name'])) {
-            $struct->filename = rcube_mime::decode_mime_string($filename, $part_charset);
-        }
-
-        // copy part body and convert it to UTF-8 if necessary
-        $struct->body = $part->ctype_primary == 'text' || !$part->ctype_parameters['charset'] ? rcube_charset::convert($part->body, $part_charset) : $part->body;
-        $struct->size = strlen($part->body);
-        $struct->disposition = $part->disposition;
-
-        foreach ((array)$part->parts as $child_part) {
-            $struct->parts[] = self::structure_part($child_part, ++$count, $struct->mime_id);
-        }
-
-        return $struct;
-    }
-
-
-    /**
-     * Split an address list into a structured array list
-     *
-     * @param string  $input    Input string
-     * @param int     $max      List only this number of addresses
-     * @param boolean $decode   Decode address strings
-     * @param string  $fallback Fallback charset if none specified
-     * @param boolean $addronly Return flat array with e-mail addresses only
-     *
-     * @return array Indexed list of addresses
-     */
-    static function decode_address_list($input, $max = null, $decode = true, $fallback = null, $addronly = false)
-    {
-        $a   = self::parse_address_list($input, $decode, $fallback);
-        $out = array();
-        $j   = 0;
-
-        // Special chars as defined by RFC 822 need to in quoted string (or escaped).
-        $special_chars = '[\(\)\<\>\\\.\[\]@,;:"]';
-
-        if (!is_array($a))
-            return $out;
-
-        foreach ($a as $val) {
-            $j++;
-            $address = trim($val['address']);
-
-            if ($addronly) {
-                $out[$j] = $address;
-            }
-            else {
-                $name = trim($val['name']);
-                if ($name && $address && $name != $address)
-                    $string = sprintf('%s <%s>', preg_match("/$special_chars/", $name) ? '"'.addcslashes($name, '"').'"' : $name, $address);
-                else if ($address)
-                    $string = $address;
-                else if ($name)
-                    $string = $name;
-
-                $out[$j] = array('name' => $name, 'mailto' => $address, 'string' => $string);
-            }
-
-            if ($max && $j==$max)
-                break;
-        }
-
-        return $out;
-    }
-
-
-    /**
-     * Decode a message header value
-     *
-     * @param string  $input         Header value
-     * @param string  $fallback      Fallback charset if none specified
-     *
-     * @return string Decoded string
-     */
-    public static function decode_header($input, $fallback = null)
-    {
-        $str = self::decode_mime_string((string)$input, $fallback);
-
-        return $str;
-    }
-
-
-    /**
-     * Decode a mime-encoded string to internal charset
-     *
-     * @param string $input    Header value
-     * @param string $fallback Fallback charset if none specified
-     *
-     * @return string Decoded string
-     */
-    public static function decode_mime_string($input, $fallback = null)
-    {
-        $default_charset = !empty($fallback) ? $fallback : self::get_charset();
-
-        // rfc: all line breaks or other characters not found
-        // in the Base64 Alphabet must be ignored by decoding software
-        // delete all blanks between MIME-lines, differently we can
-        // receive unnecessary blanks and broken utf-8 symbols
-        $input = preg_replace("/\?=\s+=\?/", '?==?', $input);
-
-        // encoded-word regexp
-        $re = '/=\?([^?]+)\?([BbQq])\?([^\n]*?)\?=/';
-
-        // Find all RFC2047's encoded words
-        if (preg_match_all($re, $input, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-            // Initialize variables
-            $tmp   = array();
-            $out   = '';
-            $start = 0;
-
-            foreach ($matches as $idx => $m) {
-                $pos      = $m[0][1];
-                $charset  = $m[1][0];
-                $encoding = $m[2][0];
-                $text     = $m[3][0];
-                $length   = strlen($m[0][0]);
-
-                // Append everything that is before the text to be decoded
-                if ($start != $pos) {
-                    $substr = substr($input, $start, $pos-$start);
-                    $out   .= rcube_charset::convert($substr, $default_charset);
-                    $start  = $pos;
-                }
-                $start += $length;
-
-                // Per RFC2047, each string part "MUST represent an integral number
-                // of characters . A multi-octet character may not be split across
-                // adjacent encoded-words." However, some mailers break this, so we
-                // try to handle characters spanned across parts anyway by iterating
-                // through and aggregating sequential encoded parts with the same
-                // character set and encoding, then perform the decoding on the
-                // aggregation as a whole.
-
-                $tmp[] = $text;
-                if ($next_match = $matches[$idx+1]) {
-                    if ($next_match[0][1] == $start
-                        && $next_match[1][0] == $charset
-                        && $next_match[2][0] == $encoding
-                    ) {
-                        continue;
-                    }
-                }
-
-                $count = count($tmp);
-                $text  = '';
-
-                // Decode and join encoded-word's chunks
-                if ($encoding == 'B' || $encoding == 'b') {
-                    // base64 must be decoded a segment at a time
-                    for ($i=0; $i<$count; $i++)
-                        $text .= base64_decode($tmp[$i]);
-                }
-                else { //if ($encoding == 'Q' || $encoding == 'q') {
-                    // quoted printable can be combined and processed at once
-                    for ($i=0; $i<$count; $i++)
-                        $text .= $tmp[$i];
-
-                    $text = str_replace('_', ' ', $text);
-                    $text = quoted_printable_decode($text);
-                }
-
-                $out .= rcube_charset::convert($text, $charset);
-                $tmp = array();
-            }
-
-            // add the last part of the input string
-            if ($start != strlen($input)) {
-                $out .= rcube_charset::convert(substr($input, $start), $default_charset);
-            }
-
-            // return the results
-            return $out;
-        }
-
-        // no encoding information, use fallback
-        return rcube_charset::convert($input, $default_charset);
-    }
-
-
-    /**
-     * Decode a mime part
-     *
-     * @param string $input    Input string
-     * @param string $encoding Part encoding
-     * @return string Decoded string
-     */
-    public static function decode($input, $encoding = '7bit')
-    {
-        switch (strtolower($encoding)) {
-        case 'quoted-printable':
-            return quoted_printable_decode($input);
-        case 'base64':
-            return base64_decode($input);
-        case 'x-uuencode':
-        case 'x-uue':
-        case 'uue':
-        case 'uuencode':
-            return convert_uudecode($input);
-        case '7bit':
-        default:
-            return $input;
-        }
-    }
-
-
-    /**
-     * Split RFC822 header string into an associative array
-     * @access private
-     */
-    public static function parse_headers($headers)
-    {
-        $a_headers = array();
-        $headers = preg_replace('/\r?\n(\t| )+/', ' ', $headers);
-        $lines = explode("\n", $headers);
-        $c = count($lines);
-
-        for ($i=0; $i<$c; $i++) {
-            if ($p = strpos($lines[$i], ': ')) {
-                $field = strtolower(substr($lines[$i], 0, $p));
-                $value = trim(substr($lines[$i], $p+1));
-                if (!empty($value))
-                    $a_headers[$field] = $value;
-            }
-        }
-
-        return $a_headers;
-    }
-
-
-    /**
-     * @access private
-     */
-    private static function parse_address_list($str, $decode = true, $fallback = null)
-    {
-        // remove any newlines and carriage returns before
-        $str = preg_replace('/\r?\n(\s|\t)?/', ' ', $str);
-
-        // extract list items, remove comments
-        $str = self::explode_header_string(',;', $str, true);
-        $result = array();
-
-        // simplified regexp, supporting quoted local part
-        $email_rx = '(\S+|("\s*(?:[^"\f\n\r\t\v\b\s]+\s*)+"))@\S+';
-
-        foreach ($str as $key => $val) {
-            $name    = '';
-            $address = '';
-            $val     = trim($val);
-
-            if (preg_match('/(.*)<('.$email_rx.')>$/', $val, $m)) {
-                $address = $m[2];
-                $name    = trim($m[1]);
-            }
-            else if (preg_match('/^('.$email_rx.')$/', $val, $m)) {
-                $address = $m[1];
-                $name    = '';
-            }
-            // special case (#1489092)
-            else if (preg_match('/(\s*<MAILER-DAEMON>)$/', $val, $m)) {
-                $address = 'MAILER-DAEMON';
-                $name    = substr($val, 0, -strlen($m[1]));
-            }
-            else {
-                $name = $val;
-            }
-
-            // dequote and/or decode name
-            if ($name) {
-                if ($name[0] == '"' && $name[strlen($name)-1] == '"') {
-                    $name = substr($name, 1, -1);
-                    $name = stripslashes($name);
-                }
-                if ($decode) {
-                    $name = self::decode_header($name, $fallback);
-                }
-            }
-
-            if (!$address && $name) {
-                $address = $name;
-            }
-
-            if ($address) {
-                $result[$key] = array('name' => $name, 'address' => $address);
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Explodes header (e.g. address-list) string into array of strings
-     * using specified separator characters with proper handling
-     * of quoted-strings and comments (RFC2822)
-     *
-     * @param string $separator       String containing separator characters
-     * @param string $str             Header string
-     * @param bool   $remove_comments Enable to remove comments
-     *
-     * @return array Header items
-     */
-    public static function explode_header_string($separator, $str, $remove_comments = false)
-    {
-        $length  = strlen($str);
-        $result  = array();
-        $quoted  = false;
-        $comment = 0;
-        $out     = '';
-
-        for ($i=0; $i<$length; $i++) {
-            // we're inside a quoted string
-            if ($quoted) {
-                if ($str[$i] == '"') {
-                    $quoted = false;
-                }
-                else if ($str[$i] == "\\") {
-                    if ($comment <= 0) {
-                        $out .= "\\";
-                    }
-                    $i++;
-                }
-            }
-            // we are inside a comment string
-            else if ($comment > 0) {
-                if ($str[$i] == ')') {
-                    $comment--;
-                }
-                else if ($str[$i] == '(') {
-                    $comment++;
-                }
-                else if ($str[$i] == "\\") {
-                    $i++;
-                }
-                continue;
-            }
-            // separator, add to result array
-            else if (strpos($separator, $str[$i]) !== false) {
-                if ($out) {
-                    $result[] = $out;
-                }
-                $out = '';
-                continue;
-            }
-            // start of quoted string
-            else if ($str[$i] == '"') {
-                $quoted = true;
-            }
-            // start of comment
-            else if ($remove_comments && $str[$i] == '(') {
-                $comment++;
-            }
-
-            if ($comment <= 0) {
-                $out .= $str[$i];
-            }
-        }
-
-        if ($out && $comment <= 0) {
-            $result[] = $out;
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Interpret a format=flowed message body according to RFC 2646
-     *
-     * @param string  $text Raw body formatted as flowed text
-     *
-     * @return string Interpreted text with unwrapped lines and stuffed space removed
-     */
-    public static function unfold_flowed($text)
-    {
-        $text = preg_split('/\r?\n/', $text);
-        $last = -1;
-        $q_level = 0;
-
-        foreach ($text as $idx => $line) {
-            if (preg_match('/^(>+)/', $line, $m)) {
-                // remove quote chars
-                $q    = strlen($m[1]);
-                $line = preg_replace('/^>+/', '', $line);
-                // remove (optional) space-staffing
-                $line = preg_replace('/^ /', '', $line);
-
-                // The same paragraph (We join current line with the previous one) when:
-                // - the same level of quoting
-                // - previous line was flowed
-                // - previous line contains more than only one single space (and quote char(s))
-                if ($q == $q_level
-                    && isset($text[$last]) && $text[$last][strlen($text[$last])-1] == ' '
-                    && !preg_match('/^>+ {0,1}$/', $text[$last])
-                ) {
-                    $text[$last] .= $line;
-                    unset($text[$idx]);
-                }
-                else {
-                    $last = $idx;
-                }
-            }
-            else {
-                $q = 0;
-                if ($line == '-- ') {
-                    $last = $idx;
-                }
-                else {
-                    // remove space-stuffing
-                    $line = preg_replace('/^\s/', '', $line);
-
-                    if (isset($text[$last]) && $line
-                        && $text[$last] != '-- '
-                        && $text[$last][strlen($text[$last])-1] == ' '
-                    ) {
-                        $text[$last] .= $line;
-                        unset($text[$idx]);
-                    }
-                    else {
-                        $text[$idx] = $line;
-                        $last = $idx;
-                    }
-                }
-            }
-            $q_level = $q;
-        }
-
-        return implode("\r\n", $text);
-    }
-
-
-    /**
-     * Wrap the given text to comply with RFC 2646
-     *
-     * @param string $text Text to wrap
-     * @param int $length Length
-     * @param string $charset Character encoding of $text
-     *
-     * @return string Wrapped text
-     */
-    public static function format_flowed($text, $length = 72, $charset=null)
-    {
-        $text = preg_split('/\r?\n/', $text);
-
-        foreach ($text as $idx => $line) {
-            if ($line != '-- ') {
-                if (preg_match('/^(>+)/', $line, $m)) {
-                    // remove quote chars
-                    $level  = strlen($m[1]);
-                    $line   = preg_replace('/^>+/', '', $line);
-                    // remove (optional) space-staffing and spaces before the line end
-                    $line   = preg_replace('/(^ | +$)/', '', $line);
-                    $prefix = str_repeat('>', $level) . ' ';
-                    $line   = $prefix . self::wordwrap($line, $length - $level - 2, " \r\n$prefix", false, $charset);
-                }
-                else if ($line) {
-                    $line = self::wordwrap(rtrim($line), $length - 2, " \r\n", false, $charset);
-                    // space-stuffing
-                    $line = preg_replace('/(^|\r\n)(From| |>)/', '\\1 \\2', $line);
-                }
-
-                $text[$idx] = $line;
-            }
-        }
-
-        return implode("\r\n", $text);
-    }
-
-
-    /**
-     * Improved wordwrap function with multibyte support.
-     * The code is based on Zend_Text_MultiByte::wordWrap().
-     *
-     * @param string $string      Text to wrap
-     * @param int    $width       Line width
-     * @param string $break       Line separator
-     * @param bool   $cut         Enable to cut word
-     * @param string $charset     Charset of $string
-     * @param bool   $wrap_quoted When enabled quoted lines will not be wrapped
-     *
-     * @return string Text
-     */
-    public static function wordwrap($string, $width=75, $break="\n", $cut=false, $charset=null, $wrap_quoted=true)
-    {
-        // Note: Never try to use iconv instead of mbstring functions here
-        //       Iconv's substr/strlen are 100x slower (#1489113)
-
-        if ($charset && $charset != RCUBE_CHARSET && function_exists('mb_internal_encoding')) {
-            mb_internal_encoding($charset);
-        }
-
-        // Convert \r\n to \n, this is our line-separator
-        $string       = str_replace("\r\n", "\n", $string);
-        $separator    = "\n"; // must be 1 character length
-        $result       = array();
-
-        while (($stringLength = mb_strlen($string)) > 0) {
-            $breakPos = mb_strpos($string, $separator, 0);
-
-            // quoted line (do not wrap)
-            if ($wrap_quoted && $string[0] == '>') {
-                if ($breakPos === $stringLength - 1 || $breakPos === false) {
-                    $subString = $string;
-                    $cutLength = null;
-                }
-                else {
-                    $subString = mb_substr($string, 0, $breakPos);
-                    $cutLength = $breakPos + 1;
-                }
-            }
-            // next line found and current line is shorter than the limit
-            else if ($breakPos !== false && $breakPos < $width) {
-                if ($breakPos === $stringLength - 1) {
-                    $subString = $string;
-                    $cutLength = null;
-                }
-                else {
-                    $subString = mb_substr($string, 0, $breakPos);
-                    $cutLength = $breakPos + 1;
-                }
-            }
-            else {
-                $subString = mb_substr($string, 0, $width);
-
-                // last line
-                if ($breakPos === false && $subString === $string) {
-                    $cutLength = null;
-                }
-                else {
-                    $nextChar = mb_substr($string, $width, 1);
-
-                    if ($nextChar === ' ' || $nextChar === $separator) {
-                        $afterNextChar = mb_substr($string, $width + 1, 1);
-
-                        // Note: mb_substr() does never return False
-                        if ($afterNextChar === false || $afterNextChar === '') {
-                            $subString .= $nextChar;
-                        }
-
-                        $cutLength = mb_strlen($subString) + 1;
-                    }
-                    else {
-                        $spacePos = mb_strrpos($subString, ' ', 0);
-
-                        if ($spacePos !== false) {
-                            $subString = mb_substr($subString, 0, $spacePos);
-                            $cutLength = $spacePos + 1;
-                        }
-                        else if ($cut === false) {
-                            $spacePos = mb_strpos($string, ' ', 0);
-
-                            if ($spacePos !== false && ($breakPos === false || $spacePos < $breakPos)) {
-                                $subString = mb_substr($string, 0, $spacePos);
-                                $cutLength = $spacePos + 1;
-                            }
-                            else if ($breakPos === false) {
-                                $subString = $string;
-                                $cutLength = null;
-                            }
-                            else {
-                                $subString = mb_substr($string, 0, $breakPos);
-                                $cutLength = $breakPos + 1;
-                            }
-                        }
-                        else {
-                            $cutLength = $width;
-                        }
-                    }
-                }
-            }
-
-            $result[] = $subString;
-
-            if ($cutLength !== null) {
-                $string = mb_substr($string, $cutLength, ($stringLength - $cutLength));
-            }
-            else {
-                break;
-            }
-        }
-
-        if ($charset && $charset != RCUBE_CHARSET && function_exists('mb_internal_encoding')) {
-            mb_internal_encoding(RCUBE_CHARSET);
-        }
-
-        return implode($break, $result);
-    }
-
-
-    /**
-     * A method to guess the mime_type of an attachment.
-     *
-     * @param string $path      Path to the file or file contents
-     * @param string $name      File name (with suffix)
-     * @param string $failover  Mime type supplied for failover
-     * @param boolean $is_stream   Set to True if $path contains file contents
-     * @param boolean $skip_suffix Set to True if the config/mimetypes.php mappig should be ignored
-     *
-     * @return string
-     * @author Till Klampaeckel <till@php.net>
-     * @see    http://de2.php.net/manual/en/ref.fileinfo.php
-     * @see    http://de2.php.net/mime_content_type
-     */
-    public static function file_content_type($path, $name, $failover = 'application/octet-stream', $is_stream = false, $skip_suffix = false)
-    {
-        static $mime_ext = array();
-
-        $mime_type = null;
-        $config = rcube::get_instance()->config;
-        $mime_magic = $config->get('mime_magic');
-
-        if (!$skip_suffix && empty($mime_ext)) {
-            foreach ($config->resolve_paths('mimetypes.php') as $fpath) {
-                $mime_ext = array_merge($mime_ext, (array) @include($fpath));
-            }
-        }
-
-        // use file name suffix with hard-coded mime-type map
-        if (!$skip_suffix && is_array($mime_ext) && $name) {
-            if ($suffix = substr($name, strrpos($name, '.')+1)) {
-                $mime_type = $mime_ext[strtolower($suffix)];
-            }
-        }
-
-        // try fileinfo extension if available
-        if (!$mime_type && function_exists('finfo_open')) {
-            // null as a 2nd argument should be the same as no argument
-            // this however is not true on all systems/versions
-            if ($mime_magic) {
-                $finfo = finfo_open(FILEINFO_MIME, $mime_magic);
-            }
-            else {
-                $finfo = finfo_open(FILEINFO_MIME);
-            }
-
-            if ($finfo) {
-                if ($is_stream)
-                    $mime_type = finfo_buffer($finfo, $path);
-                else
-                    $mime_type = finfo_file($finfo, $path);
-                finfo_close($finfo);
-            }
-        }
-
-        // try PHP's mime_content_type
-        if (!$mime_type && !$is_stream && function_exists('mime_content_type')) {
-            $mime_type = @mime_content_type($path);
-        }
-
-        // fall back to user-submitted string
-        if (!$mime_type) {
-            $mime_type = $failover;
-        }
-        else {
-            // Sometimes (PHP-5.3?) content-type contains charset definition,
-            // Remove it (#1487122) also "charset=binary" is useless
-            $mime_type = array_shift(preg_split('/[; ]/', $mime_type));
-        }
-
-        return $mime_type;
-    }
-
-
-    /**
-     * Get mimetype => file extension mapping
-     *
-     * @param string  Mime-Type to get extensions for
-     * @return array  List of extensions matching the given mimetype or a hash array with ext -> mimetype mappings if $mimetype is not given
-     */
-    public static function get_mime_extensions($mimetype = null)
-    {
-        static $mime_types, $mime_extensions;
-
-        // return cached data
-        if (is_array($mime_types)) {
-            return $mimetype ? $mime_types[$mimetype] : $mime_extensions;
-        }
-
-        // load mapping file
-        $file_paths = array();
-
-        if ($mime_types = rcube::get_instance()->config->get('mime_types')) {
-            $file_paths[] = $mime_types;
-        }
-
-        // try common locations
-        if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
-            $file_paths[] = 'C:/xampp/apache/conf/mime.types.';
-        }
-        else {
-            $file_paths[] = '/etc/mime.types';
-            $file_paths[] = '/etc/httpd/mime.types';
-            $file_paths[] = '/etc/httpd2/mime.types';
-            $file_paths[] = '/etc/apache/mime.types';
-            $file_paths[] = '/etc/apache2/mime.types';
-            $file_paths[] = '/usr/local/etc/httpd/conf/mime.types';
-            $file_paths[] = '/usr/local/etc/apache/conf/mime.types';
-        }
-
-        foreach ($file_paths as $fp) {
-            if (@is_readable($fp)) {
-                $lines = file($fp, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-                break;
-            }
-        }
-
-        $mime_types = $mime_extensions = array();
-        $regex = "/([\w\+\-\.\/]+)\s+([\w\s]+)/i";
-        foreach((array)$lines as $line) {
-             // skip comments or mime types w/o any extensions
-            if ($line[0] == '#' || !preg_match($regex, $line, $matches))
-                continue;
-
-            $mime = $matches[1];
-            foreach (explode(' ', $matches[2]) as $ext) {
-                $ext = trim($ext);
-                $mime_types[$mime][] = $ext;
-                $mime_extensions[$ext] = $mime;
-            }
-        }
-
-        // fallback to some well-known types most important for daily emails
-        if (empty($mime_types)) {
-            foreach (rcube::get_instance()->config->resolve_paths('mimetypes.php') as $fpath) {
-                $mime_extensions = array_merge($mime_extensions, (array) @include($fpath));
-            }
-
-            foreach ($mime_extensions as $ext => $mime) {
-                $mime_types[$mime][] = $ext;
-            }
-        }
-
-        // Add some known aliases that aren't included by some mime.types (#1488891)
-        // the order is important here so standard extensions have higher prio
-        $aliases = array(
-            'image/gif'      => array('gif'),
-            'image/png'      => array('png'),
-            'image/x-png'    => array('png'),
-            'image/jpeg'     => array('jpg', 'jpeg', 'jpe'),
-            'image/jpg'      => array('jpg', 'jpeg', 'jpe'),
-            'image/pjpeg'    => array('jpg', 'jpeg', 'jpe'),
-            'image/tiff'     => array('tif'),
-            'message/rfc822' => array('eml'),
-            'text/x-mail'    => array('eml'),
-        );
-
-        foreach ($aliases as $mime => $exts) {
-            $mime_types[$mime] = array_unique(array_merge((array) $mime_types[$mime], $exts));
-
-            foreach ($exts as $ext) {
-                if (!isset($mime_extensions[$ext])) {
-                    $mime_extensions[$ext] = $mime;
-                }
-            }
-        }
-
-        return $mimetype ? $mime_types[$mimetype] : $mime_extensions;
-    }
-
-
-    /**
-     * Detect image type of the given binary data by checking magic numbers.
-     *
-     * @param string $data  Binary file content
-     *
-     * @return string Detected mime-type or jpeg as fallback
-     */
-    public static function image_content_type($data)
-    {
-        $type = 'jpeg';
-        if      (preg_match('/^\x89\x50\x4E\x47/', $data)) $type = 'png';
-        else if (preg_match('/^\x47\x49\x46\x38/', $data)) $type = 'gif';
-        else if (preg_match('/^\x00\x00\x01\x00/', $data)) $type = 'ico';
-    //  else if (preg_match('/^\xFF\xD8\xFF\xE0/', $data)) $type = 'jpeg';
-
-        return 'image/' . $type;
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_output.php b/lib/ext/Roundcube/rcube_output.php
deleted file mode 100644
index 7ccf9a0..0000000
--- a/lib/ext/Roundcube/rcube_output.php
+++ /dev/null
@@ -1,269 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube PHP suite                          |
- | Copyright (C) 2005-2012 The Roundcube Dev Team                        |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | CONTENTS:                                                             |
- |   Abstract class for output generation                                |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Class for output generation
- *
- * @package    Framework
- * @subpackage View
- */
-abstract class rcube_output
-{
-    public $browser;
-
-    protected $app;
-    protected $config;
-    protected $charset = RCUBE_CHARSET;
-    protected $env = array();
-
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        $this->app     = rcube::get_instance();
-        $this->config  = $this->app->config;
-        $this->browser = new rcube_browser();
-    }
-
-
-    /**
-     * Magic getter
-     */
-    public function __get($var)
-    {
-        // allow read-only access to $env
-        if ($var == 'env')
-            return $this->env;
-
-        return null;
-    }
-
-
-    /**
-     * Setter for output charset.
-     * To be specified in a meta tag and sent as http-header
-     *
-     * @param string $charset Charset name
-     */
-    public function set_charset($charset)
-    {
-        $this->charset = $charset;
-    }
-
-
-    /**
-     * Getter for output charset
-     *
-     * @return string Output charset name
-     */
-    public function get_charset()
-    {
-        return $this->charset;
-    }
-
-
-    /**
-     * Set environment variable
-     *
-     * @param string $name   Property name
-     * @param mixed  $value  Property value
-     */
-    public function set_env($name, $value)
-    {
-        $this->env[$name] = $value;
-    }
-
-
-    /**
-     * Environment variable getter.
-     *
-     * @param string $name  Property name
-     *
-     * @return mixed Property value
-     */
-    public function get_env($name)
-    {
-        return $this->env[$name];
-    }
-
-
-    /**
-     * Delete all stored env variables and commands
-     */
-    public function reset()
-    {
-        $this->env = array();
-    }
-
-
-    /**
-     * Invoke display_message command
-     *
-     * @param string  $message  Message to display
-     * @param string  $type     Message type [notice|confirm|error]
-     * @param array   $vars     Key-value pairs to be replaced in localized text
-     * @param boolean $override Override last set message
-     * @param int     $timeout  Message displaying time in seconds
-     */
-    abstract function show_message($message, $type = 'notice', $vars = null, $override = true, $timeout = 0);
-
-
-    /**
-     * Redirect to a certain url.
-     *
-     * @param mixed $p     Either a string with the action or url parameters as key-value pairs
-     * @param int   $delay Delay in seconds
-     */
-    abstract function redirect($p = array(), $delay = 1);
-
-
-    /**
-     * Send output to the client.
-     */
-    abstract function send();
-
-
-    /**
-     * Send HTTP headers to prevent caching a page
-     */
-    public function nocacheing_headers()
-    {
-        if (headers_sent()) {
-            return;
-        }
-
-        header("Expires: ".gmdate("D, d M Y H:i:s")." GMT");
-        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-        // Request browser to disable DNS prefetching (CVE-2010-0464)
-        header("X-DNS-Prefetch-Control: off");
-
-        // We need to set the following headers to make downloads work using IE in HTTPS mode.
-        if ($this->browser->ie && rcube_utils::https_check()) {
-            header('Pragma: private');
-            header("Cache-Control: private, must-revalidate");
-        }
-        else {
-            header("Cache-Control: private, no-cache, no-store, must-revalidate, post-check=0, pre-check=0");
-            header("Pragma: no-cache");
-        }
-    }
-
-    /**
-     * Send header with expire date 30 days in future
-     *
-     * @param int Expiration time in seconds
-     */
-    public function future_expire_header($offset = 2600000)
-    {
-        if (headers_sent())
-            return;
-
-        header("Expires: " . gmdate("D, d M Y H:i:s", time()+$offset) . " GMT");
-        header("Cache-Control: max-age=$offset");
-        header("Pragma: ");
-    }
-
-
-    /**
-     * Show error page and terminate script execution
-     *
-     * @param int    $code     Error code
-     * @param string $message  Error message
-     */
-    public function raise_error($code, $message)
-    {
-        // STUB: to be overloaded by specific output classes
-        fputs(STDERR, "Error $code: $message\n");
-        exit(-1);
-    }
-
-
-    /**
-     * Create an edit field for inclusion on a form
-     *
-     * @param string col field name
-     * @param string value field value
-     * @param array attrib HTML element attributes for field
-     * @param string type HTML element type (default 'text')
-     *
-     * @return string HTML field definition
-     */
-    public static function get_edit_field($col, $value, $attrib, $type = 'text')
-    {
-        static $colcounts = array();
-
-        $fname = '_'.$col;
-        $attrib['name']  = $fname . ($attrib['array'] ? '[]' : '');
-        $attrib['class'] = trim($attrib['class'] . ' ff_' . $col);
-
-        if ($type == 'checkbox') {
-            $attrib['value'] = '1';
-            $input = new html_checkbox($attrib);
-        }
-        else if ($type == 'textarea') {
-            $attrib['cols'] = $attrib['size'];
-            $input = new html_textarea($attrib);
-        }
-        else if ($type == 'select') {
-            $input = new html_select($attrib);
-            $input->add('---', '');
-            $input->add(array_values($attrib['options']), array_keys($attrib['options']));
-        }
-        else if ($attrib['type'] == 'password') {
-            $input = new html_passwordfield($attrib);
-        }
-        else {
-            if ($attrib['type'] != 'text' && $attrib['type'] != 'hidden') {
-                $attrib['type'] = 'text';
-            }
-            $input = new html_inputfield($attrib);
-        }
-
-        // use value from post
-        if (isset($_POST[$fname])) {
-            $postvalue = rcube_utils::get_input_value($fname, rcube_utils::INPUT_POST, true);
-            $value = $attrib['array'] ? $postvalue[intval($colcounts[$col]++)] : $postvalue;
-        }
-
-        $out = $input->show($value);
-
-        return $out;
-    }
-
-
-    /**
-     * Convert a variable into a javascript object notation
-     *
-     * @param mixed Input value
-     *
-     * @return string Serialized JSON string
-     */
-    public static function json_serialize($input)
-    {
-        $input = rcube_charset::clean($input);
-
-        // sometimes even using rcube_charset::clean() the input contains invalid UTF-8 sequences
-        // that's why we have @ here
-        return @json_encode($input);
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_plugin.php b/lib/ext/Roundcube/rcube_plugin.php
deleted file mode 100644
index 3153a84..0000000
--- a/lib/ext/Roundcube/rcube_plugin.php
+++ /dev/null
@@ -1,417 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |  Abstract plugins interface/class                                     |
- |  All plugins need to extend this class                                |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Plugin interface class
- *
- * @package    Framework
- * @subpackage PluginAPI
- */
-abstract class rcube_plugin
-{
-    /**
-     * Class name of the plugin instance
-     *
-     * @var string
-     */
-    public $ID;
-
-    /**
-     * Instance of Plugin API
-     *
-     * @var rcube_plugin_api
-     */
-    public $api;
-
-    /**
-     * Regular expression defining task(s) to bind with 
-     *
-     * @var string
-     */
-    public $task;
-
-    /**
-     * Disables plugin in AJAX requests
-     *
-     * @var boolean
-     */
-    public $noajax = false;
-
-    /**
-     * Disables plugin in framed mode
-     *
-     * @var boolean
-     */
-    public $noframe = false;
-
-    /**
-     * A list of config option names that can be modified
-     * by the user via user interface (with save-prefs command)
-     *
-     * @var array
-     */
-    public $allowed_prefs;
-
-    protected $home;
-    protected $urlbase;
-    private $mytask;
-
-
-    /**
-     * Default constructor.
-     *
-     * @param rcube_plugin_api $api Plugin API
-     */
-    public function __construct($api)
-    {
-        $this->ID      = get_class($this);
-        $this->api     = $api;
-        $this->home    = $api->dir . $this->ID;
-        $this->urlbase = $api->url . $this->ID . '/';
-    }
-
-    /**
-     * Initialization method, needs to be implemented by the plugin itself
-     */
-    abstract function init();
-
-    /**
-     * Provide information about this
-     *
-     * @return array Meta information about a plugin or false if not implemented
-     */
-    public static function info()
-    {
-        return false;
-    }
-
-    /**
-     * Attempt to load the given plugin which is required for the current plugin
-     *
-     * @param string Plugin name
-     * @return boolean True on success, false on failure
-     */
-    public function require_plugin($plugin_name)
-    {
-        return $this->api->load_plugin($plugin_name);
-    }
-
-    /**
-     * Load local config file from plugins directory.
-     * The loaded values are patched over the global configuration.
-     *
-     * @param string $fname Config file name relative to the plugin's folder
-     *
-     * @return boolean True on success, false on failure
-     */
-    public function load_config($fname = 'config.inc.php')
-    {
-        $fpath = $this->home.'/'.$fname;
-        $rcube = rcube::get_instance();
-
-        if (is_file($fpath) && !$rcube->config->load_from_file($fpath)) {
-            rcube::raise_error(array(
-                'code' => 527, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Failed to load config from $fpath"), true, false);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Register a callback function for a specific (server-side) hook
-     *
-     * @param string $hook     Hook name
-     * @param mixed  $callback Callback function as string or array
-     *                         with object reference and method name
-     */
-    public function add_hook($hook, $callback)
-    {
-        $this->api->register_hook($hook, $callback);
-    }
-
-    /**
-     * Unregister a callback function for a specific (server-side) hook.
-     *
-     * @param string $hook     Hook name
-     * @param mixed  $callback Callback function as string or array
-     *                         with object reference and method name
-     */
-    public function remove_hook($hook, $callback)
-    {
-        $this->api->unregister_hook($hook, $callback);
-    }
-
-    /**
-     * Load localized texts from the plugins dir
-     *
-     * @param string $dir        Directory to search in
-     * @param mixed  $add2client Make texts also available on the client
-     *                           (array with list or true for all)
-     */
-    public function add_texts($dir, $add2client = false)
-    {
-        $domain = $this->ID;
-        $lang   = $_SESSION['language'];
-        $langs  = array_unique(array('en_US', $lang));
-        $locdir = slashify(realpath(slashify($this->home) . $dir));
-        $texts  = array();
-
-        // Language aliases used to find localization in similar lang, see below
-        $aliases = array(
-            'de_CH' => 'de_DE',
-            'es_AR' => 'es_ES',
-            'fa_AF' => 'fa_IR',
-            'nl_BE' => 'nl_NL',
-            'pt_BR' => 'pt_PT',
-            'zh_CN' => 'zh_TW',
-        );
-
-        // use buffering to handle empty lines/spaces after closing PHP tag
-        ob_start();
-
-        foreach ($langs as $lng) {
-            $fpath = $locdir . $lng . '.inc';
-            if (is_file($fpath) && is_readable($fpath)) {
-                include $fpath;
-                $texts = (array)$labels + (array)$messages + (array)$texts;
-            }
-            else if ($lng != 'en_US') {
-                // Find localization in similar language (#1488401)
-                $alias = null;
-                if (!empty($aliases[$lng])) {
-                    $alias = $aliases[$lng];
-                }
-                else if ($key = array_search($lng, $aliases)) {
-                    $alias = $key;
-                }
-
-                if (!empty($alias)) {
-                    $fpath = $locdir . $alias . '.inc';
-                    if (is_file($fpath) && is_readable($fpath)) {
-                        include $fpath;
-                        $texts = (array)$labels + (array)$messages + (array)$texts;
-                    }
-                }
-            }
-        }
-
-        ob_end_clean();
-
-        // prepend domain to text keys and add to the application texts repository
-        if (!empty($texts)) {
-            $add = array();
-            foreach ($texts as $key => $value) {
-                $add[$domain.'.'.$key] = $value;
-            }
-
-            $rcube = rcube::get_instance();
-            $rcube->load_language($lang, $add);
-
-            // add labels to client
-            if ($add2client && method_exists($rcube->output, 'add_label')) {
-                if (is_array($add2client)) {
-                    $js_labels = array_map(array($this, 'label_map_callback'), $add2client);
-                }
-                else {
-                    $js_labels = array_keys($add);
-                }
-                $rcube->output->add_label($js_labels);
-            }
-        }
-    }
-
-    /**
-     * Wrapper for add_label() adding the plugin ID as domain
-     */
-    public function add_label()
-    {
-        $rcube = rcube::get_instance();
-
-        if (method_exists($rcube->output, 'add_label')) {
-            $args = func_get_args();
-            if (count($args) == 1 && is_array($args[0])) {
-                $args = $args[0];
-            }
-
-            $args = array_map(array($this, 'label_map_callback'), $args);
-            $rcube->output->add_label($args);
-        }
-    }
-
-    /**
-     * Wrapper for rcube::gettext() adding the plugin ID as domain
-     *
-     * @param string $p Message identifier
-     *
-     * @return string Localized text
-     * @see rcube::gettext()
-     */
-    public function gettext($p)
-    {
-        return rcube::get_instance()->gettext($p, $this->ID);
-    }
-
-    /**
-     * Register this plugin to be responsible for a specific task
-     *
-     * @param string $task Task name (only characters [a-z0-9_-] are allowed)
-     */
-    public function register_task($task)
-    {
-        if ($this->api->register_task($task, $this->ID)) {
-            $this->mytask = $task;
-        }
-    }
-
-    /**
-     * Register a handler for a specific client-request action
-     *
-     * The callback will be executed upon a request like /?_task=mail&_action=plugin.myaction
-     *
-     * @param string $action  Action name (should be unique)
-     * @param mixed $callback Callback function as string
-     *                        or array with object reference and method name
-     */
-    public function register_action($action, $callback)
-    {
-        $this->api->register_action($action, $this->ID, $callback, $this->mytask);
-    }
-
-    /**
-     * Register a handler function for a template object
-     *
-     * When parsing a template for display, tags like <roundcube:object name="plugin.myobject" />
-     * will be replaced by the return value if the registered callback function.
-     *
-     * @param string $name     Object name (should be unique and start with 'plugin.')
-     * @param mixed  $callback Callback function as string or array with object reference
-     *                         and method name
-     */
-    public function register_handler($name, $callback)
-    {
-        $this->api->register_handler($name, $this->ID, $callback);
-    }
-
-    /**
-     * Make this javascipt file available on the client
-     *
-     * @param string $fn File path; absolute or relative to the plugin directory
-     */
-    public function include_script($fn)
-    {
-        $this->api->include_script($this->resource_url($fn));
-    }
-
-    /**
-     * Make this stylesheet available on the client
-     *
-     * @param string $fn File path; absolute or relative to the plugin directory
-     */
-    public function include_stylesheet($fn)
-    {
-        $this->api->include_stylesheet($this->resource_url($fn));
-    }
-
-    /**
-     * Append a button to a certain container
-     *
-     * @param array $p Hash array with named parameters (as used in skin templates)
-     * @param string $container Container name where the buttons should be added to
-     *
-     * @see rcube_remplate::button()
-     */
-    public function add_button($p, $container)
-    {
-        if ($this->api->output->type == 'html') {
-            // fix relative paths
-            foreach (array('imagepas', 'imageact', 'imagesel') as $key) {
-                if ($p[$key]) {
-                    $p[$key] = $this->api->url . $this->resource_url($p[$key]);
-                }
-            }
-
-            $this->api->add_content($this->api->output->button($p), $container);
-        }
-    }
-
-    /**
-     * Generate an absolute URL to the given resource within the current
-     * plugin directory
-     *
-     * @param string $fn The file name
-     *
-     * @return string Absolute URL to the given resource
-     */
-    public function url($fn)
-    {
-        return $this->api->url . $this->resource_url($fn);
-    }
-
-    /**
-     * Make the given file name link into the plugin directory
-     *
-     * @param string $fn Filename
-     */
-    private function resource_url($fn)
-    {
-        if ($fn[0] != '/' && !preg_match('|^https?://|i', $fn)) {
-            return $this->ID . '/' . $fn;
-        }
-        else {
-            return $fn;
-        }
-    }
-
-    /**
-     * Provide path to the currently selected skin folder within the plugin directory
-     * with a fallback to the default skin folder.
-     *
-     * @return string Skin path relative to plugins directory
-     */
-    public function local_skin_path()
-    {
-        $rcube = rcube::get_instance();
-        foreach (array($rcube->config->get('skin'), 'larry') as $skin) {
-            $skin_path = 'skins/' . $skin;
-            if (is_dir(realpath(slashify($this->home) . $skin_path))) {
-                break;
-            }
-        }
-
-        return $skin_path;
-    }
-
-    /**
-     * Callback function for array_map
-     *
-     * @param string $key Array key.
-     * @return string
-     */
-    private function label_map_callback($key)
-    {
-        if (strpos($key, $this->ID.'.') === 0) {
-            return $key;
-        }
-
-        return $this->ID.'.'.$key;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_plugin_api.php b/lib/ext/Roundcube/rcube_plugin_api.php
deleted file mode 100644
index 2258f14..0000000
--- a/lib/ext/Roundcube/rcube_plugin_api.php
+++ /dev/null
@@ -1,624 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Plugins repository                                                  |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-// location where plugins are loade from
-if (!defined('RCUBE_PLUGINS_DIR')) {
-    define('RCUBE_PLUGINS_DIR', RCUBE_INSTALL_PATH . 'plugins/');
-}
-
-/**
- * The plugin loader and global API
- *
- * @package    Framework
- * @subpackage PluginAPI
- */
-class rcube_plugin_api
-{
-    static protected $instance;
-
-    public $dir;
-    public $url = 'plugins/';
-    public $task = '';
-    public $output;
-    public $handlers              = array();
-    public $allowed_prefs         = array();
-    public $allowed_session_prefs = array();
-
-    protected $plugins = array();
-    protected $tasks = array();
-    protected $actions = array();
-    protected $actionmap = array();
-    protected $objectsmap = array();
-    protected $template_contents = array();
-    protected $active_hook = false;
-
-    // Deprecated names of hooks, will be removed after 0.5-stable release
-    protected $deprecated_hooks = array(
-        'create_user'       => 'user_create',
-        'kill_session'      => 'session_destroy',
-        'upload_attachment' => 'attachment_upload',
-        'save_attachment'   => 'attachment_save',
-        'get_attachment'    => 'attachment_get',
-        'cleanup_attachments' => 'attachments_cleanup',
-        'display_attachment' => 'attachment_display',
-        'remove_attachment' => 'attachment_delete',
-        'outgoing_message_headers' => 'message_outgoing_headers',
-        'outgoing_message_body' => 'message_outgoing_body',
-        'address_sources'   => 'addressbooks_list',
-        'get_address_book'  => 'addressbook_get',
-        'create_contact'    => 'contact_create',
-        'save_contact'      => 'contact_update',
-        'contact_save'      => 'contact_update',
-        'delete_contact'    => 'contact_delete',
-        'manage_folders'    => 'folders_list',
-        'list_mailboxes'    => 'mailboxes_list',
-        'save_preferences'  => 'preferences_save',
-        'user_preferences'  => 'preferences_list',
-        'list_prefs_sections' => 'preferences_sections_list',
-        'list_identities'   => 'identities_list',
-        'create_identity'   => 'identity_create',
-        'delete_identity'   => 'identity_delete',
-        'save_identity'     => 'identity_update',
-        'identity_save'     => 'identity_update',
-        // to be removed after 0.8
-        'imap_init'         => 'storage_init',
-        'mailboxes_list'    => 'storage_folders',
-        'imap_connect'      => 'storage_connect',
-    );
-
-    /**
-     * This implements the 'singleton' design pattern
-     *
-     * @return rcube_plugin_api The one and only instance if this class
-     */
-    static function get_instance()
-    {
-        if (!self::$instance) {
-            self::$instance = new rcube_plugin_api();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Private constructor
-     */
-    protected function __construct()
-    {
-        $this->dir = slashify(RCUBE_PLUGINS_DIR);
-    }
-
-    /**
-     * Initialize plugin engine
-     *
-     * This has to be done after rcmail::load_gui() or rcmail::json_init()
-     * was called because plugins need to have access to rcmail->output
-     *
-     * @param object rcube Instance of the rcube base class
-     * @param string Current application task (used for conditional plugin loading)
-     */
-    public function init($app, $task = '')
-    {
-        $this->task   = $task;
-        $this->output = $app->output;
-
-        // register an internal hook
-        $this->register_hook('template_container', array($this, 'template_container_hook'));
-
-        // maybe also register a shudown function which triggers
-        // shutdown functions of all plugin objects
-    }
-
-    /**
-     * Load and init all enabled plugins
-     *
-     * This has to be done after rcmail::load_gui() or rcmail::json_init()
-     * was called because plugins need to have access to rcmail->output
-     *
-     * @param array List of configured plugins to load
-     * @param array List of plugins required by the application
-     */
-    public function load_plugins($plugins_enabled, $required_plugins = array())
-    {
-        foreach ($plugins_enabled as $plugin_name) {
-            $this->load_plugin($plugin_name);
-        }
-
-        // check existance of all required core plugins
-        foreach ($required_plugins as $plugin_name) {
-            $loaded = false;
-            foreach ($this->plugins as $plugin) {
-                if ($plugin instanceof $plugin_name) {
-                    $loaded = true;
-                    break;
-                }
-            }
-
-            // load required core plugin if no derivate was found
-            if (!$loaded) {
-                $loaded = $this->load_plugin($plugin_name);
-            }
-
-            // trigger fatal error if still not loaded
-            if (!$loaded) {
-                rcube::raise_error(array(
-                    'code' => 520, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Requried plugin $plugin_name was not loaded"), true, true);
-            }
-        }
-    }
-
-    /**
-     * Load the specified plugin
-     *
-     * @param string Plugin name
-     *
-     * @return boolean True on success, false if not loaded or failure
-     */
-    public function load_plugin($plugin_name)
-    {
-        static $plugins_dir;
-
-        if (!$plugins_dir) {
-            $dir         = dir($this->dir);
-            $plugins_dir = unslashify($dir->path);
-        }
-
-        // plugin already loaded
-        if ($this->plugins[$plugin_name] || class_exists($plugin_name, false)) {
-            return true;
-        }
-
-        $fn = $plugins_dir . DIRECTORY_SEPARATOR . $plugin_name
-            . DIRECTORY_SEPARATOR . $plugin_name . '.php';
-
-        if (file_exists($fn)) {
-            include $fn;
-
-            // instantiate class if exists
-            if (class_exists($plugin_name, false)) {
-                $plugin = new $plugin_name($this);
-                // check inheritance...
-                if (is_subclass_of($plugin, 'rcube_plugin')) {
-                    // ... task, request type and framed mode
-                    if ((!$plugin->task || preg_match('/^('.$plugin->task.')$/i', $this->task))
-                        && (!$plugin->noajax || (is_object($this->output) && $this->output->type == 'html'))
-                        && (!$plugin->noframe || empty($_REQUEST['_framed']))
-                    ) {
-                        $plugin->init();
-                        $this->plugins[$plugin_name] = $plugin;
-                    }
-
-                    if (!empty($plugin->allowed_prefs)) {
-                        $this->allowed_prefs = array_merge($this->allowed_prefs, $plugin->allowed_prefs);
-                    }
-
-                    return true;
-                }
-            }
-            else {
-                rcube::raise_error(array('code' => 520, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "No plugin class $plugin_name found in $fn"),
-                    true, false);
-            }
-        }
-        else {
-            rcube::raise_error(array('code' => 520, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Failed to load plugin file $fn"), true, false);
-        }
-
-        return false;
-    }
-
-    /**
-     * Get information about a specific plugin.
-     * This is either provided my a plugin's info() method or extracted from a package.xml or a composer.json file
-     *
-     * @param string Plugin name
-     * @return array Meta information about a plugin or False if plugin was not found
-     */
-    public function get_info($plugin_name)
-    {
-      static $composer_lock, $license_uris = array(
-        'Apache'     => 'http://www.apache.org/licenses/LICENSE-2.0.html',
-        'Apache-2'   => 'http://www.apache.org/licenses/LICENSE-2.0.html',
-        'Apache-1'   => 'http://www.apache.org/licenses/LICENSE-1.0',
-        'Apache-1.1' => 'http://www.apache.org/licenses/LICENSE-1.1',
-        'GPL'        => 'http://www.gnu.org/licenses/gpl.html',
-        'GPLv2'      => 'http://www.gnu.org/licenses/gpl-2.0.html',
-        'GPL-2.0'    => 'http://www.gnu.org/licenses/gpl-2.0.html',
-        'GPLv3'      => 'http://www.gnu.org/licenses/gpl-3.0.html',
-        'GPL-3.0'    => 'http://www.gnu.org/licenses/gpl-3.0.html',
-        'GPL-3.0+'   => 'http://www.gnu.org/licenses/gpl.html',
-        'GPL-2.0+'   => 'http://www.gnu.org/licenses/gpl.html',
-        'LGPL'       => 'http://www.gnu.org/licenses/lgpl.html',
-        'LGPLv2'     => 'http://www.gnu.org/licenses/lgpl-2.0.html',
-        'LGPLv2.1'   => 'http://www.gnu.org/licenses/lgpl-2.1.html',
-        'LGPLv3'     => 'http://www.gnu.org/licenses/lgpl.html',
-        'LGPL-2.0'   => 'http://www.gnu.org/licenses/lgpl-2.0.html',
-        'LGPL-2.1'   => 'http://www.gnu.org/licenses/lgpl-2.1.html',
-        'LGPL-3.0'   => 'http://www.gnu.org/licenses/lgpl.html',
-        'LGPL-3.0+'  => 'http://www.gnu.org/licenses/lgpl.html',
-        'BSD'          => 'http://opensource.org/licenses/bsd-license.html',
-        'BSD-2-Clause' => 'http://opensource.org/licenses/BSD-2-Clause',
-        'BSD-3-Clause' => 'http://opensource.org/licenses/BSD-3-Clause',
-        'FreeBSD'      => 'http://opensource.org/licenses/BSD-2-Clause',
-        'MIT'          => 'http://www.opensource.org/licenses/mit-license.php',
-        'PHP'          => 'http://opensource.org/licenses/PHP-3.0',
-        'PHP-3'        => 'http://www.php.net/license/3_01.txt',
-        'PHP-3.0'      => 'http://www.php.net/license/3_0.txt',
-        'PHP-3.01'     => 'http://www.php.net/license/3_01.txt',
-      );
-
-      $dir = dir($this->dir);
-      $fn = unslashify($dir->path) . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php';
-      $info = false;
-
-      if (!class_exists($plugin_name))
-        include($fn);
-
-      if (class_exists($plugin_name))
-        $info = $plugin_name::info();
-
-      // fall back to composer.json file
-      if (!$info) {
-        $composer = INSTALL_PATH . "/plugins/$plugin_name/composer.json";
-        if (file_exists($composer) && ($json = @json_decode(file_get_contents($composer), true))) {
-          list($info['vendor'], $info['name']) = explode('/', $json['name']);
-          $info['license'] = $json['license'];
-          if ($license_uri = $license_uris[$info['license']])
-            $info['license_uri'] = $license_uri;
-        }
-
-        // read local composer.lock file (once)
-        if (!isset($composer_lock)) {
-          $composer_lock = @json_decode(@file_get_contents(INSTALL_PATH . "/composer.lock"), true);
-          if ($composer_lock['packages']) {
-            foreach ($composer_lock['packages'] as $i => $package) {
-              $composer_lock['installed'][$package['name']] = $package;
-            }
-          }
-        }
-
-        // load additional information from local composer.lock file
-        if ($lock = $composer_lock['installed'][$json['name']]) {
-          $info['version'] = $lock['version'];
-          $info['uri']     = $lock['homepage'] ? $lock['homepage'] : $lock['source']['uri'];
-          $info['src_uri'] = $lock['dist']['uri'] ? $lock['dist']['uri'] : $lock['source']['uri'];
-        }
-      }
-
-      // fall back to package.xml file
-      if (!$info) {
-        $package = INSTALL_PATH . "/plugins/$plugin_name/package.xml";
-        if (file_exists($package) && ($file = file_get_contents($package))) {
-          $doc = new DOMDocument();
-          $doc->loadXML($file);
-          $xpath = new DOMXPath($doc);
-          $xpath->registerNamespace('rc', "http://pear.php.net/dtd/package-2.0");
-
-          // XPaths of plugin metadata elements
-          $metadata = array(
-            'name'    => 'string(//rc:package/rc:name)',
-            'version' => 'string(//rc:package/rc:version/rc:release)',
-            'license' => 'string(//rc:package/rc:license)',
-            'license_uri' => 'string(//rc:package/rc:license/@uri)',
-            'src_uri' => 'string(//rc:package/rc:srcuri)',
-            'uri' => 'string(//rc:package/rc:uri)',
-          );
-
-          foreach ($metadata as $key => $path) {
-            $info[$key] = $xpath->evaluate($path);
-          }
-
-          // dependent required plugins (can be used, but not included in config)
-          $deps = $xpath->evaluate('//rc:package/rc:dependencies/rc:required/rc:package/rc:name');
-          for ($i = 0; $i < $deps->length; $i++) {
-            $dn = $deps->item($i)->nodeValue;
-            $info['requires'][] = $dn;
-          }
-        }
-      }
-
-      return $info;
-    }
-
-    /**
-     * Allows a plugin object to register a callback for a certain hook
-     *
-     * @param string $hook Hook name
-     * @param mixed  $callback String with global function name or array($obj, 'methodname')
-     */
-    public function register_hook($hook, $callback)
-    {
-        if (is_callable($callback)) {
-            if (isset($this->deprecated_hooks[$hook])) {
-                rcube::raise_error(array('code' => 522, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Deprecated hook name. "
-                        . $hook . ' -> ' . $this->deprecated_hooks[$hook]), true, false);
-                $hook = $this->deprecated_hooks[$hook];
-            }
-            $this->handlers[$hook][] = $callback;
-        }
-        else {
-            rcube::raise_error(array('code' => 521, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Invalid callback function for $hook"), true, false);
-        }
-    }
-
-    /**
-     * Allow a plugin object to unregister a callback.
-     *
-     * @param string $hook Hook name
-     * @param mixed  $callback String with global function name or array($obj, 'methodname')
-     */
-    public function unregister_hook($hook, $callback)
-    {
-        $callback_id = array_search($callback, $this->handlers[$hook]);
-        if ($callback_id !== false) {
-            unset($this->handlers[$hook][$callback_id]);
-        }
-    }
-
-    /**
-     * Triggers a plugin hook.
-     * This is called from the application and executes all registered handlers
-     *
-     * @param string $hook Hook name
-     * @param array $args Named arguments (key->value pairs)
-     *
-     * @return array The (probably) altered hook arguments
-     */
-    public function exec_hook($hook, $args = array())
-    {
-        if (!is_array($args)) {
-            $args = array('arg' => $args);
-        }
-
-        $args += array('abort' => false);
-        $this->active_hook = $hook;
-
-        foreach ((array)$this->handlers[$hook] as $callback) {
-            $ret = call_user_func($callback, $args);
-            if ($ret && is_array($ret)) {
-                $args = $ret + $args;
-            }
-
-            if ($args['break']) {
-                break;
-            }
-        }
-
-        $this->active_hook = false;
-        return $args;
-    }
-
-    /**
-     * Let a plugin register a handler for a specific request
-     *
-     * @param string $action   Action name (_task=mail&_action=plugin.foo)
-     * @param string $owner    Plugin name that registers this action
-     * @param mixed  $callback Callback: string with global function name or array($obj, 'methodname')
-     * @param string $task     Task name registered by this plugin
-     */
-    public function register_action($action, $owner, $callback, $task = null)
-    {
-        // check action name
-        if ($task)
-            $action = $task.'.'.$action;
-        else if (strpos($action, 'plugin.') !== 0)
-            $action = 'plugin.'.$action;
-
-        // can register action only if it's not taken or registered by myself
-        if (!isset($this->actionmap[$action]) || $this->actionmap[$action] == $owner) {
-            $this->actions[$action] = $callback;
-            $this->actionmap[$action] = $owner;
-        }
-        else {
-            rcube::raise_error(array('code' => 523, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Cannot register action $action;"
-                    ." already taken by another plugin"), true, false);
-        }
-    }
-
-    /**
-     * This method handles requests like _task=mail&_action=plugin.foo
-     * It executes the callback function that was registered with the given action.
-     *
-     * @param string $action Action name
-     */
-    public function exec_action($action)
-    {
-        if (isset($this->actions[$action])) {
-            call_user_func($this->actions[$action]);
-        }
-        else if (rcube::get_instance()->action != 'refresh') {
-            rcube::raise_error(array('code' => 524, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "No handler found for action $action"), true, true);
-        }
-    }
-
-    /**
-     * Register a handler function for template objects
-     *
-     * @param string $name Object name
-     * @param string $owner Plugin name that registers this action
-     * @param mixed  $callback Callback: string with global function name or array($obj, 'methodname')
-     */
-    public function register_handler($name, $owner, $callback)
-    {
-        // check name
-        if (strpos($name, 'plugin.') !== 0) {
-            $name = 'plugin.' . $name;
-        }
-
-        // can register handler only if it's not taken or registered by myself
-        if (is_object($this->output)
-            && (!isset($this->objectsmap[$name]) || $this->objectsmap[$name] == $owner)
-        ) {
-            $this->output->add_handler($name, $callback);
-            $this->objectsmap[$name] = $owner;
-        }
-        else {
-            rcube::raise_error(array('code' => 525, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Cannot register template handler $name;"
-                    ." already taken by another plugin or no output object available"), true, false);
-        }
-    }
-
-    /**
-     * Register this plugin to be responsible for a specific task
-     *
-     * @param string $task Task name (only characters [a-z0-9_-] are allowed)
-     * @param string $owner Plugin name that registers this action
-     */
-    public function register_task($task, $owner)
-    {
-        // tasks are irrelevant in framework mode
-        if (!class_exists('rcmail', false)) {
-            return true;
-        }
-
-        if ($task != asciiwords($task, true)) {
-            rcube::raise_error(array('code' => 526, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Invalid task name: $task."
-                    ." Only characters [a-z0-9_.-] are allowed"), true, false);
-        }
-        else if (in_array($task, rcmail::$main_tasks)) {
-            rcube::raise_error(array('code' => 526, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Cannot register taks $task;"
-                    ." already taken by another plugin or the application itself"), true, false);
-        }
-        else {
-            $this->tasks[$task] = $owner;
-            rcmail::$main_tasks[] = $task;
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks whether the given task is registered by a plugin
-     *
-     * @param string $task Task name
-     *
-     * @return boolean True if registered, otherwise false
-     */
-    public function is_plugin_task($task)
-    {
-        return $this->tasks[$task] ? true : false;
-    }
-
-    /**
-     * Check if a plugin hook is currently processing.
-     * Mainly used to prevent loops and recursion.
-     *
-     * @param string $hook Hook to check (optional)
-     *
-     * @return boolean True if any/the given hook is currently processed, otherwise false
-     */
-    public function is_processing($hook = null)
-    {
-        return $this->active_hook && (!$hook || $this->active_hook == $hook);
-    }
-
-    /**
-     * Include a plugin script file in the current HTML page
-     *
-     * @param string $fn Path to script
-     */
-    public function include_script($fn)
-    {
-        if (is_object($this->output) && $this->output->type == 'html') {
-            $src = $this->resource_url($fn);
-            $this->output->add_header(html::tag('script',
-                array('type' => "text/javascript", 'src' => $src)));
-        }
-    }
-
-    /**
-     * Include a plugin stylesheet in the current HTML page
-     *
-     * @param string $fn Path to stylesheet
-     */
-    public function include_stylesheet($fn)
-    {
-        if (is_object($this->output) && $this->output->type == 'html') {
-            $src = $this->resource_url($fn);
-            $this->output->include_css($src);
-        }
-    }
-
-    /**
-     * Save the given HTML content to be added to a template container
-     *
-     * @param string $html HTML content
-     * @param string $container Template container identifier
-     */
-    public function add_content($html, $container)
-    {
-        $this->template_contents[$container] .= $html . "\n";
-    }
-
-    /**
-     * Returns list of loaded plugins names
-     *
-     * @return array List of plugin names
-     */
-    public function loaded_plugins()
-    {
-        return array_keys($this->plugins);
-    }
-
-    /**
-     * Callback for template_container hooks
-     *
-     * @param array $attrib
-     * @return array
-     */
-    protected function template_container_hook($attrib)
-    {
-        $container = $attrib['name'];
-        return array('content' => $attrib['content'] . $this->template_contents[$container]);
-    }
-
-    /**
-     * Make the given file name link into the plugins directory
-     *
-     * @param string $fn Filename
-     * @return string
-     */
-    protected function resource_url($fn)
-    {
-        if ($fn[0] != '/' && !preg_match('|^https?://|i', $fn))
-            return $this->url . $fn;
-        else
-            return $fn;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_result_index.php b/lib/ext/Roundcube/rcube_result_index.php
deleted file mode 100644
index 5f592c5..0000000
--- a/lib/ext/Roundcube/rcube_result_index.php
+++ /dev/null
@@ -1,449 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
- | Copyright (C) 2011, Kolab Systems AG                                  |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   SORT/SEARCH/ESEARCH response handler                                |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Class for accessing IMAP's SORT/SEARCH/ESEARCH result
- *
- * @package    Framework
- * @subpackage Storage
- */
-class rcube_result_index
-{
-    protected $raw_data;
-    protected $mailbox;
-    protected $meta = array();
-    protected $params = array();
-    protected $order = 'ASC';
-
-    const SEPARATOR_ELEMENT = ' ';
-
-
-    /**
-     * Object constructor.
-     */
-    public function __construct($mailbox = null, $data = null)
-    {
-        $this->mailbox = $mailbox;
-        $this->init($data);
-    }
-
-
-    /**
-     * Initializes object with SORT command response
-     *
-     * @param string $data IMAP response string
-     */
-    public function init($data = null)
-    {
-        $this->meta = array();
-
-        $data = explode('*', (string)$data);
-
-        // ...skip unilateral untagged server responses
-        for ($i=0, $len=count($data); $i<$len; $i++) {
-            $data_item = &$data[$i];
-            if (preg_match('/^ SORT/i', $data_item)) {
-                // valid response, initialize raw_data for is_error()
-                $this->raw_data = '';
-                $data_item = substr($data_item, 5);
-                break;
-            }
-            else if (preg_match('/^ (E?SEARCH)/i', $data_item, $m)) {
-                // valid response, initialize raw_data for is_error()
-                $this->raw_data = '';
-                $data_item = substr($data_item, strlen($m[0]));
-
-                if (strtoupper($m[1]) == 'ESEARCH') {
-                    $data_item = trim($data_item);
-                    // remove MODSEQ response
-                    if (preg_match('/\(MODSEQ ([0-9]+)\)$/i', $data_item, $m)) {
-                        $data_item = substr($data_item, 0, -strlen($m[0]));
-                        $this->params['MODSEQ'] = $m[1];
-                    }
-                    // remove TAG response part
-                    if (preg_match('/^\(TAG ["a-z0-9]+\)\s*/i', $data_item, $m)) {
-                        $data_item = substr($data_item, strlen($m[0]));
-                    }
-                    // remove UID
-                    $data_item = preg_replace('/^UID\s*/i', '', $data_item);
-
-                    // ESEARCH parameters
-                    while (preg_match('/^([a-z]+) ([0-9:,]+)\s*/i', $data_item, $m)) {
-                        $param = strtoupper($m[1]);
-                        $value = $m[2];
-
-                        $this->params[$param] = $value;
-                        $data_item = substr($data_item, strlen($m[0]));
-
-                        if (in_array($param, array('COUNT', 'MIN', 'MAX'))) {
-                            $this->meta[strtolower($param)] = (int) $value;
-                        }
-                    }
-
-// @TODO: Implement compression using compressMessageSet() in __sleep() and __wakeup() ?
-// @TODO: work with compressed result?!
-                    if (isset($this->params['ALL'])) {
-                        $data_item = implode(self::SEPARATOR_ELEMENT,
-                            rcube_imap_generic::uncompressMessageSet($this->params['ALL']));
-                    }
-                }
-
-                break;
-            }
-
-            unset($data[$i]);
-        }
-
-        $data = array_filter($data);
-
-        if (empty($data)) {
-            return;
-        }
-
-        $data = array_shift($data);
-        $data = trim($data);
-        $data = preg_replace('/[\r\n]/', '', $data);
-        $data = preg_replace('/\s+/', ' ', $data);
-
-        $this->raw_data = $data;
-    }
-
-
-    /**
-     * Checks the result from IMAP command
-     *
-     * @return bool True if the result is an error, False otherwise
-     */
-    public function is_error()
-    {
-        return $this->raw_data === null ? true : false;
-    }
-
-
-    /**
-     * Checks if the result is empty
-     *
-     * @return bool True if the result is empty, False otherwise
-     */
-    public function is_empty()
-    {
-        return empty($this->raw_data) ? true : false;
-    }
-
-
-    /**
-     * Returns number of elements in the result
-     *
-     * @return int Number of elements
-     */
-    public function count()
-    {
-        if ($this->meta['count'] !== null)
-            return $this->meta['count'];
-
-        if (empty($this->raw_data)) {
-            $this->meta['count']  = 0;
-            $this->meta['length'] = 0;
-        }
-        else {
-            $this->meta['count'] = 1 + substr_count($this->raw_data, self::SEPARATOR_ELEMENT);
-        }
-
-        return $this->meta['count'];
-    }
-
-
-    /**
-     * Returns number of elements in the result.
-     * Alias for count() for compatibility with rcube_result_thread
-     *
-     * @return int Number of elements
-     */
-    public function count_messages()
-    {
-        return $this->count();
-    }
-
-
-    /**
-     * Returns maximal message identifier in the result
-     *
-     * @return int Maximal message identifier
-     */
-    public function max()
-    {
-        if (!isset($this->meta['max'])) {
-            $this->meta['max'] = (int) @max($this->get());
-        }
-
-        return $this->meta['max'];
-    }
-
-
-    /**
-     * Returns minimal message identifier in the result
-     *
-     * @return int Minimal message identifier
-     */
-    public function min()
-    {
-        if (!isset($this->meta['min'])) {
-            $this->meta['min'] = (int) @min($this->get());
-        }
-
-        return $this->meta['min'];
-    }
-
-
-    /**
-     * Slices data set.
-     *
-     * @param $offset Offset (as for PHP's array_slice())
-     * @param $length Number of elements (as for PHP's array_slice())
-     *
-     */
-    public function slice($offset, $length)
-    {
-        $data = $this->get();
-        $data = array_slice($data, $offset, $length);
-
-        $this->meta          = array();
-        $this->meta['count'] = count($data);
-        $this->raw_data      = implode(self::SEPARATOR_ELEMENT, $data);
-    }
-
-
-    /**
-     * Filters data set. Removes elements listed in $ids list.
-     *
-     * @param array $ids List of IDs to remove.
-     */
-    public function filter($ids = array())
-    {
-        $data = $this->get();
-        $data = array_diff($data, $ids);
-
-        $this->meta          = array();
-        $this->meta['count'] = count($data);
-        $this->raw_data      = implode(self::SEPARATOR_ELEMENT, $data);
-    }
-
-
-    /**
-     * Filters data set. Removes elements not listed in $ids list.
-     *
-     * @param array $ids List of IDs to keep.
-     */
-    public function intersect($ids = array())
-    {
-        $data = $this->get();
-        $data = array_intersect($data, $ids);
-
-        $this->meta          = array();
-        $this->meta['count'] = count($data);
-        $this->raw_data      = implode(self::SEPARATOR_ELEMENT, $data);
-    }
-
-
-    /**
-     * Reverts order of elements in the result
-     */
-    public function revert()
-    {
-        $this->order = $this->order == 'ASC' ? 'DESC' : 'ASC';
-
-        if (empty($this->raw_data)) {
-            return;
-        }
-
-        // @TODO: maybe do this in chunks
-        $data = $this->get();
-        $data = array_reverse($data);
-        $this->raw_data = implode(self::SEPARATOR_ELEMENT, $data);
-
-        $this->meta['pos'] = array();
-    }
-
-
-    /**
-     * Check if the given message ID exists in the object
-     *
-     * @param int  $msgid     Message ID
-     * @param bool $get_index When enabled element's index will be returned.
-     *                        Elements are indexed starting with 0
-     *
-     * @return mixed False if message ID doesn't exist, True if exists or
-     *               index of the element if $get_index=true
-     */
-    public function exists($msgid, $get_index = false)
-    {
-        if (empty($this->raw_data)) {
-            return false;
-        }
-
-        $msgid = (int) $msgid;
-        $begin = implode('|', array('^', preg_quote(self::SEPARATOR_ELEMENT, '/')));
-        $end   = implode('|', array('$', preg_quote(self::SEPARATOR_ELEMENT, '/')));
-
-        if (preg_match("/($begin)$msgid($end)/", $this->raw_data, $m,
-            $get_index ? PREG_OFFSET_CAPTURE : null)
-        ) {
-            if ($get_index) {
-                $idx = 0;
-                if ($m[0][1]) {
-                    $idx = 1 + substr_count($this->raw_data, self::SEPARATOR_ELEMENT, 0, $m[0][1]);
-                }
-                // cache position of this element, so we can use it in get_element()
-                $this->meta['pos'][$idx] = (int)$m[0][1];
-
-                return $idx;
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Return all messages in the result.
-     *
-     * @return array List of message IDs
-     */
-    public function get()
-    {
-        if (empty($this->raw_data)) {
-            return array();
-        }
-        return explode(self::SEPARATOR_ELEMENT, $this->raw_data);
-    }
-
-
-    /**
-     * Return all messages in the result.
-     *
-     * @return array List of message IDs
-     */
-    public function get_compressed()
-    {
-        if (empty($this->raw_data)) {
-            return '';
-        }
-
-        return rcube_imap_generic::compressMessageSet($this->get());
-    }
-
-
-    /**
-     * Return result element at specified index
-     *
-     * @param int|string  $index  Element's index or "FIRST" or "LAST"
-     *
-     * @return int Element value
-     */
-    public function get_element($index)
-    {
-        $count = $this->count();
-
-        if (!$count) {
-            return null;
-        }
-
-        // first element
-        if ($index === 0 || $index === '0' || $index === 'FIRST') {
-            $pos = strpos($this->raw_data, self::SEPARATOR_ELEMENT);
-            if ($pos === false)
-                $result = (int) $this->raw_data;
-            else
-                $result = (int) substr($this->raw_data, 0, $pos);
-
-            return $result;
-        }
-
-        // last element
-        if ($index === 'LAST' || $index == $count-1) {
-            $pos = strrpos($this->raw_data, self::SEPARATOR_ELEMENT);
-            if ($pos === false)
-                $result = (int) $this->raw_data;
-            else
-                $result = (int) substr($this->raw_data, $pos);
-
-            return $result;
-        }
-
-        // do we know the position of the element or the neighbour of it?
-        if (!empty($this->meta['pos'])) {
-            if (isset($this->meta['pos'][$index]))
-                $pos = $this->meta['pos'][$index];
-            else if (isset($this->meta['pos'][$index-1]))
-                $pos = strpos($this->raw_data, self::SEPARATOR_ELEMENT,
-                    $this->meta['pos'][$index-1] + 1);
-            else if (isset($this->meta['pos'][$index+1]))
-                $pos = strrpos($this->raw_data, self::SEPARATOR_ELEMENT,
-                    $this->meta['pos'][$index+1] - $this->length() - 1);
-
-            if (isset($pos) && preg_match('/([0-9]+)/', $this->raw_data, $m, null, $pos)) {
-                return (int) $m[1];
-            }
-        }
-
-        // Finally use less effective method
-        $data = explode(self::SEPARATOR_ELEMENT, $this->raw_data);
-
-        return $data[$index];
-    }
-
-
-    /**
-     * Returns response parameters, e.g. ESEARCH's MIN/MAX/COUNT/ALL/MODSEQ
-     * or internal data e.g. MAILBOX, ORDER
-     *
-     * @param string $param  Parameter name
-     *
-     * @return array|string Response parameters or parameter value
-     */
-    public function get_parameters($param=null)
-    {
-        $params = $this->params;
-        $params['MAILBOX'] = $this->mailbox;
-        $params['ORDER']   = $this->order;
-
-        if ($param !== null) {
-            return $params[$param];
-        }
-
-        return $params;
-    }
-
-
-    /**
-     * Returns length of internal data representation
-     *
-     * @return int Data length
-     */
-    protected function length()
-    {
-        if (!isset($this->meta['length'])) {
-            $this->meta['length'] = strlen($this->raw_data);
-        }
-
-        return $this->meta['length'];
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_result_set.php b/lib/ext/Roundcube/rcube_result_set.php
deleted file mode 100644
index a4b070e..0000000
--- a/lib/ext/Roundcube/rcube_result_set.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Class representing an address directory result set                  |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Roundcube result set class
- *
- * Representing an address directory result set.
- * Implenets Iterator and thus be used in foreach() loops.
- *
- * @package    Framework
- * @subpackage Addressbook
- */
-class rcube_result_set implements Iterator
-{
-    public $count = 0;
-    public $first = 0;
-    public $searchonly = false;
-    public $records = array();
-
-    private $current = 0;
-
-    function __construct($c=0, $f=0)
-    {
-        $this->count = (int)$c;
-        $this->first = (int)$f;
-    }
-
-    function add($rec)
-    {
-        $this->records[] = $rec;
-    }
-
-    function iterate()
-    {
-        return $this->records[$this->current++];
-    }
-
-    function first()
-    {
-        $this->current = 0;
-        return $this->records[$this->current];
-    }
-
-    function seek($i)
-    {
-        $this->current = $i;
-    }
-
-    /***  PHP 5 Iterator interface  ***/
-
-    function rewind()
-    {
-        $this->current = 0;
-    }
-
-    function current()
-    {
-        return $this->records[$this->current];
-    }
-
-    function key()
-    {
-        return $this->current;
-    }
-
-    function next()
-    {
-        return $this->iterate();
-    }
-
-    function valid()
-    {
-        return isset($this->records[$this->current]);
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_result_thread.php b/lib/ext/Roundcube/rcube_result_thread.php
deleted file mode 100644
index 7657550..0000000
--- a/lib/ext/Roundcube/rcube_result_thread.php
+++ /dev/null
@@ -1,672 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
- | Copyright (C) 2011, Kolab Systems AG                                  |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   THREAD response handler                                             |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Class for accessing IMAP's THREAD result
- *
- * @package    Framework
- * @subpackage Storage
- */
-class rcube_result_thread
-{
-    protected $raw_data;
-    protected $mailbox;
-    protected $meta = array();
-    protected $order = 'ASC';
-
-    const SEPARATOR_ELEMENT = ' ';
-    const SEPARATOR_ITEM    = '~';
-    const SEPARATOR_LEVEL   = ':';
-
-
-    /**
-     * Object constructor.
-     */
-    public function __construct($mailbox = null, $data = null)
-    {
-        $this->mailbox = $mailbox;
-        $this->init($data);
-    }
-
-
-    /**
-     * Initializes object with IMAP command response
-     *
-     * @param string $data IMAP response string
-     */
-    public function init($data = null)
-    {
-        $this->meta = array();
-
-        $data = explode('*', (string)$data);
-
-        // ...skip unilateral untagged server responses
-        for ($i=0, $len=count($data); $i<$len; $i++) {
-            if (preg_match('/^ THREAD/i', $data[$i])) {
-                // valid response, initialize raw_data for is_error()
-                $this->raw_data = '';
-                $data[$i] = substr($data[$i], 7);
-                break;
-            }
-
-            unset($data[$i]);
-        }
-
-        if (empty($data)) {
-            return;
-        }
-
-        $data = array_shift($data);
-        $data = trim($data);
-        $data = preg_replace('/[\r\n]/', '', $data);
-        $data = preg_replace('/\s+/', ' ', $data);
-
-        $this->raw_data = $this->parse_thread($data);
-    }
-
-
-    /**
-     * Checks the result from IMAP command
-     *
-     * @return bool True if the result is an error, False otherwise
-     */
-    public function is_error()
-    {
-        return $this->raw_data === null ? true : false;
-    }
-
-
-    /**
-     * Checks if the result is empty
-     *
-     * @return bool True if the result is empty, False otherwise
-     */
-    public function is_empty()
-    {
-        return empty($this->raw_data) ? true : false;
-    }
-
-
-    /**
-     * Returns number of elements (threads) in the result
-     *
-     * @return int Number of elements
-     */
-    public function count()
-    {
-        if ($this->meta['count'] !== null)
-            return $this->meta['count'];
-
-        if (empty($this->raw_data)) {
-            $this->meta['count'] = 0;
-        }
-        else {
-            $this->meta['count'] = 1 + substr_count($this->raw_data, self::SEPARATOR_ELEMENT);
-        }
-
-        if (!$this->meta['count'])
-            $this->meta['messages'] = 0;
-
-        return $this->meta['count'];
-    }
-
-
-    /**
-     * Returns number of all messages in the result
-     *
-     * @return int Number of elements
-     */
-    public function count_messages()
-    {
-        if ($this->meta['messages'] !== null)
-            return $this->meta['messages'];
-
-        if (empty($this->raw_data)) {
-            $this->meta['messages'] = 0;
-        }
-        else {
-            $this->meta['messages'] = 1
-                + substr_count($this->raw_data, self::SEPARATOR_ELEMENT)
-                + substr_count($this->raw_data, self::SEPARATOR_ITEM);
-        }
-
-        if ($this->meta['messages'] == 0 || $this->meta['messages'] == 1)
-            $this->meta['count'] = $this->meta['messages'];
-
-        return $this->meta['messages'];
-    }
-
-
-    /**
-     * Returns maximum message identifier in the result
-     *
-     * @return int Maximum message identifier
-     */
-    public function max()
-    {
-        if (!isset($this->meta['max'])) {
-            $this->meta['max'] = (int) @max($this->get());
-        }
-        return $this->meta['max'];
-    }
-
-
-    /**
-     * Returns minimum message identifier in the result
-     *
-     * @return int Minimum message identifier
-     */
-    public function min()
-    {
-        if (!isset($this->meta['min'])) {
-            $this->meta['min'] = (int) @min($this->get());
-        }
-        return $this->meta['min'];
-    }
-
-
-    /**
-     * Slices data set.
-     *
-     * @param $offset Offset (as for PHP's array_slice())
-     * @param $length Number of elements (as for PHP's array_slice())
-     */
-    public function slice($offset, $length)
-    {
-        $data = explode(self::SEPARATOR_ELEMENT, $this->raw_data);
-        $data = array_slice($data, $offset, $length);
-
-        $this->meta          = array();
-        $this->meta['count'] = count($data);
-        $this->raw_data      = implode(self::SEPARATOR_ELEMENT, $data);
-    }
-
-
-    /**
-     * Filters data set. Removes threads not listed in $roots list.
-     *
-     * @param array $roots List of IDs of thread roots.
-     */
-    public function filter($roots)
-    {
-        $datalen = strlen($this->raw_data);
-        $roots   = array_flip($roots);
-        $result  = '';
-        $start   = 0;
-
-        $this->meta          = array();
-        $this->meta['count'] = 0;
-
-        while (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT, $start))
-            || ($start < $datalen && ($pos = $datalen))
-        ) {
-            $len   = $pos - $start;
-            $elem  = substr($this->raw_data, $start, $len);
-            $start = $pos + 1;
-
-            // extract root message ID
-            if ($npos = strpos($elem, self::SEPARATOR_ITEM)) {
-                $root = (int) substr($elem, 0, $npos);
-            }
-            else {
-                $root = $elem;
-            }
-
-            if (isset($roots[$root])) {
-                $this->meta['count']++;
-                $result .= self::SEPARATOR_ELEMENT . $elem;
-            }
-        }
-
-        $this->raw_data = ltrim($result, self::SEPARATOR_ELEMENT);
-    }
-
-
-    /**
-     * Reverts order of elements in the result
-     */
-    public function revert()
-    {
-        $this->order = $this->order == 'ASC' ? 'DESC' : 'ASC';
-
-        if (empty($this->raw_data)) {
-            return;
-        }
-
-        $this->meta['pos'] = array();
-        $datalen = strlen($this->raw_data);
-        $result  = '';
-        $start   = 0;
-
-        while (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT, $start))
-            || ($start < $datalen && ($pos = $datalen))
-        ) {
-            $len   = $pos - $start;
-            $elem  = substr($this->raw_data, $start, $len);
-            $start = $pos + 1;
-
-            $result = $elem . self::SEPARATOR_ELEMENT . $result;
-        }
-
-        $this->raw_data = rtrim($result, self::SEPARATOR_ELEMENT);
-    }
-
-
-    /**
-     * Check if the given message ID exists in the object
-     *
-     * @param int $msgid Message ID
-     * @param bool $get_index When enabled element's index will be returned.
-     *                        Elements are indexed starting with 0
-     *
-     * @return boolean True on success, False if message ID doesn't exist
-     */
-    public function exists($msgid, $get_index = false)
-    {
-        $msgid = (int) $msgid;
-        $begin = implode('|', array(
-            '^',
-            preg_quote(self::SEPARATOR_ELEMENT, '/'),
-            preg_quote(self::SEPARATOR_LEVEL, '/'),
-        ));
-        $end = implode('|', array(
-            '$',
-            preg_quote(self::SEPARATOR_ELEMENT, '/'),
-            preg_quote(self::SEPARATOR_ITEM, '/'),
-        ));
-
-        if (preg_match("/($begin)$msgid($end)/", $this->raw_data, $m,
-            $get_index ? PREG_OFFSET_CAPTURE : null)
-        ) {
-            if ($get_index) {
-                $idx = 0;
-                if ($m[0][1]) {
-                    $idx = substr_count($this->raw_data, self::SEPARATOR_ELEMENT, 0, $m[0][1]+1)
-                        + substr_count($this->raw_data, self::SEPARATOR_ITEM, 0, $m[0][1]+1);
-                }
-                // cache position of this element, so we can use it in get_element()
-                $this->meta['pos'][$idx] = (int)$m[0][1];
-
-                return $idx;
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Return IDs of all messages in the result. Threaded data will be flattened.
-     *
-     * @return array List of message identifiers
-     */
-    public function get()
-    {
-        if (empty($this->raw_data)) {
-            return array();
-        }
-
-        $regexp = '/(' . preg_quote(self::SEPARATOR_ELEMENT, '/')
-            . '|' . preg_quote(self::SEPARATOR_ITEM, '/') . '[0-9]+' . preg_quote(self::SEPARATOR_LEVEL, '/')
-            .')/';
-
-        return preg_split($regexp, $this->raw_data);
-    }
-
-
-    /**
-     * Return all messages in the result.
-     *
-     * @return array List of message identifiers
-     */
-    public function get_compressed()
-    {
-        if (empty($this->raw_data)) {
-            return '';
-        }
-
-        return rcube_imap_generic::compressMessageSet($this->get());
-    }
-
-
-    /**
-     * Return result element at specified index (all messages, not roots)
-     *
-     * @param int|string  $index  Element's index or "FIRST" or "LAST"
-     *
-     * @return int Element value
-     */
-    public function get_element($index)
-    {
-        $count = $this->count();
-
-        if (!$count) {
-            return null;
-        }
-
-        // first element
-        if ($index === 0 || $index === '0' || $index === 'FIRST') {
-            preg_match('/^([0-9]+)/', $this->raw_data, $m);
-            $result = (int) $m[1];
-            return $result;
-        }
-
-        // last element
-        if ($index === 'LAST' || $index == $count-1) {
-            preg_match('/([0-9]+)$/', $this->raw_data, $m);
-            $result = (int) $m[1];
-            return $result;
-        }
-
-        // do we know the position of the element or the neighbour of it?
-        if (!empty($this->meta['pos'])) {
-            $element = preg_quote(self::SEPARATOR_ELEMENT, '/');
-            $item    = preg_quote(self::SEPARATOR_ITEM, '/') . '[0-9]+' . preg_quote(self::SEPARATOR_LEVEL, '/') .'?';
-            $regexp  = '(' . $element . '|' . $item . ')';
-
-            if (isset($this->meta['pos'][$index])) {
-                if (preg_match('/([0-9]+)/', $this->raw_data, $m, null, $this->meta['pos'][$index]))
-                    $result = $m[1];
-            }
-            else if (isset($this->meta['pos'][$index-1])) {
-                // get chunk of data after previous element
-                $data = substr($this->raw_data, $this->meta['pos'][$index-1]+1, 50);
-                $data = preg_replace('/^[0-9]+/', '', $data); // remove UID at $index position
-                $data = preg_replace("/^$regexp/", '', $data); // remove separator
-                if (preg_match('/^([0-9]+)/', $data, $m))
-                    $result = $m[1];
-            }
-            else if (isset($this->meta['pos'][$index+1])) {
-                // get chunk of data before next element
-                $pos  = max(0, $this->meta['pos'][$index+1] - 50);
-                $len  = min(50, $this->meta['pos'][$index+1]);
-                $data = substr($this->raw_data, $pos, $len);
-                $data = preg_replace("/$regexp\$/", '', $data); // remove separator
-
-                if (preg_match('/([0-9]+)$/', $data, $m))
-                    $result = $m[1];
-            }
-
-            if (isset($result)) {
-                return (int) $result;
-            }
-        }
-
-        // Finally use less effective method
-        $data = $this->get();
-
-        return $data[$index];
-    }
-
-
-    /**
-     * Returns response parameters e.g. MAILBOX, ORDER
-     *
-     * @param string $param  Parameter name
-     *
-     * @return array|string Response parameters or parameter value
-     */
-    public function get_parameters($param=null)
-    {
-        $params = $this->params;
-        $params['MAILBOX'] = $this->mailbox;
-        $params['ORDER']   = $this->order;
-
-        if ($param !== null) {
-            return $params[$param];
-        }
-
-        return $params;
-    }
-
-
-    /**
-     * THREAD=REFS sorting implementation (based on provided index)
-     *
-     * @param rcube_result_index $index  Sorted message identifiers
-     */
-    public function sort($index)
-    {
-        $this->sort_order = $index->get_parameters('ORDER');
-
-        if (empty($this->raw_data)) {
-            return;
-        }
-
-        // when sorting search result it's good to make the index smaller
-        if ($index->count() != $this->count_messages()) {
-            $index->intersect($this->get());
-        }
-
-        $result  = array_fill_keys($index->get(), null);
-        $datalen = strlen($this->raw_data);
-        $start   = 0;
-
-        // Here we're parsing raw_data twice, we want only one big array
-        // in memory at a time
-
-        // Assign roots
-        while (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT, $start))
-            || ($start < $datalen && ($pos = $datalen))
-        ) {
-            $len   = $pos - $start;
-            $elem  = substr($this->raw_data, $start, $len);
-            $start = $pos + 1;
-
-            $items = explode(self::SEPARATOR_ITEM, $elem);
-            $root  = (int) array_shift($items);
-
-            if ($root) {
-                $result[$root] = $root;
-                foreach ($items as $item) {
-                    list($lv, $id) = explode(self::SEPARATOR_LEVEL, $item);
-                    $result[$id] = $root;
-                }
-            }
-        }
-
-        // get only unique roots
-        $result = array_filter($result); // make sure there are no nulls
-        $result = array_unique($result);
-
-        // Re-sort raw data
-        $result = array_fill_keys($result, null);
-        $start = 0;
-
-        while (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT, $start))
-            || ($start < $datalen && ($pos = $datalen))
-        ) {
-            $len   = $pos - $start;
-            $elem  = substr($this->raw_data, $start, $len);
-            $start = $pos + 1;
-
-            $npos = strpos($elem, self::SEPARATOR_ITEM);
-            $root = (int) ($npos ? substr($elem, 0, $npos) : $elem);
-
-            $result[$root] = $elem;
-        }
-
-        $this->raw_data = implode(self::SEPARATOR_ELEMENT, $result);
-    }
-
-
-    /**
-     * Returns data as tree
-     *
-     * @return array Data tree
-     */
-    public function get_tree()
-    {
-        $datalen = strlen($this->raw_data);
-        $result  = array();
-        $start   = 0;
-
-        while (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT, $start))
-            || ($start < $datalen && ($pos = $datalen))
-        ) {
-            $len   = $pos - $start;
-            $elem  = substr($this->raw_data, $start, $len);
-            $items = explode(self::SEPARATOR_ITEM, $elem);
-            $result[array_shift($items)] = $this->build_thread($items);
-            $start = $pos + 1;
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Returns thread depth and children data
-     *
-     * @return array Thread data
-     */
-    public function get_thread_data()
-    {
-        $data     = $this->get_tree();
-        $depth    = array();
-        $children = array();
-
-        $this->build_thread_data($data, $depth, $children);
-
-        return array($depth, $children);
-    }
-
-
-    /**
-     * Creates 'depth' and 'children' arrays from stored thread 'tree' data.
-     */
-    protected function build_thread_data($data, &$depth, &$children, $level = 0)
-    {
-        foreach ((array)$data as $key => $val) {
-            $empty          = empty($val) || !is_array($val);
-            $children[$key] = !$empty;
-            $depth[$key]    = $level;
-            if (!$empty) {
-                $this->build_thread_data($val, $depth, $children, $level + 1);
-            }
-        }
-    }
-
-
-    /**
-     * Converts part of the raw thread into an array
-     */
-    protected function build_thread($items, $level = 1, &$pos = 0)
-    {
-        $result = array();
-
-        for ($len=count($items); $pos < $len; $pos++) {
-            list($lv, $id) = explode(self::SEPARATOR_LEVEL, $items[$pos]);
-            if ($level == $lv) {
-                $pos++;
-                $result[$id] = $this->build_thread($items, $level+1, $pos);
-            }
-            else {
-                $pos--;
-                break;
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * IMAP THREAD response parser
-     */
-    protected function parse_thread($str, $begin = 0, $end = 0, $depth = 0)
-    {
-        // Don't be tempted to change $str to pass by reference to speed this up - it will slow it down by about
-        // 7 times instead :-) See comments on http://uk2.php.net/references and this article:
-        // http://derickrethans.nl/files/phparch-php-variables-article.pdf
-        $node = '';
-        if (!$end) {
-            $end = strlen($str);
-        }
-
-        // Let's try to store data in max. compacted stracture as a string,
-        // arrays handling is much more expensive
-        // For the following structure: THREAD (2)(3 6 (4 23)(44 7 96))
-        // -- 2
-        //
-        // -- 3
-        //     \-- 6
-        //         |-- 4
-        //         |    \-- 23
-        //         |
-        //         \-- 44
-        //              \-- 7
-        //                   \-- 96
-        //
-        // The output will be: 2,3^1:6^2:4^3:23^2:44^3:7^4:96
-
-        if ($str[$begin] != '(') {
-            $stop = $begin + strspn($str, '1234567890', $begin, $end - $begin);
-            $msg  = substr($str, $begin, $stop - $begin);
-            if (!$msg) {
-                return $node;
-            }
-
-            $this->meta['messages']++;
-
-            $node .= ($depth ? self::SEPARATOR_ITEM.$depth.self::SEPARATOR_LEVEL : '').$msg;
-
-            if ($stop + 1 < $end) {
-                $node .= $this->parse_thread($str, $stop + 1, $end, $depth + 1);
-            }
-        } else {
-            $off = $begin;
-            while ($off < $end) {
-                $start = $off;
-                $off++;
-                $n = 1;
-                while ($n > 0) {
-                    $p = strpos($str, ')', $off);
-                    if ($p === false) {
-                        // error, wrong structure, mismatched brackets in IMAP THREAD response
-                        // @TODO: write error to the log or maybe set $this->raw_data = null;
-                        return $node;
-                    }
-                    $p1 = strpos($str, '(', $off);
-                    if ($p1 !== false && $p1 < $p) {
-                        $off = $p1 + 1;
-                        $n++;
-                    } else {
-                        $off = $p + 1;
-                        $n--;
-                    }
-                }
-
-                $thread = $this->parse_thread($str, $start + 1, $off - 1, $depth);
-                if ($thread) {
-                    if (!$depth) {
-                        if ($node) {
-                            $node .= self::SEPARATOR_ELEMENT;
-                        }
-                    }
-                    $node .= $thread;
-                }
-            }
-        }
-
-        return $node;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_session.php b/lib/ext/Roundcube/rcube_session.php
deleted file mode 100644
index 67072df..0000000
--- a/lib/ext/Roundcube/rcube_session.php
+++ /dev/null
@@ -1,758 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011, Kolab Systems AG                                  |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Provide database supported session management                       |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Class to provide database supported session storage
- *
- * @package    Framework
- * @subpackage Core
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- */
-class rcube_session
-{
-    private $db;
-    private $ip;
-    private $start;
-    private $changed;
-    private $time_diff = 0;
-    private $reloaded = false;
-    private $unsets = array();
-    private $gc_handlers = array();
-    private $cookiename = 'roundcube_sessauth';
-    private $vars;
-    private $key;
-    private $now;
-    private $secret = '';
-    private $ip_check = false;
-    private $logging = false;
-    private $storage;
-    private $memcache;
-
-
-    /**
-     * Default constructor
-     */
-    public function __construct($db, $config)
-    {
-        $this->db      = $db;
-        $this->start   = microtime(true);
-        $this->ip      = rcube_utils::remote_addr();
-        $this->logging = $config->get('log_session', false);
-
-        $lifetime = $config->get('session_lifetime', 1) * 60;
-        $this->set_lifetime($lifetime);
-
-        // use memcache backend
-        $this->storage = $config->get('session_storage', 'db');
-        if ($this->storage == 'memcache') {
-            $this->memcache = rcube::get_instance()->get_memcache();
-
-            // set custom functions for PHP session management if memcache is available
-            if ($this->memcache) {
-                ini_set('session.serialize_handler', 'php');
-
-                session_set_save_handler(
-                    array($this, 'open'),
-                    array($this, 'close'),
-                    array($this, 'mc_read'),
-                    array($this, 'mc_write'),
-                    array($this, 'mc_destroy'),
-                    array($this, 'gc'));
-            }
-            else {
-                rcube::raise_error(array('code' => 604, 'type' => 'db',
-                    'line' => __LINE__, 'file' => __FILE__,
-                    'message' => "Failed to connect to memcached. Please check configuration"),
-                true, true);
-            }
-        }
-        else if ($this->storage != 'php') {
-            ini_set('session.serialize_handler', 'php');
-
-            // set custom functions for PHP session management
-            session_set_save_handler(
-                array($this, 'open'),
-                array($this, 'close'),
-                array($this, 'db_read'),
-                array($this, 'db_write'),
-                array($this, 'db_destroy'),
-                array($this, 'gc'));
-        }
-    }
-
-
-    /**
-     * Wrapper for session_start()
-     */
-    public function start()
-    {
-        session_start();
-
-        // copy some session properties to object vars
-        if ($this->storage == 'php') {
-            $this->key     = session_id();
-            $this->ip      = $_SESSION['__IP'];
-            $this->changed = $_SESSION['__MTIME'];
-        }
-    }
-
-
-    public function open($save_path, $session_name)
-    {
-        return true;
-    }
-
-
-    public function close()
-    {
-        return true;
-    }
-
-
-    /**
-     * Delete session data for the given key
-     *
-     * @param string Session ID
-     */
-    public function destroy($key)
-    {
-        return $this->memcache ? $this->mc_destroy($key) : $this->db_destroy($key);
-    }
-
-
-    /**
-     * Wrapper for session_write_close()
-     */
-    public function write_close()
-    {
-        if ($this->storage == 'php') {
-            $_SESSION['__IP'] = $this->ip;
-            $_SESSION['__MTIME'] = time();
-        }
-
-        session_write_close();
-
-        // write_close() is called on script shutdown, see rcube::shutdown()
-        // execute cleanup functionality if enabled by session gc handler
-        // we do this after closing the session for better performance
-        $this->gc_shutdown();
-    }
-
-
-    /**
-     * Read session data from database
-     *
-     * @param string Session ID
-     *
-     * @return string Session vars
-     */
-    public function db_read($key)
-    {
-        $sql_result = $this->db->query(
-            "SELECT vars, ip, changed, " . $this->db->now() . " AS ts"
-            . " FROM " . $this->db->table_name('session')
-            . " WHERE sess_id = ?", $key);
-
-        if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
-            $this->time_diff = time() - strtotime($sql_arr['ts']);
-            $this->changed   = strtotime($sql_arr['changed']);
-            $this->ip        = $sql_arr['ip'];
-            $this->vars      = base64_decode($sql_arr['vars']);
-            $this->key       = $key;
-
-            return !empty($this->vars) ? (string) $this->vars : '';
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Save session data.
-     * handler for session_read()
-     *
-     * @param string Session ID
-     * @param string Serialized session vars
-     *
-     * @return boolean True on success
-     */
-    public function db_write($key, $vars)
-    {
-        $now   = $this->db->now();
-        $table = $this->db->table_name('session');
-        $ts    = microtime(true);
-
-        // no session row in DB (db_read() returns false)
-        if (!$this->key) {
-            $oldvars = null;
-        }
-        // use internal data from read() for fast requests (up to 0.5 sec.)
-        else if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5)) {
-            $oldvars = $this->vars;
-        }
-        else { // else read data again from DB
-            $oldvars = $this->db_read($key);
-        }
-
-        if ($oldvars !== null) {
-            $newvars = $this->_fixvars($vars, $oldvars);
-
-            if ($newvars !== $oldvars) {
-                $this->db->query("UPDATE $table "
-                    . "SET changed = $now, vars = ? WHERE sess_id = ?",
-                    base64_encode($newvars), $key);
-            }
-            else if ($ts - $this->changed + $this->time_diff > $this->lifetime / 2) {
-                $this->db->query("UPDATE $table SET changed = $now"
-                    . " WHERE sess_id = ?", $key);
-            }
-        }
-        else {
-            $this->db->query("INSERT INTO $table (sess_id, vars, ip, created, changed)"
-                . " VALUES (?, ?, ?, $now, $now)",
-                $key, base64_encode($vars), (string)$this->ip);
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Merge vars with old vars and apply unsets
-     */
-    private function _fixvars($vars, $oldvars)
-    {
-        if ($oldvars !== null) {
-            $a_oldvars = $this->unserialize($oldvars);
-            if (is_array($a_oldvars)) {
-                // remove unset keys on oldvars
-                foreach ((array)$this->unsets as $var) {
-                    if (isset($a_oldvars[$var])) {
-                        unset($a_oldvars[$var]);
-                    }
-                    else {
-                        $path = explode('.', $var);
-                        $k = array_pop($path);
-                        $node = &$this->get_node($path, $a_oldvars);
-                        unset($node[$k]);
-                    }
-                }
-
-                $newvars = $this->serialize(array_merge(
-                    (array)$a_oldvars, (array)$this->unserialize($vars)));
-            }
-            else {
-                $newvars = $vars;
-            }
-        }
-
-        $this->unsets = array();
-        return $newvars;
-    }
-
-
-    /**
-     * Handler for session_destroy()
-     *
-     * @param string Session ID
-     *
-     * @return boolean True on success
-     */
-    public function db_destroy($key)
-    {
-        if ($key) {
-            $this->db->query(sprintf("DELETE FROM %s WHERE sess_id = ?",
-                $this->db->table_name('session')), $key);
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Read session data from memcache
-     *
-     * @param string Session ID
-     * @return string Session vars
-     */
-    public function mc_read($key)
-    {
-        if ($value = $this->memcache->get($key)) {
-            $arr = unserialize($value);
-            $this->changed = $arr['changed'];
-            $this->ip      = $arr['ip'];
-            $this->vars    = $arr['vars'];
-            $this->key     = $key;
-
-            return !empty($this->vars) ? (string) $this->vars : '';
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Save session data.
-     * handler for session_read()
-     *
-     * @param string Session ID
-     * @param string Serialized session vars
-     *
-     * @return boolean True on success
-     */
-    public function mc_write($key, $vars)
-    {
-        $ts = microtime(true);
-
-        // no session data in cache (mc_read() returns false)
-        if (!$this->key)
-            $oldvars = null;
-        // use internal data for fast requests (up to 0.5 sec.)
-        else if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5))
-            $oldvars = $this->vars;
-        else // else read data again
-            $oldvars = $this->mc_read($key);
-
-        $newvars = $oldvars !== null ? $this->_fixvars($vars, $oldvars) : $vars;
-
-        if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 3) {
-            return $this->memcache->set($key, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars)),
-                MEMCACHE_COMPRESSED, $this->lifetime + 60);
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Handler for session_destroy() with memcache backend
-     *
-     * @param string Session ID
-     *
-     * @return boolean True on success
-     */
-    public function mc_destroy($key)
-    {
-        if ($key) {
-            // #1488592: use 2nd argument
-            $this->memcache->delete($key, 0);
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Execute registered garbage collector routines
-     */
-    public function gc($maxlifetime)
-    {
-        // move gc execution to the script shutdown function
-        // see rcube::shutdown() and rcube_session::write_close()
-        return $this->gc_enabled = $maxlifetime;
-    }
-
-
-    /**
-     * Register additional garbage collector functions
-     *
-     * @param mixed Callback function
-     */
-    public function register_gc_handler($func)
-    {
-        foreach ($this->gc_handlers as $handler) {
-            if ($handler == $func) {
-                return;
-            }
-        }
-
-        $this->gc_handlers[] = $func;
-    }
-
-
-    /**
-     * Garbage collector handler to run on script shutdown
-     */
-    protected function gc_shutdown()
-    {
-        if ($this->gc_enabled) {
-            // just delete all expired sessions
-            if ($this->storage == 'db') {
-                $this->db->query("DELETE FROM " . $this->db->table_name('session')
-                    . " WHERE changed < " . $this->db->now(-$this->gc_enabled));
-            }
-
-            foreach ($this->gc_handlers as $fct) {
-                call_user_func($fct);
-            }
-        }
-    }
-
-
-    /**
-     * Generate and set new session id
-     *
-     * @param boolean $destroy If enabled the current session will be destroyed
-     */
-    public function regenerate_id($destroy=true)
-    {
-        session_regenerate_id($destroy);
-
-        $this->vars = null;
-        $this->key  = session_id();
-
-        return true;
-    }
-
-
-    /**
-     * Append the given value to the certain node in the session data array
-     *
-     * @param string Path denoting the session variable where to append the value
-     * @param string Key name under which to append the new value (use null for appending to an indexed list)
-     * @param mixed  Value to append to the session data array
-     */
-    public function append($path, $key, $value)
-    {
-        // re-read session data from DB because it might be outdated
-        if (!$this->reloaded && microtime(true) - $this->start > 0.5) {
-            $this->reload();
-            $this->reloaded = true;
-            $this->start = microtime(true);
-        }
-
-        $node = &$this->get_node(explode('.', $path), $_SESSION);
-
-        if ($key !== null) $node[$key] = $value;
-        else               $node[] = $value;
-    }
-
-
-    /**
-     * Unset a session variable
-     *
-     * @param string Variable name (can be a path denoting a certain node in the session array, e.g. compose.attachments.5)
-     * @return boolean True on success
-     */
-    public function remove($var=null)
-    {
-        if (empty($var)) {
-            return $this->destroy(session_id());
-        }
-
-        $this->unsets[] = $var;
-
-        if (isset($_SESSION[$var])) {
-            unset($_SESSION[$var]);
-        }
-        else {
-            $path = explode('.', $var);
-            $key = array_pop($path);
-            $node = &$this->get_node($path, $_SESSION);
-            unset($node[$key]);
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Kill this session
-     */
-    public function kill()
-    {
-        $this->vars = null;
-        $this->ip = rcube_utils::remote_addr(); // update IP (might have changed)
-        $this->destroy(session_id());
-        rcube_utils::setcookie($this->cookiename, '-del-', time() - 60);
-    }
-
-
-    /**
-     * Re-read session data from storage backend
-     */
-    public function reload()
-    {
-        if ($this->key && $this->memcache)
-            $data = $this->mc_read($this->key);
-        else if ($this->key)
-            $data = $this->db_read($this->key);
-
-        if ($data)
-            session_decode($data);
-    }
-
-    /**
-     * Returns a reference to the node in data array referenced by the given path.
-     * e.g. ['compose','attachments'] will return $_SESSION['compose']['attachments']
-     */
-    private function &get_node($path, &$data_arr)
-    {
-        $node = &$data_arr;
-        if (!empty($path)) {
-            foreach ((array)$path as $key) {
-                if (!isset($node[$key]))
-                    $node[$key] = array();
-                $node = &$node[$key];
-            }
-        }
-
-        return $node;
-    }
-
-    /**
-     * Serialize session data
-     */
-    private function serialize($vars)
-    {
-        $data = '';
-        if (is_array($vars)) {
-            foreach ($vars as $var=>$value)
-                $data .= $var.'|'.serialize($value);
-        }
-        else {
-            $data = 'b:0;';
-        }
-
-        return $data;
-    }
-
-
-    /**
-     * Unserialize session data
-     * http://www.php.net/manual/en/function.session-decode.php#56106
-     */
-    private function unserialize($str)
-    {
-        $str    = (string)$str;
-        $endptr = strlen($str);
-        $p      = 0;
-
-        $serialized = '';
-        $items      = 0;
-        $level      = 0;
-
-        while ($p < $endptr) {
-            $q = $p;
-            while ($str[$q] != '|')
-                if (++$q >= $endptr)
-                    break 2;
-
-            if ($str[$p] == '!') {
-                $p++;
-                $has_value = false;
-            }
-            else {
-                $has_value = true;
-            }
-
-            $name = substr($str, $p, $q - $p);
-            $q++;
-
-            $serialized .= 's:' . strlen($name) . ':"' . $name . '";';
-
-            if ($has_value) {
-                for (;;) {
-                    $p = $q;
-                    switch (strtolower($str[$q])) {
-                    case 'n': // null
-                    case 'b': // boolean
-                    case 'i': // integer
-                    case 'd': // decimal
-                        do $q++;
-                        while ( ($q < $endptr) && ($str[$q] != ';') );
-                        $q++;
-                        $serialized .= substr($str, $p, $q - $p);
-                        if ($level == 0)
-                            break 2;
-                        break;
-                    case 'r': // reference
-                        $q+= 2;
-                        for ($id = ''; ($q < $endptr) && ($str[$q] != ';'); $q++)
-                            $id .= $str[$q];
-                        $q++;
-                        // increment pointer because of outer array
-                        $serialized .= 'R:' . ($id + 1) . ';';
-                        if ($level == 0)
-                            break 2;
-                        break;
-                    case 's': // string
-                        $q+=2;
-                        for ($length=''; ($q < $endptr) && ($str[$q] != ':'); $q++)
-                            $length .= $str[$q];
-                        $q+=2;
-                        $q+= (int)$length + 2;
-                        $serialized .= substr($str, $p, $q - $p);
-                        if ($level == 0)
-                            break 2;
-                        break;
-                    case 'a': // array
-                    case 'o': // object
-                        do $q++;
-                        while ($q < $endptr && $str[$q] != '{');
-                        $q++;
-                        $level++;
-                        $serialized .= substr($str, $p, $q - $p);
-                        break;
-                    case '}': // end of array|object
-                        $q++;
-                        $serialized .= substr($str, $p, $q - $p);
-                        if (--$level == 0)
-                            break 2;
-                        break;
-                    default:
-                        return false;
-                    }
-                }
-            }
-            else {
-                $serialized .= 'N;';
-                $q += 2;
-            }
-            $items++;
-            $p = $q;
-        }
-
-        return unserialize( 'a:' . $items . ':{' . $serialized . '}' );
-    }
-
-
-    /**
-     * Setter for session lifetime
-     */
-    public function set_lifetime($lifetime)
-    {
-        $this->lifetime = max(120, $lifetime);
-
-        // valid time range is now - 1/2 lifetime to now + 1/2 lifetime
-        $now = time();
-        $this->now = $now - ($now % ($this->lifetime / 2));
-    }
-
-
-    /**
-     * Getter for remote IP saved with this session
-     */
-    public function get_ip()
-    {
-        return $this->ip;
-    }
-
-
-    /**
-     * Setter for cookie encryption secret
-     */
-    function set_secret($secret)
-    {
-        $this->secret = $secret;
-    }
-
-
-    /**
-     * Enable/disable IP check
-     */
-    function set_ip_check($check)
-    {
-        $this->ip_check = $check;
-    }
-
-
-    /**
-     * Setter for the cookie name used for session cookie
-     */
-    function set_cookiename($cookiename)
-    {
-        if ($cookiename) {
-            $this->cookiename = $cookiename;
-        }
-    }
-
-
-    /**
-     * Check session authentication cookie
-     *
-     * @return boolean True if valid, False if not
-     */
-    function check_auth()
-    {
-        $this->cookie = $_COOKIE[$this->cookiename];
-        $result = $this->ip_check ? rcube_utils::remote_addr() == $this->ip : true;
-
-        if (!$result) {
-            $this->log("IP check failed for " . $this->key . "; expected " . $this->ip . "; got " . rcube_utils::remote_addr());
-        }
-
-        if ($result && $this->_mkcookie($this->now) != $this->cookie) {
-            $this->log("Session auth check failed for " . $this->key . "; timeslot = " . date('Y-m-d H:i:s', $this->now));
-            $result = false;
-
-            // Check if using id from a previous time slot
-            for ($i = 1; $i <= 2; $i++) {
-                $prev = $this->now - ($this->lifetime / 2) * $i;
-                if ($this->_mkcookie($prev) == $this->cookie) {
-                    $this->log("Send new auth cookie for " . $this->key . ": " . $this->cookie);
-                    $this->set_auth_cookie();
-                    $result = true;
-                }
-            }
-        }
-
-        if (!$result) {
-            $this->log("Session authentication failed for " . $this->key
-                . "; invalid auth cookie sent; timeslot = " . date('Y-m-d H:i:s', $prev));
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Set session authentication cookie
-     */
-    function set_auth_cookie()
-    {
-        $this->cookie = $this->_mkcookie($this->now);
-        rcube_utils::setcookie($this->cookiename, $this->cookie, 0);
-        $_COOKIE[$this->cookiename] = $this->cookie;
-    }
-
-
-    /**
-     * Create session cookie from session data
-     *
-     * @param int Time slot to use
-     */
-    function _mkcookie($timeslot)
-    {
-        $auth_string = "$this->key,$this->secret,$timeslot";
-        return "S" . (function_exists('sha1') ? sha1($auth_string) : md5($auth_string));
-    }
-
-    /**
-     * Writes debug information to the log
-     */
-    function log($line)
-    {
-        if ($this->logging) {
-            rcube::write_log('session', $line);
-        }
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_smtp.php b/lib/ext/Roundcube/rcube_smtp.php
deleted file mode 100644
index 60b1389..0000000
--- a/lib/ext/Roundcube/rcube_smtp.php
+++ /dev/null
@@ -1,458 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Provide SMTP functionality using socket connections                 |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Class to provide SMTP functionality using PEAR Net_SMTP
- *
- * @package    Framework
- * @subpackage Mail
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- */
-class rcube_smtp
-{
-    private $conn = null;
-    private $response;
-    private $error;
-
-    // define headers delimiter
-    const SMTP_MIME_CRLF = "\r\n";
-
-    const DEBUG_LINE_LENGTH = 4098; // 4KB + 2B for \r\n
-
-
-    /**
-     * SMTP Connection and authentication
-     *
-     * @param string Server host
-     * @param string Server port
-     * @param string User name
-     * @param string Password
-     *
-     * @return bool  Returns true on success, or false on error
-     */
-    public function connect($host=null, $port=null, $user=null, $pass=null)
-    {
-        $rcube = rcube::get_instance();
-
-        // disconnect/destroy $this->conn
-        $this->disconnect();
-
-        // reset error/response var
-        $this->error = $this->response = null;
-
-        // let plugins alter smtp connection config
-        $CONFIG = $rcube->plugins->exec_hook('smtp_connect', array(
-            'smtp_server'    => $host ? $host : $rcube->config->get('smtp_server'),
-            'smtp_port'      => $port ? $port : $rcube->config->get('smtp_port', 25),
-            'smtp_user'      => $user ? $user : $rcube->config->get('smtp_user'),
-            'smtp_pass'      => $pass ? $pass : $rcube->config->get('smtp_pass'),
-            'smtp_auth_cid'  => $rcube->config->get('smtp_auth_cid'),
-            'smtp_auth_pw'   => $rcube->config->get('smtp_auth_pw'),
-            'smtp_auth_type' => $rcube->config->get('smtp_auth_type'),
-            'smtp_helo_host' => $rcube->config->get('smtp_helo_host'),
-            'smtp_timeout'   => $rcube->config->get('smtp_timeout'),
-            'smtp_auth_callbacks' => array(),
-        ));
-
-        $smtp_host = rcube_utils::parse_host($CONFIG['smtp_server']);
-        // when called from Installer it's possible to have empty $smtp_host here
-        if (!$smtp_host) $smtp_host = 'localhost';
-        $smtp_port     = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25;
-        $smtp_host_url = parse_url($smtp_host);
-
-        // overwrite port
-        if (isset($smtp_host_url['host']) && isset($smtp_host_url['port'])) {
-            $smtp_host = $smtp_host_url['host'];
-            $smtp_port = $smtp_host_url['port'];
-        }
-
-        // re-write smtp host
-        if (isset($smtp_host_url['host']) && isset($smtp_host_url['scheme'])) {
-            $smtp_host = sprintf('%s://%s', $smtp_host_url['scheme'], $smtp_host_url['host']);
-        }
-
-        // remove TLS prefix and set flag for use in Net_SMTP::auth()
-        if (preg_match('#^tls://#i', $smtp_host)) {
-            $smtp_host = preg_replace('#^tls://#i', '', $smtp_host);
-            $use_tls   = true;
-        }
-
-        if (!empty($CONFIG['smtp_helo_host'])) {
-            $helo_host = $CONFIG['smtp_helo_host'];
-        }
-        else if (!empty($_SERVER['SERVER_NAME'])) {
-            $helo_host = preg_replace('/:\d+$/', '', $_SERVER['SERVER_NAME']);
-        }
-        else {
-            $helo_host = 'localhost';
-        }
-
-        // IDNA Support
-        $smtp_host = rcube_utils::idn_to_ascii($smtp_host);
-
-        $this->conn = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
-
-        if ($rcube->config->get('smtp_debug')) {
-            $this->conn->setDebug(true, array($this, 'debug_handler'));
-        }
-
-        // register authentication methods
-        if (!empty($CONFIG['smtp_auth_callbacks']) && method_exists($this->conn, 'setAuthMethod')) {
-            foreach ($CONFIG['smtp_auth_callbacks'] as $callback) {
-                $this->conn->setAuthMethod($callback['name'], $callback['function'],
-                    isset($callback['prepend']) ? $callback['prepend'] : true);
-            }
-        }
-
-        // try to connect to server and exit on failure
-        $result = $this->conn->connect($CONFIG['smtp_timeout']);
-
-        if (PEAR::isError($result)) {
-            $this->response[] = "Connection failed: ".$result->getMessage();
-            $this->error = array('label' => 'smtpconnerror', 'vars' => array('code' => $this->conn->_code));
-            $this->conn  = null;
-            return false;
-        }
-
-        // workaround for timeout bug in Net_SMTP 1.5.[0-1] (#1487843)
-        if (method_exists($this->conn, 'setTimeout')
-            && ($timeout = ini_get('default_socket_timeout'))
-        ) {
-            $this->conn->setTimeout($timeout);
-        }
-
-        $smtp_user = str_replace('%u', $rcube->get_user_name(), $CONFIG['smtp_user']);
-        $smtp_pass = str_replace('%p', $rcube->get_user_password(), $CONFIG['smtp_pass']);
-        $smtp_auth_type = empty($CONFIG['smtp_auth_type']) ? NULL : $CONFIG['smtp_auth_type'];
-
-        if (!empty($CONFIG['smtp_auth_cid'])) {
-            $smtp_authz = $smtp_user;
-            $smtp_user  = $CONFIG['smtp_auth_cid'];
-            $smtp_pass  = $CONFIG['smtp_auth_pw'];
-        }
-
-        // attempt to authenticate to the SMTP server
-        if ($smtp_user && $smtp_pass) {
-            // IDNA Support
-            if (strpos($smtp_user, '@')) {
-                $smtp_user = rcube_utils::idn_to_ascii($smtp_user);
-            }
-
-            $result = $this->conn->auth($smtp_user, $smtp_pass, $smtp_auth_type, $use_tls, $smtp_authz);
-
-            if (PEAR::isError($result)) {
-                $this->error = array('label' => 'smtpautherror', 'vars' => array('code' => $this->conn->_code));
-                $this->response[] .= 'Authentication failure: ' . $result->getMessage() . ' (Code: ' . $result->getCode() . ')';
-                $this->reset();
-                $this->disconnect();
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Function for sending mail
-     *
-     * @param string Sender e-Mail address
-     *
-     * @param mixed  Either a comma-seperated list of recipients
-     *               (RFC822 compliant), or an array of recipients,
-     *               each RFC822 valid. This may contain recipients not
-     *               specified in the headers, for Bcc:, resending
-     *               messages, etc.
-     * @param mixed  The message headers to send with the mail
-     *               Either as an associative array or a finally
-     *               formatted string
-     * @param mixed  The full text of the message body, including any Mime parts
-     *               or file handle
-     * @param array  Delivery options (e.g. DSN request)
-     *
-     * @return bool  Returns true on success, or false on error
-     */
-    public function send_mail($from, $recipients, &$headers, &$body, $opts=null)
-    {
-        if (!is_object($this->conn)) {
-            return false;
-        }
-
-        // prepare message headers as string
-        if (is_array($headers)) {
-            if (!($headerElements = $this->_prepare_headers($headers))) {
-                $this->reset();
-                return false;
-            }
-
-            list($from, $text_headers) = $headerElements;
-        }
-        else if (is_string($headers)) {
-            $text_headers = $headers;
-        }
-        else {
-            $this->reset();
-            $this->response[] = "Invalid message headers";
-            return false;
-        }
-
-        // exit if no from address is given
-        if (!isset($from)) {
-            $this->reset();
-            $this->response[] = "No From address has been provided";
-            return false;
-        }
-
-        // RFC3461: Delivery Status Notification
-        if ($opts['dsn']) {
-            $exts = $this->conn->getServiceExtensions();
-
-            if (isset($exts['DSN'])) {
-                $from_params      = 'RET=HDRS';
-                $recipient_params = 'NOTIFY=SUCCESS,FAILURE';
-            }
-        }
-
-        // RFC2298.3: remove envelope sender address
-        if (empty($opts['mdn_use_from'])
-            && preg_match('/Content-Type: multipart\/report/', $text_headers)
-            && preg_match('/report-type=disposition-notification/', $text_headers)
-        ) {
-            $from = '';
-        }
-
-        // set From: address
-        if (PEAR::isError($this->conn->mailFrom($from, $from_params))) {
-            $err = $this->conn->getResponse();
-            $this->error = array('label' => 'smtpfromerror', 'vars' => array(
-                'from' => $from, 'code' => $this->conn->_code, 'msg' => $err[1]));
-            $this->response[] = "Failed to set sender '$from'";
-            $this->reset();
-            return false;
-        }
-
-        // prepare list of recipients
-        $recipients = $this->_parse_rfc822($recipients);
-        if (PEAR::isError($recipients)) {
-            $this->error = array('label' => 'smtprecipientserror');
-            $this->reset();
-            return false;
-        }
-
-        // set mail recipients
-        foreach ($recipients as $recipient) {
-            if (PEAR::isError($this->conn->rcptTo($recipient, $recipient_params))) {
-                $err = $this->conn->getResponse();
-                $this->error = array('label' => 'smtptoerror', 'vars' => array(
-                    'to' => $recipient, 'code' => $this->conn->_code, 'msg' => $err[1]));
-                $this->response[] = "Failed to add recipient '$recipient'";
-                $this->reset();
-                return false;
-            }
-        }
-
-        if (is_resource($body)) {
-            // file handle
-            $data         = $body;
-            $text_headers = preg_replace('/[\r\n]+$/', '', $text_headers);
-        }
-        else {
-            // Concatenate headers and body so it can be passed by reference to SMTP_CONN->data
-            // so preg_replace in SMTP_CONN->quotedata will store a reference instead of a copy.
-            // We are still forced to make another copy here for a couple ticks so we don't really
-            // get to save a copy in the method call.
-            $data = $text_headers . "\r\n" . $body;
-
-            // unset old vars to save data and so we can pass into SMTP_CONN->data by reference.
-            unset($text_headers, $body);
-        }
-
-        // Send the message's headers and the body as SMTP data.
-        if (PEAR::isError($result = $this->conn->data($data, $text_headers))) {
-            $err = $this->conn->getResponse();
-            if (!in_array($err[0], array(354, 250, 221))) {
-                $msg = sprintf('[%d] %s', $err[0], $err[1]);
-            }
-            else {
-                $msg = $result->getMessage();
-            }
-
-            $this->error = array('label' => 'smtperror', 'vars' => array('msg' => $msg));
-            $this->response[] = "Failed to send data";
-            $this->reset();
-            return false;
-        }
-
-        $this->response[] = join(': ', $this->conn->getResponse());
-        return true;
-    }
-
-    /**
-     * Reset the global SMTP connection
-     */
-    public function reset()
-    {
-        if (is_object($this->conn)) {
-            $this->conn->rset();
-        }
-    }
-
-    /**
-     * Disconnect the global SMTP connection
-     */
-    public function disconnect()
-    {
-        if (is_object($this->conn)) {
-            $this->conn->disconnect();
-            $this->conn = null;
-        }
-    }
-
-
-    /**
-     * This is our own debug handler for the SMTP connection
-     */
-    public function debug_handler(&$smtp, $message)
-    {
-        if (($len = strlen($message)) > self::DEBUG_LINE_LENGTH) {
-            $diff    = $len - self::DEBUG_LINE_LENGTH;
-            $message = substr($message, 0, self::DEBUG_LINE_LENGTH)
-                . "... [truncated $diff bytes]";
-        }
-
-        rcube::write_log('smtp', preg_replace('/\r\n$/', '', $message));
-    }
-
-    /**
-     * Get error message
-     */
-    public function get_error()
-    {
-        return $this->error;
-    }
-
-    /**
-     * Get server response messages array
-     */
-    public function get_response()
-    {
-         return $this->response;
-    }
-
-    /**
-     * Take an array of mail headers and return a string containing
-     * text usable in sending a message.
-     *
-     * @param array $headers The array of headers to prepare, in an associative
-     *              array, where the array key is the header name (ie,
-     *              'Subject'), and the array value is the header
-     *              value (ie, 'test'). The header produced from those
-     *              values would be 'Subject: test'.
-     *
-     * @return mixed Returns false if it encounters a bad address,
-     *               otherwise returns an array containing two
-     *               elements: Any From: address found in the headers,
-     *               and the plain text version of the headers.
-     */
-    private function _prepare_headers($headers)
-    {
-        $lines = array();
-        $from  = null;
-
-        foreach ($headers as $key => $value) {
-            if (strcasecmp($key, 'From') === 0) {
-                $addresses = $this->_parse_rfc822($value);
-
-                if (is_array($addresses)) {
-                    $from = $addresses[0];
-                }
-
-                // Reject envelope From: addresses with spaces.
-                if (strpos($from, ' ') !== false) {
-                    return false;
-                }
-
-                $lines[] = $key . ': ' . $value;
-            }
-            else if (strcasecmp($key, 'Received') === 0) {
-                $received = array();
-                if (is_array($value)) {
-                    foreach ($value as $line) {
-                        $received[] = $key . ': ' . $line;
-                    }
-                }
-                else {
-                    $received[] = $key . ': ' . $value;
-                }
-
-                // Put Received: headers at the top.  Spam detectors often
-                // flag messages with Received: headers after the Subject:
-                // as spam.
-                $lines = array_merge($received, $lines);
-            }
-            else {
-                // If $value is an array (i.e., a list of addresses), convert
-                // it to a comma-delimited string of its elements (addresses).
-                if (is_array($value)) {
-                    $value = implode(', ', $value);
-                }
-
-                $lines[] = $key . ': ' . $value;
-            }
-        }
-
-        return array($from, join(self::SMTP_MIME_CRLF, $lines) . self::SMTP_MIME_CRLF);
-    }
-
-    /**
-     * Take a set of recipients and parse them, returning an array of
-     * bare addresses (forward paths) that can be passed to sendmail
-     * or an smtp server with the rcpt to: command.
-     *
-     * @param mixed Either a comma-seperated list of recipients
-     *              (RFC822 compliant), or an array of recipients,
-     *              each RFC822 valid.
-     *
-     * @return array An array of forward paths (bare addresses).
-     */
-    private function _parse_rfc822($recipients)
-    {
-        // if we're passed an array, assume addresses are valid and implode them before parsing.
-        if (is_array($recipients)) {
-            $recipients = implode(', ', $recipients);
-        }
-
-        $addresses  = array();
-        $recipients = rcube_utils::explode_quoted_string(',', $recipients);
-
-        reset($recipients);
-        foreach ($recipients as $recipient) {
-            $a = rcube_utils::explode_quoted_string(' ', $recipient);
-            foreach ($a as $word) {
-                if (strpos($word, "@") > 0 && $word[strlen($word)-1] != '"') {
-                    $word = preg_replace('/^<|>$/', '', trim($word));
-                    if (in_array($word, $addresses) === false) {
-                        array_push($addresses, $word);
-                    }
-                }
-            }
-        }
-
-        return $addresses;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_spellcheck_atd.php b/lib/ext/Roundcube/rcube_spellcheck_atd.php
deleted file mode 100644
index 9f073f5..0000000
--- a/lib/ext/Roundcube/rcube_spellcheck_atd.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Spellchecking backend implementation for afterthedeadline services  |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Spellchecking backend implementation to work with an After the Deadline service
- * See http://www.afterthedeadline.com/ for more information
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_spellcheck_atd extends rcube_spellcheck_engine
-{
-    const SERVICE_HOST = 'service.afterthedeadline.com';
-    const SERVICE_PORT = 80;
-
-    private $matches = array();
-    private $content;
-    private $langhosts = array(
-        'fr' => 'fr.',
-        'de' => 'de.',
-        'pt' => 'pt.',
-        'es' => 'es.',
-    );
-
-    /**
-     * Return a list of languages supported by this backend
-     *
-     * @see rcube_spellcheck_engine::languages()
-     */
-    function languages()
-    {
-        $langs = array_values($this->langhosts);
-        $langs[] = 'en';
-        return $langs;
-    }
-
-    /**
-     * Set content and check spelling
-     *
-     * @see rcube_spellcheck_engine::check()
-     */
-    function check($text)
-    {
-        $this->content = $text;
-
-        // spell check uri is configured
-        $rcube = rcube::get_instance();
-        $url = $rcube->config->get('spellcheck_uri');
-        $key = $rcube->config->get('spellcheck_atd_key');
-
-        if ($url) {
-            $a_uri = parse_url($url);
-            $ssl   = ($a_uri['scheme'] == 'https' || $a_uri['scheme'] == 'ssl');
-            $port  = $a_uri['port'] ? $a_uri['port'] : ($ssl ? 443 : 80);
-            $host  = ($ssl ? 'ssl://' : '') . $a_uri['host'];
-            $path  = $a_uri['path'] . ($a_uri['query'] ? '?'.$a_uri['query'] : '') . $this->lang;
-        }
-        else {
-            $host = self::SERVICE_HOST;
-            $port = self::SERVICE_PORT;
-            $path = '/checkDocument';
-
-            // prefix host for other languages than 'en'
-            $lang = substr($this->lang, 0, 2);
-            if ($this->langhosts[$lang])
-                $host = $this->langhosts[$lang] . $host;
-        }
-
-        $postdata = 'data=' . urlencode($text);
-
-        if (!empty($key))
-            $postdata .= '&key=' . urlencode($key);
-
-        $response = $headers = '';
-        $in_header = true;
-        if ($fp = fsockopen($host, $port, $errno, $errstr, 30)) {
-            $out = "POST $path HTTP/1.0\r\n";
-            $out .= "Host: " . str_replace('ssl://', '', $host) . "\r\n";
-            $out .= "Content-Length: " . strlen($postdata) . "\r\n";
-            $out .= "Content-Type: application/x-www-form-urlencoded\r\n";
-            $out .= "Connection: Close\r\n\r\n";
-            $out .= $postdata;
-            fwrite($fp, $out);
-
-            while (!feof($fp)) {
-                if ($in_header) {
-                    $line = fgets($fp, 512);
-                    $headers .= $line;
-                    if (trim($line) == '')
-                        $in_header = false;
-                }
-                else {
-                    $response .= fgets($fp, 1024);
-                }
-            }
-            fclose($fp);
-        }
-
-        // parse HTTP response headers
-        if (preg_match('!^HTTP/1.\d (\d+)(.+)!', $headers, $m)) {
-            $http_status = $m[1];
-            if ($http_status != '200')
-                $this->error = 'HTTP ' . $m[1] . $m[2];
-        }
-
-        if (!$response) {
-            $this->error = "Empty result from spelling engine";
-        }
-
-        try {
-            $result = new SimpleXMLElement($response);
-        }
-        catch (Exception $e) {
-            $thid->error = "Unexpected response from server: " . $store;
-            return array();
-        }
-
-        foreach ($result->error as $error) {
-            if (strval($error->type) == 'spelling') {
-                $word = strval($error->string);
-
-                // skip exceptions
-                if ($this->dictionary->is_exception($word)) {
-                    continue;
-                }
-
-                $prefix = strval($error->precontext);
-                $start = $prefix ? mb_strpos($text, $prefix) : 0;
-                $pos = mb_strpos($text, $word, $start);
-                $len = mb_strlen($word);
-                $num = 0;
-
-                $match = array($word, $pos, $len, null, array());
-                foreach ($error->suggestions->option as $option) {
-                    $match[4][] = strval($option);
-                    if (++$num == self::MAX_SUGGESTIONS)
-                        break;
-                }
-                $matches[] = $match;
-            }
-        }
-
-        $this->matches = $matches;
-        return $matches;
-    }
-
-    /**
-     * Returns suggestions for the specified word
-     *
-     * @see rcube_spellcheck_engine::get_words()
-     */
-    function get_suggestions($word)
-    {
-        $matches = $word ? $this->check($word) : $this->matches;
-
-        if ($matches[0][4]) {
-            return $matches[0][4];
-        }
-
-        return array();
-    }
-
-    /**
-     * Returns misspelled words
-     *
-     * @see rcube_spellcheck_engine::get_suggestions()
-     */
-    function get_words($text = null)
-    {
-        if ($text) {
-            $matches = $this->check($text);
-        }
-        else {
-            $matches = $this->matches;
-            $text    = $this->content;
-        }
-
-        $result = array();
-
-        foreach ($matches as $m) {
-            $result[] = mb_substr($text, $m[1], $m[2], RCUBE_CHARSET);
-        }
-
-        return $result;
-    }
-
-}
-
diff --git a/lib/ext/Roundcube/rcube_spellcheck_enchant.php b/lib/ext/Roundcube/rcube_spellcheck_enchant.php
deleted file mode 100644
index 14d6fff..0000000
--- a/lib/ext/Roundcube/rcube_spellcheck_enchant.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 2011-2013, Kolab Systems AG                             |
- | Copyright (C) 20011-2013, The Roundcube Dev Team                      |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Spellchecking backend implementation to work with Enchant           |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Spellchecking backend implementation to work with Pspell
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_spellcheck_enchant extends rcube_spellcheck_engine
-{
-    private $enchant_broker;
-    private $enchant_dictionary;
-    private $matches = array();
-
-    /**
-     * Return a list of languages supported by this backend
-     *
-     * @see rcube_spellcheck_engine::languages()
-     */
-    function languages()
-    {
-        $this->init();
-
-        $langs = array();
-        $dicts = enchant_broker_list_dicts($this->enchant_broker);
-        foreach ($dicts as $dict) {
-            $langs[] = preg_replace('/-.*$/', '', $dict['lang_tag']);
-        }
-
-        return array_unique($langs);
-    }
-
-    /**
-     * Initializes Enchant dictionary
-     */
-    private function init()
-    {
-        if (!$this->enchant_broker) {
-            if (!extension_loaded('enchant')) {
-                $this->error = "Enchant extension not available";
-                return;
-            }
-
-            $this->enchant_broker = enchant_broker_init();
-        }
-
-        if (!enchant_broker_dict_exists($this->enchant_broker, $this->lang)) {
-            $this->error = "Unable to load dictionary for selected language using Enchant";
-            return;
-        }
-
-        $this->enchant_dictionary = enchant_broker_request_dict($this->enchant_broker, $this->lang);
-    }
-
-    /**
-     * Set content and check spelling
-     *
-     * @see rcube_spellcheck_engine::check()
-     */
-    function check($text)
-    {
-        $this->init();
-
-        if (!$this->enchant_dictionary) {
-            return array();
-        }
-
-        // tokenize
-        $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
-
-        $diff       = 0;
-        $matches    = array();
-
-        foreach ($text as $w) {
-            $word = trim($w[0]);
-            $pos  = $w[1] - $diff;
-            $len  = mb_strlen($word);
-
-            // skip exceptions
-            if ($this->dictionary->is_exception($word)) {
-            }
-            else if (!enchant_dict_check($this->enchant_dictionary, $word)) {
-                $suggestions = enchant_dict_suggest($this->enchant_dictionary, $word);
-
-                if (sizeof($suggestions) > self::MAX_SUGGESTIONS) {
-                    $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
-                }
-
-                $matches[] = array($word, $pos, $len, null, $suggestions);
-            }
-
-            $diff += (strlen($word) - $len);
-        }
-
-        $this->matches = $matches;
-        return $matches;
-    }
-
-    /**
-     * Returns suggestions for the specified word
-     *
-     * @see rcube_spellcheck_engine::get_words()
-     */
-    function get_suggestions($word)
-    {
-        $this->init();
-
-        if (!$this->enchant_dictionary) {
-            return array();
-        }
-
-        $suggestions = enchant_dict_suggest($this->enchant_dictionary, $word);
-
-        if (sizeof($suggestions) > self::MAX_SUGGESTIONS)
-            $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
-
-        return is_array($suggestions) ? $suggestions : array();
-    }
-
-    /**
-     * Returns misspelled words
-     *
-     * @see rcube_spellcheck_engine::get_suggestions()
-     */
-    function get_words($text = null)
-    {
-        $result = array();
-
-        if ($text) {
-            // init spellchecker
-            $this->init();
-
-            if (!$this->enchant_dictionary) {
-                return array();
-            }
-
-            // With Enchant we don't need to get suggestions to return misspelled words
-            $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
-
-            foreach ($text as $w) {
-                $word = trim($w[0]);
-
-                // skip exceptions
-                if ($this->dictionary->is_exception($word)) {
-                    continue;
-                }
-
-                if (!enchant_dict_check($this->enchant_dictionary, $word)) {
-                    $result[] = $word;
-                }
-            }
-
-            return $result;
-        }
-
-        foreach ($this->matches as $m) {
-            $result[] = $m[0];
-        }
-
-        return $result;
-    }
-
-}
-
diff --git a/lib/ext/Roundcube/rcube_spellcheck_engine.php b/lib/ext/Roundcube/rcube_spellcheck_engine.php
deleted file mode 100644
index 3cb4ca3..0000000
--- a/lib/ext/Roundcube/rcube_spellcheck_engine.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 2011-2013, Kolab Systems AG                             |
- | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Interface class for a spell-checking backend                        |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Interface class for a spell-checking backend
- *
- * @package    Framework
- * @subpackage Utils
- */
-abstract class rcube_spellcheck_engine
-{
-    const MAX_SUGGESTIONS = 10;
-
-    protected $lang;
-    protected $error;
-    protected $dictionary;
-    protected $separator = '/[\s\r\n\t\(\)\/\[\]{}<>\\"]+|[:;?!,\.](?=\W|$)/';
-
-    /**
-     * Default constructor
-     */
-    public function __construct($dict, $lang)
-    {
-        $this->dictionary = $dict;
-        $this->lang = $lang;
-    }
-
-    /**
-     * Return a list of languages supported by this backend
-     *
-     * @return array Indexed list of language codes
-     */
-    abstract function languages();
-
-    /**
-     * Set content and check spelling
-     *
-     * @param string $text    Text content for spellchecking
-     *
-     * @return bool True when no mispelling found, otherwise false
-     */
-    abstract function check($text);
-
-    /**
-     * Returns suggestions for the specified word
-     *
-     * @param string $word The word
-     *
-     * @return array Suggestions list
-     */
-    abstract function get_suggestions($word);
-
-    /**
-     * Returns misspelled words
-     *
-     * @param string $text The content for spellchecking. If empty content
-     *                     used for check() method will be used.
-     *
-     * @return array List of misspelled words
-     */
-    abstract function get_words($text = null);
-
-    /**
-     * Returns error message
-     *
-     * @return string Error message
-     */
-    public function error()
-    {
-        return $this->error;
-    }
-
-}
-
diff --git a/lib/ext/Roundcube/rcube_spellcheck_googie.php b/lib/ext/Roundcube/rcube_spellcheck_googie.php
deleted file mode 100644
index 3777942..0000000
--- a/lib/ext/Roundcube/rcube_spellcheck_googie.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Spellchecking backend implementation to work with Googiespell       |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Spellchecking backend implementation to work with a Googiespell service
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_spellcheck_googie extends rcube_spellcheck_engine
-{
-    const GOOGIE_HOST = 'ssl://spell.roundcube.net';
-    const GOOGIE_PORT = 443;
-
-    private $matches = array();
-    private $content;
-
-    /**
-     * Return a list of languages supported by this backend
-     *
-     * @see rcube_spellcheck_engine::languages()
-     */
-    function languages()
-    {
-        return array('am','ar','ar','bg','br','ca','cs','cy','da',
-            'de_CH','de_DE','el','en_GB','en_US',
-            'eo','es','et','eu','fa','fi','fr_FR','ga','gl','gl',
-            'he','hr','hu','hy','is','it','ku','lt','lv','nl',
-            'pl','pt_BR','pt_PT','ro','ru',
-            'sk','sl','sv','uk');
-    }
-
-    /**
-     * Set content and check spelling
-     *
-     * @see rcube_spellcheck_engine::check()
-     */
-    function check($text)
-    {
-        $this->content = $text;
-
-        // spell check uri is configured
-        $url = rcube::get_instance()->config->get('spellcheck_uri');
-
-        if ($url) {
-            $a_uri = parse_url($url);
-            $ssl   = ($a_uri['scheme'] == 'https' || $a_uri['scheme'] == 'ssl');
-            $port  = $a_uri['port'] ? $a_uri['port'] : ($ssl ? 443 : 80);
-            $host  = ($ssl ? 'ssl://' : '') . $a_uri['host'];
-            $path  = $a_uri['path'] . ($a_uri['query'] ? '?'.$a_uri['query'] : '') . $this->lang;
-        }
-        else {
-            $host = self::GOOGIE_HOST;
-            $port = self::GOOGIE_PORT;
-            $path = '/tbproxy/spell?lang=' . $this->lang;
-        }
-
-        $path .= sprintf('&key=%06d', $_SESSION['user_id']);
-
-        $gtext = '<?xml version="1.0" encoding="utf-8" ?>'
-            .'<spellrequest textalreadyclipped="0" ignoredups="0" ignoredigits="1" ignoreallcaps="1">'
-            .'<text>' . htmlspecialchars($text, ENT_QUOTES, RCUBE_CHARSET) . '</text>'
-            .'</spellrequest>';
-
-        $store = '';
-        if ($fp = fsockopen($host, $port, $errno, $errstr, 30)) {
-            $out = "POST $path HTTP/1.0\r\n";
-            $out .= "Host: " . str_replace('ssl://', '', $host) . "\r\n";
-            $out .= "User-Agent: Roundcube Webmail/" . RCMAIL_VERSION . " (Googiespell Wrapper)\r\n";
-            $out .= "Content-Length: " . strlen($gtext) . "\r\n";
-            $out .= "Content-Type: text/xml\r\n";
-            $out .= "Connection: Close\r\n\r\n";
-            $out .= $gtext;
-            fwrite($fp, $out);
-
-            while (!feof($fp))
-                $store .= fgets($fp, 128);
-            fclose($fp);
-        }
-
-        // parse HTTP response
-        if (preg_match('!^HTTP/1.\d (\d+)(.+)!', $store, $m)) {
-            $http_status = $m[1];
-            if ($http_status != '200') {
-                $this->error = 'HTTP ' . $m[1] . $m[2];
-                $this->error .= "\n" . $store;
-            }
-        }
-
-        if (!$store) {
-            $this->error = "Empty result from spelling engine";
-        }
-        else if (preg_match('/<spellresult error="([^"]+)"/', $store, $m) && $m[1]) {
-            $this->error = "Error code $m[1] returned";
-            $this->error .= preg_match('/<errortext>([^<]+)/', $store, $m) ? ": " . html_entity_decode($m[1]) : '';
-        }
-
-        preg_match_all('/<c o="([^"]*)" l="([^"]*)" s="([^"]*)">([^<]*)<\/c>/', $store, $matches, PREG_SET_ORDER);
-
-        // skip exceptions (if appropriate options are enabled)
-        foreach ($matches as $idx => $m) {
-            $word = mb_substr($text, $m[1], $m[2], RCUBE_CHARSET);
-            // skip  exceptions
-            if ($this->dictionary->is_exception($word)) {
-                unset($matches[$idx]);
-            }
-        }
-
-        $this->matches = $matches;
-        return $matches;
-    }
-
-    /**
-     * Returns suggestions for the specified word
-     *
-     * @see rcube_spellcheck_engine::get_words()
-     */
-    function get_suggestions($word)
-    {
-        $matches = $word ? $this->check($word) : $this->matches;
-
-        if ($matches[0][4]) {
-            $suggestions = explode("\t", $matches[0][4]);
-            if (sizeof($suggestions) > self::MAX_SUGGESTIONS) {
-                $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
-            }
-
-            return $suggestions;
-        }
-
-        return array();
-    }
-
-    /**
-     * Returns misspelled words
-     *
-     * @see rcube_spellcheck_engine::get_suggestions()
-     */
-    function get_words($text = null)
-    {
-        if ($text) {
-            $matches = $this->check($text);
-        }
-        else {
-            $matches = $this->matches;
-            $text    = $this->content;
-        }
-
-        $result = array();
-
-        foreach ($matches as $m) {
-            $result[] = mb_substr($text, $m[1], $m[2], RCUBE_CHARSET);
-        }
-
-        return $result;
-    }
-
-}
-
diff --git a/lib/ext/Roundcube/rcube_spellcheck_pspell.php b/lib/ext/Roundcube/rcube_spellcheck_pspell.php
deleted file mode 100644
index b12684e..0000000
--- a/lib/ext/Roundcube/rcube_spellcheck_pspell.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Spellchecking backend implementation to work with Pspell            |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Spellchecking backend implementation to work with Pspell
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_spellcheck_pspell extends rcube_spellcheck_engine
-{
-    private $plink;
-    private $matches = array();
-
-    /**
-     * Return a list of languages supported by this backend
-     *
-     * @see rcube_spellcheck_engine::languages()
-     */
-    function languages()
-    {
-        $defaults = array('en');
-        $langs = array();
-
-        // get aspell dictionaries
-        exec('aspell dump dicts', $dicts);
-        if (!empty($dicts)) {
-            $seen = array();
-            foreach ($dicts as $lang) {
-                $lang = preg_replace('/-.*$/', '', $lang);
-                $langc = strlen($lang) == 2 ? $lang.'_'.strtoupper($lang) : $lang;
-                if (!$seen[$langc]++)
-                    $langs[] = $lang;
-            }
-            $langs = array_unique($langs);
-        }
-        else {
-            $langs = $defaults;
-        }
-
-        return $langs;
-    }
-
-    /**
-     * Initializes PSpell dictionary
-     */
-    private function init()
-    {
-        if (!$this->plink) {
-            if (!extension_loaded('pspell')) {
-                $this->error = "Pspell extension not available";
-                return;
-            }
-
-            $this->plink = pspell_new($this->lang, null, null, RCUBE_CHARSET, PSPELL_FAST);
-        }
-
-        if (!$this->plink) {
-            $this->error = "Unable to load Pspell engine for selected language";
-        }
-    }
-
-    /**
-     * Set content and check spelling
-     *
-     * @see rcube_spellcheck_engine::check()
-     */
-    function check($text)
-    {
-        $this->init();
-
-        if (!$this->plink) {
-            return array();
-        }
-
-        // tokenize
-        $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
-
-        $diff       = 0;
-        $matches    = array();
-
-        foreach ($text as $w) {
-            $word = trim($w[0]);
-            $pos  = $w[1] - $diff;
-            $len  = mb_strlen($word);
-
-            // skip exceptions
-            if ($this->dictionary->is_exception($word)) {
-            }
-            else if (!pspell_check($this->plink, $word)) {
-                $suggestions = pspell_suggest($this->plink, $word);
-
-                if (sizeof($suggestions) > self::MAX_SUGGESTIONS) {
-                    $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
-                }
-
-                $matches[] = array($word, $pos, $len, null, $suggestions);
-            }
-
-            $diff += (strlen($word) - $len);
-        }
-
-        $this->matches = $matches;
-        return $matches;
-    }
-
-    /**
-     * Returns suggestions for the specified word
-     *
-     * @see rcube_spellcheck_engine::get_words()
-     */
-    function get_suggestions($word)
-    {
-        $this->init();
-
-        if (!$this->plink) {
-            return array();
-        }
-
-        $suggestions = pspell_suggest($this->plink, $word);
-
-        if (sizeof($suggestions) > self::MAX_SUGGESTIONS)
-            $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
-
-        return is_array($suggestions) ? $suggestions : array();
-    }
-
-    /**
-     * Returns misspelled words
-     *
-     * @see rcube_spellcheck_engine::get_suggestions()
-     */
-    function get_words($text = null)
-    {
-        $result = array();
-
-        if ($text) {
-            // init spellchecker
-            $this->init();
-
-            if (!$this->plink) {
-                return array();
-            }
-
-            // With PSpell we don't need to get suggestions to return misspelled words
-            $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
-
-            foreach ($text as $w) {
-                $word = trim($w[0]);
-
-                // skip exceptions
-                if ($this->dictionary->is_exception($word)) {
-                    continue;
-                }
-
-                if (!pspell_check($this->plink, $word)) {
-                    $result[] = $word;
-                }
-            }
-
-            return $result;
-        }
-
-        foreach ($this->matches as $m) {
-            $result[] = $m[0];
-        }
-
-        return $result;
-    }
-
-}
-
diff --git a/lib/ext/Roundcube/rcube_spellchecker.php b/lib/ext/Roundcube/rcube_spellchecker.php
deleted file mode 100644
index d087d25..0000000
--- a/lib/ext/Roundcube/rcube_spellchecker.php
+++ /dev/null
@@ -1,417 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011-2013, Kolab Systems AG                             |
- | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Spellchecking using different backends                              |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Helper class for spellchecking with Googielspell and PSpell support.
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_spellchecker
-{
-    private $matches = array();
-    private $engine;
-    private $backend;
-    private $lang;
-    private $rc;
-    private $error;
-    private $options = array();
-    private $dict;
-    private $have_dict;
-
-
-    /**
-     * Constructor
-     *
-     * @param string $lang Language code
-     */
-    function __construct($lang = 'en')
-    {
-        $this->rc     = rcube::get_instance();
-        $this->engine = $this->rc->config->get('spellcheck_engine', 'googie');
-        $this->lang   = $lang ? $lang : 'en';
-
-        $this->options = array(
-            'ignore_syms' => $this->rc->config->get('spellcheck_ignore_syms'),
-            'ignore_nums' => $this->rc->config->get('spellcheck_ignore_nums'),
-            'ignore_caps' => $this->rc->config->get('spellcheck_ignore_caps'),
-            'dictionary'  => $this->rc->config->get('spellcheck_dictionary'),
-        );
-
-        $cls = 'rcube_spellcheck_' . $this->engine;
-        if (class_exists($cls)) {
-            $this->backend = new $cls($this, $this->lang);
-            $this->backend->options = $this->options;
-        }
-        else {
-            $this->error = "Unknown spellcheck engine '$this->engine'";
-        }
-    }
-
-    /**
-     * Return a list of supported languages
-     */
-    function languages()
-    {
-        // trust configuration
-        $configured = $this->rc->config->get('spellcheck_languages');
-        if (!empty($configured) && is_array($configured) && !$configured[0]) {
-            return $configured;
-        }
-        else if (!empty($configured)) {
-            $langs = (array)$configured;
-        }
-        else if ($this->backend) {
-            $langs = $this->backend->languages();
-        }
-
-        // load index
-        @include(RCUBE_LOCALIZATION_DIR . 'index.inc');
-
-        // add correct labels
-        $languages = array();
-        foreach ($langs as $lang) {
-            $langc = strtolower(substr($lang, 0, 2));
-            $alias = $rcube_language_aliases[$langc];
-            if (!$alias) {
-                $alias = $langc.'_'.strtoupper($langc);
-            }
-            if ($rcube_languages[$lang]) {
-                $languages[$lang] = $rcube_languages[$lang];
-            }
-            else if ($rcube_languages[$alias]) {
-                $languages[$lang] = $rcube_languages[$alias];
-            }
-            else {
-                $languages[$lang] = ucfirst($lang);
-            }
-        }
-
-        asort($languages);
-
-        return $languages;
-    }
-
-    /**
-     * Set content and check spelling
-     *
-     * @param string $text    Text content for spellchecking
-     * @param bool   $is_html Enables HTML-to-Text conversion
-     *
-     * @return bool True when no mispelling found, otherwise false
-     */
-    function check($text, $is_html = false)
-    {
-        // convert to plain text
-        if ($is_html) {
-            $this->content = $this->html2text($text);
-        }
-        else {
-            $this->content = $text;
-        }
-
-        if ($this->backend) {
-            $this->matches = $this->backend->check($this->content);
-        }
-
-        return $this->found() == 0;
-    }
-
-
-    /**
-     * Number of mispellings found (after check)
-     *
-     * @return int Number of mispellings
-     */
-    function found()
-    {
-        return count($this->matches);
-    }
-
-
-    /**
-     * Returns suggestions for the specified word
-     *
-     * @param string $word The word
-     *
-     * @return array Suggestions list
-     */
-    function get_suggestions($word)
-    {
-        if ($this->backend) {
-            return $this->backend->get_suggestions($word);
-        }
-
-        return array();
-    }
-
-
-    /**
-     * Returns misspelled words
-     *
-     * @param string $text The content for spellchecking. If empty content
-     *                     used for check() method will be used.
-     *
-     * @return array List of misspelled words
-     */
-    function get_words($text = null, $is_html=false)
-    {
-        if ($is_html) {
-            $text = $this->html2text($text);
-        }
-
-        if ($this->backend) {
-            return $this->backend->get_words($text);
-        }
-
-        return array();
-    }
-
-
-    /**
-     * Returns checking result in XML (Googiespell) format
-     *
-     * @return string XML content
-     */
-    function get_xml()
-    {
-        // send output
-        $out = '<?xml version="1.0" encoding="'.RCUBE_CHARSET.'"?><spellresult charschecked="'.mb_strlen($this->content).'">';
-
-        foreach ((array)$this->matches as $item) {
-            $out .= '<c o="'.$item[1].'" l="'.$item[2].'">';
-            $out .= is_array($item[4]) ? implode("\t", $item[4]) : $item[4];
-            $out .= '</c>';
-        }
-
-        $out .= '</spellresult>';
-
-        return $out;
-    }
-
-
-    /**
-     * Returns checking result (misspelled words with suggestions)
-     *
-     * @return array Spellchecking result. An array indexed by word.
-     */
-    function get()
-    {
-        $result = array();
-
-        foreach ((array)$this->matches as $item) {
-            if ($this->engine == 'pspell') {
-                $word = $item[0];
-            }
-            else {
-                $word = mb_substr($this->content, $item[1], $item[2], RCUBE_CHARSET);
-            }
-            $result[$word] = is_array($item[4]) ? implode("\t", $item[4]) : $item[4];
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Returns error message
-     *
-     * @return string Error message
-     */
-    function error()
-    {
-        return $this->error ? $this->error : ($this->backend ? $this->backend->error() : false);
-    }
-
-
-    private function html2text($text)
-    {
-        $h2t = new rcube_html2text($text, false, true, 0);
-        return $h2t->get_text();
-    }
-
-
-    /**
-     * Check if the specified word is an exception accoring to 
-     * spellcheck options.
-     *
-     * @param string  $word  The word
-     *
-     * @return bool True if the word is an exception, False otherwise
-     */
-    public function is_exception($word)
-    {
-        // Contain only symbols (e.g. "+9,0", "2:2")
-        if (!$word || preg_match('/^[0-9@#$%^&_+~*=:;?!,.-]+$/', $word))
-            return true;
-
-        // Contain symbols (e.g. "g@@gle"), all symbols excluding separators
-        if (!empty($this->options['ignore_syms']) && preg_match('/[@#$%^&_+~*=-]/', $word))
-            return true;
-
-        // Contain numbers (e.g. "g00g13")
-        if (!empty($this->options['ignore_nums']) && preg_match('/[0-9]/', $word))
-            return true;
-
-        // Blocked caps (e.g. "GOOGLE")
-        if (!empty($this->options['ignore_caps']) && $word == mb_strtoupper($word))
-            return true;
-
-        // Use exceptions from dictionary
-        if (!empty($this->options['dictionary'])) {
-            $this->load_dict();
-
-            // @TODO: should dictionary be case-insensitive?
-            if (!empty($this->dict) && in_array($word, $this->dict))
-                return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Add a word to dictionary
-     *
-     * @param string  $word  The word to add
-     */
-    public function add_word($word)
-    {
-        $this->load_dict();
-
-        foreach (explode(' ', $word) as $word) {
-            // sanity check
-            if (strlen($word) < 512) {
-                $this->dict[] = $word;
-                $valid = true;
-            }
-        }
-
-        if ($valid) {
-            $this->dict = array_unique($this->dict);
-            $this->update_dict();
-        }
-    }
-
-
-    /**
-     * Remove a word from dictionary
-     *
-     * @param string  $word  The word to remove
-     */
-    public function remove_word($word)
-    {
-        $this->load_dict();
-
-        if (($key = array_search($word, $this->dict)) !== false) {
-            unset($this->dict[$key]);
-            $this->update_dict();
-        }
-    }
-
-
-    /**
-     * Update dictionary row in DB
-     */
-    private function update_dict()
-    {
-        if (strcasecmp($this->options['dictionary'], 'shared') != 0) {
-            $userid = $this->rc->get_user_id();
-        }
-
-        $plugin = $this->rc->plugins->exec_hook('spell_dictionary_save', array(
-            'userid' => $userid, 'language' => $this->lang, 'dictionary' => $this->dict));
-
-        if (!empty($plugin['abort'])) {
-            return;
-        }
-
-        if ($this->have_dict) {
-            if (!empty($this->dict)) {
-                $this->rc->db->query(
-                    "UPDATE ".$this->rc->db->table_name('dictionary')
-                    ." SET data = ?"
-                    ." WHERE user_id " . ($plugin['userid'] ? "= ".$this->rc->db->quote($plugin['userid']) : "IS NULL")
-                        ." AND " . $this->rc->db->quoteIdentifier('language') . " = ?",
-                    implode(' ', $plugin['dictionary']), $plugin['language']);
-            }
-            // don't store empty dict
-            else {
-                $this->rc->db->query(
-                    "DELETE FROM " . $this->rc->db->table_name('dictionary')
-                    ." WHERE user_id " . ($plugin['userid'] ? "= ".$this->rc->db->quote($plugin['userid']) : "IS NULL")
-                        ." AND " . $this->rc->db->quoteIdentifier('language') . " = ?",
-                    $plugin['language']);
-            }
-        }
-        else if (!empty($this->dict)) {
-            $this->rc->db->query(
-                "INSERT INTO " .$this->rc->db->table_name('dictionary')
-                ." (user_id, " . $this->rc->db->quoteIdentifier('language') . ", data) VALUES (?, ?, ?)",
-                $plugin['userid'], $plugin['language'], implode(' ', $plugin['dictionary']));
-        }
-    }
-
-
-    /**
-     * Get dictionary from DB
-     */
-    private function load_dict()
-    {
-        if (is_array($this->dict)) {
-            return $this->dict;
-        }
-
-        if (strcasecmp($this->options['dictionary'], 'shared') != 0) {
-            $userid = $this->rc->get_user_id();
-        }
-
-        $plugin = $this->rc->plugins->exec_hook('spell_dictionary_get', array(
-            'userid' => $userid, 'language' => $this->lang, 'dictionary' => array()));
-
-        if (empty($plugin['abort'])) {
-            $dict = array();
-            $sql_result = $this->rc->db->query(
-                "SELECT data FROM ".$this->rc->db->table_name('dictionary')
-                ." WHERE user_id ". ($plugin['userid'] ? "= ".$this->rc->db->quote($plugin['userid']) : "IS NULL")
-                    ." AND " . $this->rc->db->quoteIdentifier('language') . " = ?",
-                $plugin['language']);
-
-            if ($sql_arr = $this->rc->db->fetch_assoc($sql_result)) {
-                $this->have_dict = true;
-                if (!empty($sql_arr['data'])) {
-                    $dict = explode(' ', $sql_arr['data']);
-                }
-            }
-
-            $plugin['dictionary'] = array_merge((array)$plugin['dictionary'], $dict);
-        }
-
-        if (!empty($plugin['dictionary']) && is_array($plugin['dictionary'])) {
-            $this->dict = $plugin['dictionary'];
-        }
-        else {
-            $this->dict = array();
-        }
-
-        return $this->dict;
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_storage.php b/lib/ext/Roundcube/rcube_storage.php
deleted file mode 100644
index e697b2c..0000000
--- a/lib/ext/Roundcube/rcube_storage.php
+++ /dev/null
@@ -1,990 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2012, Kolab Systems AG                                  |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Mail Storage Engine                                                 |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Abstract class for accessing mail messages storage server
- *
- * @package    Framework
- * @subpackage Storage
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- */
-abstract class rcube_storage
-{
-    /**
-     * Instance of connection object e.g. rcube_imap_generic
-     *
-     * @var mixed
-     */
-    public $conn;
-
-    protected $folder = 'INBOX';
-    protected $default_charset = 'ISO-8859-1';
-    protected $default_folders = array('INBOX');
-    protected $search_set;
-    protected $options = array('auth_type' => 'check');
-    protected $page_size = 10;
-    protected $threading = false;
-
-    /**
-     * All (additional) headers used (in any way) by Roundcube
-     * Not listed here: DATE, FROM, TO, CC, REPLY-TO, SUBJECT, CONTENT-TYPE, LIST-POST
-     * (used for messages listing) are hardcoded in rcube_imap_generic::fetchHeaders()
-     *
-     * @var array
-     */
-    protected $all_headers = array(
-        'IN-REPLY-TO',
-        'BCC',
-        'SENDER',
-        'MESSAGE-ID',
-        'CONTENT-TRANSFER-ENCODING',
-        'REFERENCES',
-        'X-DRAFT-INFO',
-        'MAIL-FOLLOWUP-TO',
-        'MAIL-REPLY-TO',
-        'RETURN-PATH',
-    );
-
-    const UNKNOWN       = 0;
-    const NOPERM        = 1;
-    const READONLY      = 2;
-    const TRYCREATE     = 3;
-    const INUSE         = 4;
-    const OVERQUOTA     = 5;
-    const ALREADYEXISTS = 6;
-    const NONEXISTENT   = 7;
-    const CONTACTADMIN  = 8;
-
-
-    /**
-     * Connect to the server
-     *
-     * @param  string   $host    Host to connect
-     * @param  string   $user    Username for IMAP account
-     * @param  string   $pass    Password for IMAP account
-     * @param  integer  $port    Port to connect to
-     * @param  string   $use_ssl SSL schema (either ssl or tls) or null if plain connection
-     *
-     * @return boolean  TRUE on success, FALSE on failure
-     */
-    abstract function connect($host, $user, $pass, $port = 143, $use_ssl = null);
-
-
-    /**
-     * Close connection. Usually done on script shutdown
-     */
-    abstract function close();
-
-
-    /**
-     * Checks connection state.
-     *
-     * @return boolean  TRUE on success, FALSE on failure
-     */
-    abstract function is_connected();
-
-
-    /**
-     * Check connection state, connect if not connected.
-     *
-     * @return bool Connection state.
-     */
-    abstract function check_connection();
-
-
-    /**
-     * Returns code of last error
-     *
-     * @return int Error code
-     */
-    abstract function get_error_code();
-
-
-    /**
-     * Returns message of last error
-     *
-     * @return string Error message
-     */
-    abstract function get_error_str();
-
-
-    /**
-     * Returns code of last command response
-     *
-     * @return int Response code (class constant)
-     */
-    abstract function get_response_code();
-
-
-    /**
-     * Set connection and class options
-     *
-     * @param array $opt Options array
-     */
-    public function set_options($opt)
-    {
-        $this->options = array_merge($this->options, (array)$opt);
-    }
-
-
-    /**
-     * Activate/deactivate debug mode.
-     *
-     * @param boolean $dbg True if conversation with the server should be logged
-     */
-    abstract function set_debug($dbg = true);
-
-
-    /**
-     * Set default message charset.
-     *
-     * This will be used for message decoding if a charset specification is not available
-     *
-     * @param  string $cs Charset string
-     */
-    public function set_charset($cs)
-    {
-        $this->default_charset = $cs;
-    }
-
-
-    /**
-     * This list of folders will be listed above all other folders
-     *
-     * @param  array $arr Indexed list of folder names
-     */
-    public function set_default_folders($arr)
-    {
-        if (is_array($arr)) {
-            $this->default_folders = $arr;
-
-            // add inbox if not included
-            if (!in_array('INBOX', $this->default_folders)) {
-                array_unshift($this->default_folders, 'INBOX');
-            }
-        }
-    }
-
-
-    /**
-     * Set internal folder reference.
-     * All operations will be perfomed on this folder.
-     *
-     * @param  string $folder  Folder name
-     */
-    public function set_folder($folder)
-    {
-        if ($this->folder === $folder) {
-            return;
-        }
-
-        $this->folder = $folder;
-    }
-
-
-    /**
-     * Returns the currently used folder name
-     *
-     * @return string Name of the folder
-     */
-    public function get_folder()
-    {
-        return $this->folder;
-    }
-
-
-    /**
-     * Set internal list page number.
-     *
-     * @param int $page Page number to list
-     */
-    public function set_page($page)
-    {
-        $this->list_page = (int) $page;
-    }
-
-
-    /**
-     * Gets internal list page number.
-     *
-     * @return int Page number
-     */
-    public function get_page()
-    {
-        return $this->list_page;
-    }
-
-
-    /**
-     * Set internal page size
-     *
-     * @param int $size Number of messages to display on one page
-     */
-    public function set_pagesize($size)
-    {
-        $this->page_size = (int) $size;
-    }
-
-
-    /**
-     * Get internal page size
-     *
-     * @return int Number of messages to display on one page
-     */
-    public function get_pagesize()
-    {
-        return $this->page_size;
-    }
-
-
-    /**
-     * Save a search result for future message listing methods.
-     *
-     * @param  mixed  $set  Search set in driver specific format
-     */
-    abstract function set_search_set($set);
-
-
-    /**
-     * Return the saved search set.
-     *
-     * @return array Search set in driver specific format, NULL if search wasn't initialized
-     */
-    abstract function get_search_set();
-
-
-    /**
-     * Returns the storage server's (IMAP) capability
-     *
-     * @param   string  $cap Capability name
-     *
-     * @return  mixed   Capability value or TRUE if supported, FALSE if not
-     */
-    abstract function get_capability($cap);
-
-
-    /**
-     * Sets threading flag to the best supported THREAD algorithm.
-     * Enable/Disable threaded mode.
-     *
-     * @param  boolean  $enable TRUE to enable and FALSE
-     *
-     * @return mixed   Threading algorithm or False if THREAD is not supported
-     */
-    public function set_threading($enable = false)
-    {
-        $this->threading = false;
-
-        if ($enable && ($caps = $this->get_capability('THREAD'))) {
-            $methods = array('REFS', 'REFERENCES', 'ORDEREDSUBJECT');
-            $methods = array_intersect($methods, $caps);
-
-            $this->threading = array_shift($methods);
-        }
-
-        return $this->threading;
-    }
-
-
-    /**
-     * Get current threading flag.
-     *
-     * @return mixed  Threading algorithm or False if THREAD is not supported or disabled
-     */
-    public function get_threading()
-    {
-        return $this->threading;
-    }
-
-
-    /**
-     * Checks the PERMANENTFLAGS capability of the current folder
-     * and returns true if the given flag is supported by the server.
-     *
-     * @param   string  $flag Permanentflag name
-     *
-     * @return  boolean True if this flag is supported
-     */
-    abstract function check_permflag($flag);
-
-
-    /**
-     * Returns the delimiter that is used by the server
-     * for folder hierarchy separation.
-     *
-     * @return  string  Delimiter string
-     */
-    abstract function get_hierarchy_delimiter();
-
-
-    /**
-     * Get namespace
-     *
-     * @param string $name Namespace array index: personal, other, shared, prefix
-     *
-     * @return  array  Namespace data
-     */
-    abstract function get_namespace($name = null);
-
-
-    /**
-     * Get messages count for a specific folder.
-     *
-     * @param  string  $folder  Folder name
-     * @param  string  $mode    Mode for count [ALL|THREADS|UNSEEN|RECENT|EXISTS]
-     * @param  boolean $force   Force reading from server and update cache
-     * @param  boolean $status  Enables storing folder status info (max UID/count),
-     *                          required for folder_status()
-     *
-     * @return int     Number of messages
-     */
-    abstract function count($folder = null, $mode = 'ALL', $force = false, $status = true);
-
-
-    /**
-     * Public method for listing headers.
-     *
-     * @param   string   $folder     Folder name
-     * @param   int      $page       Current page to list
-     * @param   string   $sort_field Header field to sort by
-     * @param   string   $sort_order Sort order [ASC|DESC]
-     * @param   int      $slice      Number of slice items to extract from result array
-     *
-     * @return  array    Indexed array with message header objects
-     */
-    abstract function list_messages($folder = null, $page = null, $sort_field = null, $sort_order = null, $slice = 0);
-
-
-    /**
-     * Return sorted list of message UIDs
-     *
-     * @param string $folder     Folder to get index from
-     * @param string $sort_field Sort column
-     * @param string $sort_order Sort order [ASC, DESC]
-     *
-     * @return rcube_result_index|rcube_result_thread List of messages (UIDs)
-     */
-    abstract function index($folder = null, $sort_field = null, $sort_order = null);
-
-
-    /**
-     * Invoke search request to the server.
-     *
-     * @param  string  $folder     Folder name to search in
-     * @param  string  $str        Search criteria
-     * @param  string  $charset    Search charset
-     * @param  string  $sort_field Header field to sort by
-     *
-     * @todo: Search criteria should be provided in non-IMAP format, eg. array
-     */
-    abstract function search($folder = null, $str = 'ALL', $charset = null, $sort_field = null);
-
-
-    /**
-     * Direct (real and simple) search request (without result sorting and caching).
-     *
-     * @param  string  $folder  Folder name to search in
-     * @param  string  $str     Search string
-     *
-     * @return rcube_result_index  Search result (UIDs)
-     */
-    abstract function search_once($folder = null, $str = 'ALL');
-
-
-    /**
-     * Refresh saved search set
-     *
-     * @return array Current search set
-     */
-    abstract function refresh_search();
-
-
-    /* --------------------------------
-     *        messages management
-     * --------------------------------*/
-
-    /**
-     * Fetch message headers and body structure from the server and build
-     * an object structure similar to the one generated by PEAR::Mail_mimeDecode
-     *
-     * @param int     $uid     Message UID to fetch
-     * @param string  $folder  Folder to read from
-     *
-     * @return object rcube_message_header Message data
-     */
-    abstract function get_message($uid, $folder = null);
-
-
-    /**
-     * Return message headers object of a specific message
-     *
-     * @param int     $id       Message sequence ID or UID
-     * @param string  $folder   Folder to read from
-     * @param bool    $force    True to skip cache
-     *
-     * @return rcube_message_header Message headers
-     */
-    abstract function get_message_headers($uid, $folder = null, $force = false);
-
-
-    /**
-     * Fetch message body of a specific message from the server
-     *
-     * @param  int                $uid    Message UID
-     * @param  string             $part   Part number
-     * @param  rcube_message_part $o_part Part object created by get_structure()
-     * @param  mixed              $print  True to print part, ressource to write part contents in
-     * @param  resource           $fp     File pointer to save the message part
-     * @param  boolean            $skip_charset_conv Disables charset conversion
-     *
-     * @return string Message/part body if not printed
-     */
-    abstract function get_message_part($uid, $part = 1, $o_part = null, $print = null, $fp = null, $skip_charset_conv = false);
-
-
-    /**
-     * Fetch message body of a specific message from the server
-     *
-     * @param  int    $uid  Message UID
-     *
-     * @return string $part Message/part body
-     * @see    rcube_imap::get_message_part()
-     */
-    public function get_body($uid, $part = 1)
-    {
-        $headers = $this->get_message_headers($uid);
-        return rcube_charset::convert($this->get_message_part($uid, $part, null),
-            $headers->charset ? $headers->charset : $this->default_charset);
-    }
-
-
-    /**
-     * Returns the whole message source as string (or saves to a file)
-     *
-     * @param int      $uid Message UID
-     * @param resource $fp  File pointer to save the message
-     *
-     * @return string Message source string
-     */
-    abstract function get_raw_body($uid, $fp = null);
-
-
-    /**
-     * Returns the message headers as string
-     *
-     * @param int $uid  Message UID
-     *
-     * @return string Message headers string
-     */
-    abstract function get_raw_headers($uid);
-
-
-    /**
-     * Sends the whole message source to stdout
-     *
-     * @param int  $uid       Message UID
-     * @param bool $formatted Enables line-ending formatting
-     */
-    abstract function print_raw_body($uid, $formatted = true);
-
-
-    /**
-     * Set message flag to one or several messages
-     *
-     * @param mixed   $uids       Message UIDs as array or comma-separated string, or '*'
-     * @param string  $flag       Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
-     * @param string  $folder     Folder name
-     * @param boolean $skip_cache True to skip message cache clean up
-     *
-     * @return bool  Operation status
-     */
-    abstract function set_flag($uids, $flag, $folder = null, $skip_cache = false);
-
-
-    /**
-     * Remove message flag for one or several messages
-     *
-     * @param mixed  $uids    Message UIDs as array or comma-separated string, or '*'
-     * @param string $flag    Flag to unset: SEEN, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
-     * @param string $folder  Folder name
-     *
-     * @return bool   Operation status
-     * @see set_flag
-     */
-    public function unset_flag($uids, $flag, $folder = null)
-    {
-        return $this->set_flag($uids, 'UN'.$flag, $folder);
-    }
-
-
-    /**
-     * Append a mail message (source) to a specific folder.
-     *
-     * @param string       $folder  Target folder
-     * @param string|array $message The message source string or filename
-     *                              or array (of strings and file pointers)
-     * @param string       $headers Headers string if $message contains only the body
-     * @param boolean      $is_file True if $message is a filename
-     * @param array        $flags   Message flags
-     * @param mixed        $date    Message internal date
-     *
-     * @return int|bool Appended message UID or True on success, False on error
-     */
-    abstract function save_message($folder, &$message, $headers = '', $is_file = false, $flags = array(), $date = null);
-
-
-    /**
-     * Move message(s) from one folder to another.
-     *
-     * @param mixed  $uids  Message UIDs as array or comma-separated string, or '*'
-     * @param string $to    Target folder
-     * @param string $from  Source folder
-     *
-     * @return boolean True on success, False on error
-     */
-    abstract function move_message($uids, $to, $from = null);
-
-
-    /**
-     * Copy message(s) from one mailbox to another.
-     *
-     * @param mixed  $uids  Message UIDs as array or comma-separated string, or '*'
-     * @param string $to    Target folder
-     * @param string $from  Source folder
-     *
-     * @return boolean True on success, False on error
-     */
-    abstract function copy_message($uids, $to, $from = null);
-
-
-    /**
-     * Mark message(s) as deleted and expunge.
-     *
-     * @param mixed  $uids    Message UIDs as array or comma-separated string, or '*'
-     * @param string $folder  Source folder
-     *
-     * @return boolean True on success, False on error
-     */
-    abstract function delete_message($uids, $folder = null);
-
-
-    /**
-     * Expunge message(s) and clear the cache.
-     *
-     * @param mixed   $uids        Message UIDs as array or comma-separated string, or '*'
-     * @param string  $folder      Folder name
-     * @param boolean $clear_cache False if cache should not be cleared
-     *
-     * @return boolean True on success, False on error
-     */
-    abstract function expunge_message($uids, $folder = null, $clear_cache = true);
-
-
-    /**
-     * Parse message UIDs input
-     *
-     * @param mixed  $uids  UIDs array or comma-separated list or '*' or '1:*'
-     *
-     * @return array Two elements array with UIDs converted to list and ALL flag
-     */
-    protected function parse_uids($uids)
-    {
-        if ($uids === '*' || $uids === '1:*') {
-            if (empty($this->search_set)) {
-                $uids = '1:*';
-                $all = true;
-            }
-            // get UIDs from current search set
-            else {
-                $uids = join(',', $this->search_set->get());
-            }
-        }
-        else {
-            if (is_array($uids)) {
-                $uids = join(',', $uids);
-            }
-
-            if (preg_match('/[^0-9,]/', $uids)) {
-                $uids = '';
-            }
-        }
-
-        return array($uids, (bool) $all);
-    }
-
-
-    /* --------------------------------
-     *        folder managment
-     * --------------------------------*/
-
-    /**
-     * Get a list of subscribed folders.
-     *
-     * @param   string  $root      Optional root folder
-     * @param   string  $name      Optional name pattern
-     * @param   string  $filter    Optional filter
-     * @param   string  $rights    Optional ACL requirements
-     * @param   bool    $skip_sort Enable to return unsorted list (for better performance)
-     *
-     * @return  array   List of folders
-     */
-    abstract function list_folders_subscribed($root = '', $name = '*', $filter = null, $rights = null, $skip_sort = false);
-
-
-    /**
-     * Get a list of all folders available on the server.
-     *
-     * @param string  $root      IMAP root dir
-     * @param string  $name      Optional name pattern
-     * @param mixed   $filter    Optional filter
-     * @param string  $rights    Optional ACL requirements
-     * @param bool    $skip_sort Enable to return unsorted list (for better performance)
-     *
-     * @return array Indexed array with folder names
-     */
-    abstract function list_folders($root = '', $name = '*', $filter = null, $rights = null, $skip_sort = false);
-
-
-    /**
-     * Subscribe to a specific folder(s)
-     *
-     * @param array $folders Folder name(s)
-     *
-     * @return boolean True on success
-     */
-    abstract function subscribe($folders);
-
-
-    /**
-     * Unsubscribe folder(s)
-     *
-     * @param array $folders Folder name(s)
-     *
-     * @return boolean True on success
-     */
-    abstract function unsubscribe($folders);
-
-
-    /**
-     * Create a new folder on the server.
-     *
-     * @param string  $folder    New folder name
-     * @param boolean $subscribe True if the newvfolder should be subscribed
-     *
-     * @return boolean True on success, False on error
-     */
-    abstract function create_folder($folder, $subscribe = false);
-
-
-    /**
-     * Set a new name to an existing folder
-     *
-     * @param string $folder   Folder to rename
-     * @param string $new_name New folder name
-     *
-     * @return boolean True on success, False on error
-     */
-    abstract function rename_folder($folder, $new_name);
-
-
-    /**
-     * Remove a folder from the server.
-     *
-     * @param string $folder Folder name
-     *
-     * @return boolean True on success, False on error
-     */
-    abstract function delete_folder($folder);
-
-
-    /**
-     * Send expunge command and clear the cache.
-     *
-     * @param string  $folder      Folder name
-     * @param boolean $clear_cache False if cache should not be cleared
-     *
-     * @return boolean True on success, False on error
-     */
-    public function expunge_folder($folder = null, $clear_cache = true)
-    {
-        return $this->expunge_message('*', $folder, $clear_cache);
-    }
-
-
-    /**
-     * Remove all messages in a folder..
-     *
-     * @param string  $folder  Folder name
-     *
-     * @return boolean True on success, False on error
-     */
-    public function clear_folder($folder = null)
-    {
-        return $this->delete_message('*', $folder);
-    }
-
-
-    /**
-     * Checks if folder exists and is subscribed
-     *
-     * @param string   $folder       Folder name
-     * @param boolean  $subscription Enable subscription checking
-     *
-     * @return boolean True if folder exists, False otherwise
-     */
-    abstract function folder_exists($folder, $subscription = false);
-
-
-    /**
-     * Get folder size (size of all messages in a folder)
-     *
-     * @param string $folder Folder name
-     *
-     * @return int Folder size in bytes, False on error
-     */
-    abstract function folder_size($folder);
-
-
-    /**
-     * Returns the namespace where the folder is in
-     *
-     * @param string $folder Folder name
-     *
-     * @return string One of 'personal', 'other' or 'shared'
-     */
-    abstract function folder_namespace($folder);
-
-
-    /**
-     * Gets folder attributes (from LIST response, e.g. \Noselect, \Noinferiors).
-     *
-     * @param string $folder  Folder name
-     * @param bool   $force   Set to True if attributes should be refreshed
-     *
-     * @return array Options list
-     */
-    abstract function folder_attributes($folder, $force = false);
-
-
-    /**
-     * Gets connection (and current folder) data: UIDVALIDITY, EXISTS, RECENT,
-     * PERMANENTFLAGS, UIDNEXT, UNSEEN
-     *
-     * @param string $folder Folder name
-     *
-     * @return array Data
-     */
-    abstract function folder_data($folder);
-
-
-    /**
-     * Returns extended information about the folder.
-     *
-     * @param string $folder Folder name
-     *
-     * @return array Data
-     */
-    abstract function folder_info($folder);
-
-
-    /**
-     * Returns current status of a folder (compared to the last time use)
-     *
-     * @param string $folder Folder name
-     * @param array  $diff   Difference data
-     *
-     * @return int Folder status
-     */
-    abstract function folder_status($folder = null, &$diff = array());
-
-
-    /**
-     * Synchronizes messages cache.
-     *
-     * @param string $folder Folder name
-     */
-    abstract function folder_sync($folder);
-
-
-    /**
-     * Modify folder name according to namespace.
-     * For output it removes prefix of the personal namespace if it's possible.
-     * For input it adds the prefix. Use it before creating a folder in root
-     * of the folders tree.
-     *
-     * @param string $folder  Folder name
-     * @param string $mode    Mode name (out/in)
-     *
-     * @return string Folder name
-     */
-    abstract function mod_folder($folder, $mode = 'out');
-
-
-    /**
-     * Create all folders specified as default
-     */
-    public function create_default_folders()
-    {
-        // create default folders if they do not exist
-        foreach ($this->default_folders as $folder) {
-            if (!$this->folder_exists($folder)) {
-                $this->create_folder($folder, true);
-            }
-            else if (!$this->folder_exists($folder, true)) {
-                $this->subscribe($folder);
-            }
-        }
-    }
-
-
-    /**
-     * Get mailbox quota information.
-     *
-     * @return mixed Quota info or False if not supported
-     */
-    abstract function get_quota();
-
-
-    /* -----------------------------------------
-     *   ACL and METADATA methods
-     * ----------------------------------------*/
-
-    /**
-     * Changes the ACL on the specified folder (SETACL)
-     *
-     * @param string $folder  Folder name
-     * @param string $user    User name
-     * @param string $acl     ACL string
-     *
-     * @return boolean True on success, False on failure
-     */
-    abstract function set_acl($folder, $user, $acl);
-
-
-    /**
-     * Removes any <identifier,rights> pair for the
-     * specified user from the ACL for the specified
-     * folder (DELETEACL).
-     *
-     * @param string $folder  Folder name
-     * @param string $user    User name
-     *
-     * @return boolean True on success, False on failure
-     */
-    abstract function delete_acl($folder, $user);
-
-
-    /**
-     * Returns the access control list for a folder (GETACL).
-     *
-     * @param string $folder Folder name
-     *
-     * @return array User-rights array on success, NULL on error
-     */
-    abstract function get_acl($folder);
-
-
-    /**
-     * Returns information about what rights can be granted to the
-     * user (identifier) in the ACL for the folder (LISTRIGHTS).
-     *
-     * @param string $folder  Folder name
-     * @param string $user    User name
-     *
-     * @return array List of user rights
-     */
-    abstract function list_rights($folder, $user);
-
-
-    /**
-     * Returns the set of rights that the current user has to a folder (MYRIGHTS).
-     *
-     * @param string $folder Folder name
-     *
-     * @return array MYRIGHTS response on success, NULL on error
-     */
-    abstract function my_rights($folder);
-
-
-    /**
-     * Sets metadata/annotations (SETMETADATA/SETANNOTATION)
-     *
-     * @param string $folder  Folder name (empty for server metadata)
-     * @param array  $entries Entry-value array (use NULL value as NIL)
-     *
-     * @return boolean True on success, False on failure
-     */
-    abstract function set_metadata($folder, $entries);
-
-
-    /**
-     * Unsets metadata/annotations (SETMETADATA/SETANNOTATION)
-     *
-     * @param string $folder  Folder name (empty for server metadata)
-     * @param array  $entries Entry names array
-     *
-     * @return boolean True on success, False on failure
-     */
-    abstract function delete_metadata($folder, $entries);
-
-
-    /**
-     * Returns folder metadata/annotations (GETMETADATA/GETANNOTATION).
-     *
-     * @param string $folder   Folder name (empty for server metadata)
-     * @param array  $entries  Entries
-     * @param array  $options  Command options (with MAXSIZE and DEPTH keys)
-     *
-     * @return array Metadata entry-value hash array on success, NULL on error
-     */
-    abstract function get_metadata($folder, $entries, $options = array());
-
-
-    /* -----------------------------------------
-     *   Cache related functions
-     * ----------------------------------------*/
-
-    /**
-     * Clears the cache.
-     *
-     * @param string  $key         Cache key name or pattern
-     * @param boolean $prefix_mode Enable it to clear all keys starting
-     *                             with prefix specified in $key
-     */
-    abstract function clear_cache($key = null, $prefix_mode = false);
-
-
-    /**
-     * Returns cached value
-     *
-     * @param string $key Cache key
-     *
-     * @return mixed Cached value
-     */
-    abstract function get_cache($key);
-
-
-    /**
-     * Delete outdated cache entries
-     */
-    abstract function cache_gc();
-
-}  // end class rcube_storage
diff --git a/lib/ext/Roundcube/rcube_string_replacer.php b/lib/ext/Roundcube/rcube_string_replacer.php
deleted file mode 100644
index 77b91d1..0000000
--- a/lib/ext/Roundcube/rcube_string_replacer.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2009-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Handle string replacements based on preg_replace_callback           |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Helper class for string replacements based on preg_replace_callback
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_string_replacer
-{
-    public static $pattern = '/##str_replacement_(\d+)##/';
-    public $mailto_pattern;
-    public $link_pattern;
-    public $linkref_index;
-    public $linkref_pattern;
-
-    private $values = array();
-    private $options = array();
-    private $linkrefs = array();
-    private $urls = array();
-
-
-    function __construct($options = array())
-    {
-        // Simplified domain expression for UTF8 characters handling
-        // Support unicode/punycode in top-level domain part
-        $utf_domain = '[^?&@"\'\\/()<>\s\r\t\n]+\\.?([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-zA-Z0-9]{2,})';
-        $url1       = '.:;,';
-        $url2       = 'a-zA-Z0-9%=#$@+?|!&\\/_~\\[\\]\\(\\){}\*-';
-
-        $this->link_pattern = "/([\w]+:\/\/|\W[Ww][Ww][Ww]\.|^[Ww][Ww][Ww]\.)($utf_domain([$url1]*[$url2]+)*)/";
-        $this->mailto_pattern = "/("
-            ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*"  // local-part
-            ."@$utf_domain"                                                 // domain-part
-            ."(\?[$url1$url2]+)?"                                           // e.g. ?subject=test...
-            .")/";
-        $this->linkref_index = '/\[([^\]#]+)\](:?\s*##str_replacement_(\d+)##)/';
-        $this->linkref_pattern = '/\[([^\]#]+)\]/';
-
-        $this->options = $options;
-    }
-
-    /**
-     * Add a string to the internal list
-     *
-     * @param string String value 
-     * @return int Index of value for retrieval
-     */
-    public function add($str)
-    {
-        $i = count($this->values);
-        $this->values[$i] = $str;
-        return $i;
-    }
-
-    /**
-     * Build replacement string
-     */
-    public function get_replacement($i)
-    {
-        return '##str_replacement_' . $i . '##';
-    }
-
-    /**
-     * Callback function used to build HTML links around URL strings
-     *
-     * @param array Matches result from preg_replace_callback
-     * @return int Index of saved string value
-     */
-    public function link_callback($matches)
-    {
-        $i = -1;
-        $scheme = strtolower($matches[1]);
-
-        if (preg_match('!^(http|ftp|file)s?://!i', $scheme)) {
-            $url = $matches[1] . $matches[2];
-        }
-        else if (preg_match('/^(\W*)(www\.)$/i', $matches[1], $m)) {
-            $url        = $m[2] . $matches[2];
-            $url_prefix = 'http://';
-            $prefix     = $m[1];
-        }
-
-        if ($url) {
-            $suffix = $this->parse_url_brackets($url);
-            $attrib = (array)$this->options['link_attribs'];
-            $attrib['href'] = $url_prefix . $url;
-
-            $i = $this->add(html::a($attrib, rcube::Q($url)) . $suffix);
-            $this->urls[$i] = $attrib['href'];
-        }
-
-        // Return valid link for recognized schemes, otherwise
-        // return the unmodified string for unrecognized schemes.
-        return $i >= 0 ? $prefix . $this->get_replacement($i) : $matches[0];
-    }
-
-    /**
-     * Callback to add an entry to the link index
-     */
-    public function linkref_addindex($matches)
-    {
-        $key = $matches[1];
-        $this->linkrefs[$key] = $this->urls[$matches[3]];
-
-        return $this->get_replacement($this->add('['.$key.']')) . $matches[2];
-    }
-
-    /**
-     * Callback to replace link references with real links
-     */
-    public function linkref_callback($matches)
-    {
-        $i = 0;
-        if ($url = $this->linkrefs[$matches[1]]) {
-            $attrib = (array)$this->options['link_attribs'];
-            $attrib['href'] = $url;
-            $i = $this->add(html::a($attrib, rcube::Q($matches[1])));
-        }
-
-        return $i > 0 ? '['.$this->get_replacement($i).']' : $matches[0];
-    }
-
-    /**
-     * Callback function used to build mailto: links around e-mail strings
-     *
-     * @param array Matches result from preg_replace_callback
-     * @return int Index of saved string value
-     */
-    public function mailto_callback($matches)
-    {
-        $href   = $matches[1];
-        $suffix = $this->parse_url_brackets($href);
-        $i = $this->add(html::a('mailto:' . $href, rcube::Q($href)) . $suffix);
-
-        return $i >= 0 ? $this->get_replacement($i) : '';
-    }
-
-    /**
-     * Look up the index from the preg_replace matches array
-     * and return the substitution value.
-     *
-     * @param array Matches result from preg_replace_callback
-     * @return string Value at index $matches[1]
-     */
-    public function replace_callback($matches)
-    {
-        return $this->values[$matches[1]];
-    }
-
-    /**
-     * Replace all defined (link|mailto) patterns with replacement string
-     *
-     * @param string $str Text
-     *
-     * @return string Text
-     */
-    public function replace($str)
-    {
-        // search for patterns like links and e-mail addresses
-        $str = preg_replace_callback($this->link_pattern, array($this, 'link_callback'), $str);
-        $str = preg_replace_callback($this->mailto_pattern, array($this, 'mailto_callback'), $str);
-        // resolve link references
-        $str = preg_replace_callback($this->linkref_index, array($this, 'linkref_addindex'), $str);
-        $str = preg_replace_callback($this->linkref_pattern, array($this, 'linkref_callback'), $str);
-
-        return $str;
-    }
-
-    /**
-     * Replace substituted strings with original values
-     */
-    public function resolve($str)
-    {
-        return preg_replace_callback(self::$pattern, array($this, 'replace_callback'), $str);
-    }
-
-    /**
-     * Fixes bracket characters in URL handling
-     */
-    public static function parse_url_brackets(&$url)
-    {
-        // #1487672: special handling of square brackets,
-        // URL regexp allows [] characters in URL, for example:
-        // "http://example.com/?a[b]=c". However we need to handle
-        // properly situation when a bracket is placed at the end
-        // of the link e.g. "[http://example.com]"
-        // Yes, this is not perfect handles correctly only paired characters
-        // but it should work for common cases
-
-        if (preg_match('/(\\[|\\])/', $url)) {
-            $in = false;
-            for ($i=0, $len=strlen($url); $i<$len; $i++) {
-                if ($url[$i] == '[') {
-                    if ($in)
-                        break;
-                    $in = true;
-                }
-                else if ($url[$i] == ']') {
-                    if (!$in)
-                        break;
-                    $in = false;
-                }
-            }
-
-            if ($i < $len) {
-                $suffix = substr($url, $i);
-                $url    = substr($url, 0, $i);
-            }
-        }
-
-        // Do the same for parentheses
-        if (preg_match('/(\\(|\\))/', $url)) {
-            $in = false;
-            for ($i=0, $len=strlen($url); $i<$len; $i++) {
-                if ($url[$i] == '(') {
-                    if ($in)
-                        break;
-                    $in = true;
-                }
-                else if ($url[$i] == ')') {
-                    if (!$in)
-                        break;
-                    $in = false;
-                }
-            }
-
-            if ($i < $len) {
-                $suffix = substr($url, $i);
-                $url    = substr($url, 0, $i);
-            }
-        }
-
-        return $suffix;
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_user.php b/lib/ext/Roundcube/rcube_user.php
deleted file mode 100644
index 57f6336..0000000
--- a/lib/ext/Roundcube/rcube_user.php
+++ /dev/null
@@ -1,742 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   This class represents a system user linked and provides access      |
- |   to the related database records.                                    |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Class representing a system user
- *
- * @package    Framework
- * @subpackage Core
- */
-class rcube_user
-{
-    public $ID;
-    public $data;
-    public $language;
-
-    /**
-     * Holds database connection.
-     *
-     * @var rcube_db
-     */
-    private $db;
-
-    /**
-     * Framework object.
-     *
-     * @var rcube
-     */
-    private $rc;
-
-    /**
-     * Internal identities cache
-     *
-     * @var array
-     */
-    private $identities = array();
-
-    const SEARCH_ADDRESSBOOK = 1;
-    const SEARCH_MAIL = 2;
-
-    /**
-     * Object constructor
-     *
-     * @param int   $id      User id
-     * @param array $sql_arr SQL result set
-     */
-    function __construct($id = null, $sql_arr = null)
-    {
-        $this->rc = rcube::get_instance();
-        $this->db = $this->rc->get_dbh();
-
-        if ($id && !$sql_arr) {
-            $sql_result = $this->db->query(
-                "SELECT * FROM ".$this->db->table_name('users')." WHERE user_id = ?", $id);
-            $sql_arr = $this->db->fetch_assoc($sql_result);
-        }
-
-        if (!empty($sql_arr)) {
-            $this->ID       = $sql_arr['user_id'];
-            $this->data     = $sql_arr;
-            $this->language = $sql_arr['language'];
-        }
-    }
-
-
-    /**
-     * Build a user name string (as e-mail address)
-     *
-     * @param  string $part Username part (empty or 'local' or 'domain', 'mail')
-     * @return string Full user name or its part
-     */
-    function get_username($part = null)
-    {
-        if ($this->data['username']) {
-            // return real name
-            if (!$part) {
-                return $this->data['username'];
-            }
-
-            list($local, $domain) = explode('@', $this->data['username']);
-
-            // at least we should always have the local part
-            if ($part == 'local') {
-                return $local;
-            }
-            // if no domain was provided...
-            if (empty($domain)) {
-                $domain = $this->rc->config->mail_domain($this->data['mail_host']);
-            }
-
-            if ($part == 'domain') {
-                return $domain;
-            }
-
-            if (!empty($domain))
-                return $local . '@' . $domain;
-            else
-                return $local;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Get the preferences saved for this user
-     *
-     * @return array Hash array with prefs
-     */
-    function get_prefs()
-    {
-        if (!empty($this->language))
-            $prefs = array('language' => $this->language);
-
-        if ($this->ID) {
-            // Preferences from session (write-master is unavailable)
-            if (!empty($_SESSION['preferences'])) {
-                // Check last write attempt time, try to write again (every 5 minutes)
-                if ($_SESSION['preferences_time'] < time() - 5 * 60) {
-                    $saved_prefs = unserialize($_SESSION['preferences']);
-                    $this->rc->session->remove('preferences');
-                    $this->rc->session->remove('preferences_time');
-                    $this->save_prefs($saved_prefs);
-                }
-                else {
-                    $this->data['preferences'] = $_SESSION['preferences'];
-                }
-            }
-
-            if ($this->data['preferences']) {
-                $prefs += (array)unserialize($this->data['preferences']);
-            }
-        }
-
-        return $prefs;
-    }
-
-
-    /**
-     * Write the given user prefs to the user's record
-     *
-     * @param array $a_user_prefs User prefs to save
-     * @return boolean True on success, False on failure
-     */
-    function save_prefs($a_user_prefs)
-    {
-        if (!$this->ID)
-            return false;
-
-        $plugin = $this->rc->plugins->exec_hook('preferences_update', array(
-            'userid' => $this->ID, 'prefs' => $a_user_prefs, 'old' => (array)$this->get_prefs()));
-
-        if (!empty($plugin['abort'])) {
-            return;
-        }
-
-        $a_user_prefs = $plugin['prefs'];
-        $old_prefs    = $plugin['old'];
-        $config       = $this->rc->config;
-
-        // merge (partial) prefs array with existing settings
-        $save_prefs = $a_user_prefs + $old_prefs;
-        unset($save_prefs['language']);
-
-        // don't save prefs with default values if they haven't been changed yet
-        foreach ($a_user_prefs as $key => $value) {
-            if ($value === null || (!isset($old_prefs[$key]) && ($value == $config->get($key))))
-                unset($save_prefs[$key]);
-        }
-
-        $save_prefs = serialize($save_prefs);
-
-        $this->db->query(
-            "UPDATE ".$this->db->table_name('users').
-            " SET preferences = ?".
-                ", language = ?".
-            " WHERE user_id = ?",
-            $save_prefs,
-            $_SESSION['language'],
-            $this->ID);
-
-        $this->language = $_SESSION['language'];
-
-        // Update success
-        if ($this->db->affected_rows() !== false) {
-            $config->set_user_prefs($a_user_prefs);
-            $this->data['preferences'] = $save_prefs;
-
-            if (isset($_SESSION['preferences'])) {
-                $this->rc->session->remove('preferences');
-                $this->rc->session->remove('preferences_time');
-            }
-            return true;
-        }
-        // Update error, but we are using replication (we have read-only DB connection)
-        // and we are storing session not in the SQL database
-        // we can store preferences in session and try to write later (see get_prefs())
-        else if ($this->db->is_replicated() && $config->get('session_storage', 'db') != 'db') {
-            $_SESSION['preferences'] = $save_prefs;
-            $_SESSION['preferences_time'] = time();
-            $config->set_user_prefs($a_user_prefs);
-            $this->data['preferences'] = $save_prefs;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Get default identity of this user
-     *
-     * @param  int   $id Identity ID. If empty, the default identity is returned
-     * @return array Hash array with all cols of the identity record
-     */
-    function get_identity($id = null)
-    {
-        $id = (int)$id;
-        // cache identities for better performance
-        if (!array_key_exists($id, $this->identities)) {
-            $result = $this->list_identities($id ? 'AND identity_id = ' . $id : '');
-            $this->identities[$id] = $result[0];
-        }
-
-        return $this->identities[$id];
-    }
-
-
-    /**
-     * Return a list of all identities linked with this user
-     *
-     * @param string $sql_add   Optional WHERE clauses
-     * @param bool   $formatted Format identity email and name
-     *
-     * @return array List of identities
-     */
-    function list_identities($sql_add = '', $formatted = false)
-    {
-        $result = array();
-
-        $sql_result = $this->db->query(
-            "SELECT * FROM ".$this->db->table_name('identities').
-            " WHERE del <> 1 AND user_id = ?".
-            ($sql_add ? " ".$sql_add : "").
-            " ORDER BY ".$this->db->quoteIdentifier('standard')." DESC, name ASC, identity_id ASC",
-            $this->ID);
-
-        while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-            if ($formatted) {
-                $ascii_email = format_email($sql_arr['email']);
-                $utf8_email  = format_email(rcube_utils::idn_to_utf8($ascii_email));
-
-                $sql_arr['email_ascii'] = $ascii_email;
-                $sql_arr['email']       = $utf8_email;
-                $sql_arr['ident']       = format_email_recipient($ascii_email, $sql_arr['name']);
-            }
-
-            $result[] = $sql_arr;
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Update a specific identity record
-     *
-     * @param int    $iid  Identity ID
-     * @param array  $data Hash array with col->value pairs to save
-     * @return boolean True if saved successfully, false if nothing changed
-     */
-    function update_identity($iid, $data)
-    {
-        if (!$this->ID)
-            return false;
-
-        $query_cols = $query_params = array();
-
-        foreach ((array)$data as $col => $value) {
-            $query_cols[]   = $this->db->quoteIdentifier($col) . ' = ?';
-            $query_params[] = $value;
-        }
-        $query_params[] = $iid;
-        $query_params[] = $this->ID;
-
-        $sql = "UPDATE ".$this->db->table_name('identities').
-            " SET changed = ".$this->db->now().", ".join(', ', $query_cols).
-            " WHERE identity_id = ?".
-                " AND user_id = ?".
-                " AND del <> 1";
-
-        call_user_func_array(array($this->db, 'query'),
-            array_merge(array($sql), $query_params));
-
-        $this->identities = array();
-
-        return $this->db->affected_rows();
-    }
-
-
-    /**
-     * Create a new identity record linked with this user
-     *
-     * @param array $data Hash array with col->value pairs to save
-     * @return int  The inserted identity ID or false on error
-     */
-    function insert_identity($data)
-    {
-        if (!$this->ID)
-            return false;
-
-        unset($data['user_id']);
-
-        $insert_cols = $insert_values = array();
-        foreach ((array)$data as $col => $value) {
-            $insert_cols[]   = $this->db->quoteIdentifier($col);
-            $insert_values[] = $value;
-        }
-        $insert_cols[]   = 'user_id';
-        $insert_values[] = $this->ID;
-
-        $sql = "INSERT INTO ".$this->db->table_name('identities').
-            " (changed, ".join(', ', $insert_cols).")".
-            " VALUES (".$this->db->now().", ".join(', ', array_pad(array(), sizeof($insert_values), '?')).")";
-
-        call_user_func_array(array($this->db, 'query'),
-            array_merge(array($sql), $insert_values));
-
-        $this->identities = array();
-
-        return $this->db->insert_id('identities');
-    }
-
-
-    /**
-     * Mark the given identity as deleted
-     *
-     * @param  int     $iid Identity ID
-     * @return boolean True if deleted successfully, false if nothing changed
-     */
-    function delete_identity($iid)
-    {
-        if (!$this->ID)
-            return false;
-
-        $sql_result = $this->db->query(
-            "SELECT count(*) AS ident_count FROM ".$this->db->table_name('identities').
-            " WHERE user_id = ? AND del <> 1",
-            $this->ID);
-
-        $sql_arr = $this->db->fetch_assoc($sql_result);
-
-        // we'll not delete last identity
-        if ($sql_arr['ident_count'] <= 1)
-            return -1;
-
-        $this->db->query(
-            "UPDATE ".$this->db->table_name('identities').
-            " SET del = 1, changed = ".$this->db->now().
-            " WHERE user_id = ?".
-                " AND identity_id = ?",
-            $this->ID,
-            $iid);
-
-        $this->identities = array();
-
-        return $this->db->affected_rows();
-    }
-
-
-    /**
-     * Make this identity the default one for this user
-     *
-     * @param int $iid The identity ID
-     */
-    function set_default($iid)
-    {
-        if ($this->ID && $iid) {
-            $this->db->query(
-                "UPDATE ".$this->db->table_name('identities').
-                " SET ".$this->db->quoteIdentifier('standard')." = '0'".
-                " WHERE user_id = ?".
-                    " AND identity_id <> ?".
-                    " AND del <> 1",
-                $this->ID,
-                $iid);
-
-            unset($this->identities[0]);
-        }
-    }
-
-
-    /**
-     * Update user's last_login timestamp
-     */
-    function touch()
-    {
-        if ($this->ID) {
-            $this->db->query(
-                "UPDATE ".$this->db->table_name('users').
-                " SET last_login = ".$this->db->now().
-                " WHERE user_id = ?",
-                $this->ID);
-        }
-    }
-
-
-    /**
-     * Clear the saved object state
-     */
-    function reset()
-    {
-        $this->ID = null;
-        $this->data = null;
-    }
-
-
-    /**
-     * Find a user record matching the given name and host
-     *
-     * @param string $user IMAP user name
-     * @param string $host IMAP host name
-     * @return rcube_user New user instance
-     */
-    static function query($user, $host)
-    {
-        $dbh    = rcube::get_instance()->get_dbh();
-        $config = rcube::get_instance()->config;
-
-        // query for matching user name
-        $sql_result = $dbh->query("SELECT * FROM " . $dbh->table_name('users')
-            ." WHERE mail_host = ? AND username = ?", $host, $user);
-
-        $sql_arr = $dbh->fetch_assoc($sql_result);
-
-        // username not found, try aliases from identities
-        if (empty($sql_arr) && $config->get('user_aliases') && strpos($user, '@')) {
-            $sql_result = $dbh->limitquery("SELECT u.*"
-                ." FROM " . $dbh->table_name('users') . " u"
-                ." JOIN " . $dbh->table_name('identities') . " i ON (i.user_id = u.user_id)"
-                ." WHERE email = ? AND del <> 1", 0, 1, $user);
-
-            $sql_arr = $dbh->fetch_assoc($sql_result);
-        }
-
-        // user already registered -> overwrite username
-        if ($sql_arr)
-            return new rcube_user($sql_arr['user_id'], $sql_arr);
-        else
-            return false;
-    }
-
-
-    /**
-     * Create a new user record and return a rcube_user instance
-     *
-     * @param string $user IMAP user name
-     * @param string $host IMAP host
-     * @return rcube_user New user instance
-     */
-    static function create($user, $host)
-    {
-        $user_name  = '';
-        $user_email = '';
-        $rcube      = rcube::get_instance();
-        $dbh        = $rcube->get_dbh();
-
-        // try to resolve user in virtuser table and file
-        if ($email_list = self::user2email($user, false, true)) {
-            $user_email = is_array($email_list[0]) ? $email_list[0]['email'] : $email_list[0];
-        }
-
-        $data = $rcube->plugins->exec_hook('user_create', array(
-            'host'       => $host,
-            'user'       => $user,
-            'user_name'  => $user_name,
-            'user_email' => $user_email,
-            'email_list' => $email_list,
-            'language'   =>  $_SESSION['language'],
-        ));
-
-        // plugin aborted this operation
-        if ($data['abort']) {
-            return false;
-        }
-
-        $dbh->query(
-            "INSERT INTO ".$dbh->table_name('users').
-            " (created, last_login, username, mail_host, language)".
-            " VALUES (".$dbh->now().", ".$dbh->now().", ?, ?, ?)",
-            $data['user'],
-            $data['host'],
-            $data['language']);
-
-        if ($user_id = $dbh->insert_id('users')) {
-            // create rcube_user instance to make plugin hooks work
-            $user_instance = new rcube_user($user_id, array(
-                'user_id'   => $user_id,
-                'username'  => $data['user'],
-                'mail_host' => $data['host'],
-                'language'  => $data['language'],
-            ));
-            $rcube->user = $user_instance;
-            $mail_domain = $rcube->config->mail_domain($data['host']);
-            $user_name   = $data['user_name'];
-            $user_email  = $data['user_email'];
-            $email_list  = $data['email_list'];
-
-            if (empty($email_list)) {
-                if (empty($user_email)) {
-                    $user_email = strpos($data['user'], '@') ? $user : sprintf('%s@%s', $data['user'], $mail_domain);
-                }
-                $email_list[] = $user_email;
-            }
-            // identities_level check
-            else if (count($email_list) > 1 && $rcube->config->get('identities_level', 0) > 1) {
-                $email_list = array($email_list[0]);
-            }
-
-            if (empty($user_name)) {
-                $user_name = $data['user'];
-            }
-
-            // create new identities records
-            $standard = 1;
-            foreach ($email_list as $row) {
-                $record = array();
-
-                if (is_array($row)) {
-                    if (empty($row['email'])) {
-                        continue;
-                    }
-                    $record = $row;
-                }
-                else {
-                    $record['email'] = $row;
-                }
-
-                if (empty($record['name'])) {
-                    $record['name'] = $user_name != $record['email'] ? $user_name : '';
-                }
-
-                $record['user_id']  = $user_id;
-                $record['standard'] = $standard;
-
-                $plugin = $rcube->plugins->exec_hook('identity_create',
-                    array('login' => true, 'record' => $record));
-
-                if (!$plugin['abort'] && $plugin['record']['email']) {
-                    $rcube->user->insert_identity($plugin['record']);
-                }
-                $standard = 0;
-            }
-        }
-        else {
-            rcube::raise_error(array(
-                'code' => 500,
-                'type' => 'php',
-                'line' => __LINE__,
-                'file' => __FILE__,
-                'message' => "Failed to create new user"), true, false);
-        }
-
-        return $user_id ? $user_instance : false;
-    }
-
-
-    /**
-     * Resolve username using a virtuser plugins
-     *
-     * @param string $email E-mail address to resolve
-     * @return string Resolved IMAP username
-     */
-    static function email2user($email)
-    {
-        $rcube = rcube::get_instance();
-        $plugin = $rcube->plugins->exec_hook('email2user',
-            array('email' => $email, 'user' => NULL));
-
-        return $plugin['user'];
-    }
-
-
-    /**
-     * Resolve e-mail address from virtuser plugins
-     *
-     * @param string $user User name
-     * @param boolean $first If true returns first found entry
-     * @param boolean $extended If true returns email as array (email and name for identity)
-     * @return mixed Resolved e-mail address string or array of strings
-     */
-    static function user2email($user, $first=true, $extended=false)
-    {
-        $rcube = rcube::get_instance();
-        $plugin = $rcube->plugins->exec_hook('user2email',
-            array('email' => NULL, 'user' => $user,
-                'first' => $first, 'extended' => $extended));
-
-        return empty($plugin['email']) ? NULL : $plugin['email'];
-    }
-
-
-    /**
-     * Return a list of saved searches linked with this user
-     *
-     * @param int  $type  Search type
-     *
-     * @return array List of saved searches indexed by search ID
-     */
-    function list_searches($type)
-    {
-        $plugin = $this->rc->plugins->exec_hook('saved_search_list', array('type' => $type));
-
-        if ($plugin['abort']) {
-            return (array) $plugin['result'];
-        }
-
-        $result = array();
-
-        $sql_result = $this->db->query(
-            "SELECT search_id AS id, ".$this->db->quoteIdentifier('name')
-            ." FROM ".$this->db->table_name('searches')
-            ." WHERE user_id = ?"
-                ." AND ".$this->db->quoteIdentifier('type')." = ?"
-            ." ORDER BY ".$this->db->quoteIdentifier('name'),
-            (int) $this->ID, (int) $type);
-
-        while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-            $sql_arr['data'] = unserialize($sql_arr['data']);
-            $result[$sql_arr['id']] = $sql_arr;
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Return saved search data.
-     *
-     * @param int  $id  Row identifier
-     *
-     * @return array Data
-     */
-    function get_search($id)
-    {
-        $plugin = $this->rc->plugins->exec_hook('saved_search_get', array('id' => $id));
-
-        if ($plugin['abort']) {
-            return $plugin['result'];
-        }
-
-        $sql_result = $this->db->query(
-            "SELECT ".$this->db->quoteIdentifier('name')
-                .", ".$this->db->quoteIdentifier('data')
-                .", ".$this->db->quoteIdentifier('type')
-            ." FROM ".$this->db->table_name('searches')
-            ." WHERE user_id = ?"
-                ." AND search_id = ?",
-            (int) $this->ID, (int) $id);
-
-        while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-            return array(
-                'id'   => $id,
-                'name' => $sql_arr['name'],
-                'type' => $sql_arr['type'],
-                'data' => unserialize($sql_arr['data']),
-            );
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Deletes given saved search record
-     *
-     * @param  int  $sid  Search ID
-     *
-     * @return boolean True if deleted successfully, false if nothing changed
-     */
-    function delete_search($sid)
-    {
-        if (!$this->ID)
-            return false;
-
-        $this->db->query(
-            "DELETE FROM ".$this->db->table_name('searches')
-            ." WHERE user_id = ?"
-                ." AND search_id = ?",
-            (int) $this->ID, $sid);
-
-        return $this->db->affected_rows();
-    }
-
-
-    /**
-     * Create a new saved search record linked with this user
-     *
-     * @param array $data Hash array with col->value pairs to save
-     *
-     * @return int  The inserted search ID or false on error
-     */
-    function insert_search($data)
-    {
-        if (!$this->ID)
-            return false;
-
-        $insert_cols[]   = 'user_id';
-        $insert_values[] = (int) $this->ID;
-        $insert_cols[]   = $this->db->quoteIdentifier('type');
-        $insert_values[] = (int) $data['type'];
-        $insert_cols[]   = $this->db->quoteIdentifier('name');
-        $insert_values[] = $data['name'];
-        $insert_cols[]   = $this->db->quoteIdentifier('data');
-        $insert_values[] = serialize($data['data']);
-
-        $sql = "INSERT INTO ".$this->db->table_name('searches')
-            ." (".join(', ', $insert_cols).")"
-            ." VALUES (".join(', ', array_pad(array(), sizeof($insert_values), '?')).")";
-
-        call_user_func_array(array($this->db, 'query'),
-            array_merge(array($sql), $insert_values));
-
-        return $this->db->insert_id('searches');
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_utils.php b/lib/ext/Roundcube/rcube_utils.php
deleted file mode 100644
index 27a618d..0000000
--- a/lib/ext/Roundcube/rcube_utils.php
+++ /dev/null
@@ -1,1027 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Utility class providing common functions                            |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Utility class providing common functions
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_utils
-{
-    // define constants for input reading
-    const INPUT_GET  = 0x0101;
-    const INPUT_POST = 0x0102;
-    const INPUT_GPC  = 0x0103;
-
-    /**
-     * Helper method to set a cookie with the current path and host settings
-     *
-     * @param string Cookie name
-     * @param string Cookie value
-     * @param string Expiration time
-     */
-    public static function setcookie($name, $value, $exp = 0)
-    {
-        if (headers_sent()) {
-            return;
-        }
-
-        $cookie = session_get_cookie_params();
-        $secure = $cookie['secure'] || self::https_check();
-
-        setcookie($name, $value, $exp, $cookie['path'], $cookie['domain'], $secure, true);
-    }
-
-    /**
-     * E-mail address validation.
-     *
-     * @param string $email Email address
-     * @param boolean $dns_check True to check dns
-     *
-     * @return boolean True on success, False if address is invalid
-     */
-    public static function check_email($email, $dns_check=true)
-    {
-        // Check for invalid characters
-        if (preg_match('/[\x00-\x1F\x7F-\xFF]/', $email)) {
-            return false;
-        }
-
-        // Check for length limit specified by RFC 5321 (#1486453)
-        if (strlen($email) > 254) {
-            return false;
-        }
-
-        $email_array = explode('@', $email);
-
-        // Check that there's one @ symbol
-        if (count($email_array) < 2) {
-            return false;
-        }
-
-        $domain_part = array_pop($email_array);
-        $local_part  = implode('@', $email_array);
-
-        // from PEAR::Validate
-        $regexp = '&^(?:
-            ("\s*(?:[^"\f\n\r\t\v\b\s]+\s*)+")|                             #1 quoted name
-            ([-\w!\#\$%\&\'*+~/^`|{}=]+(?:\.[-\w!\#\$%\&\'*+~/^`|{}=]+)*))  #2 OR dot-atom (RFC5322)
-            $&xi';
-
-        if (!preg_match($regexp, $local_part)) {
-            return false;
-        }
-
-        // Validate domain part
-        if (preg_match('/^\[((IPv6:[0-9a-f:.]+)|([0-9.]+))\]$/i', $domain_part, $matches)) {
-            return self::check_ip(preg_replace('/^IPv6:/i', '', $matches[1])); // valid IPv4 or IPv6 address
-        }
-        else {
-            // If not an IP address
-            $domain_array = explode('.', $domain_part);
-            // Not enough parts to be a valid domain
-            if (sizeof($domain_array) < 2) {
-                return false;
-            }
-
-            foreach ($domain_array as $part) {
-                if (!preg_match('/^(([A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])|([A-Za-z0-9]))$/', $part)) {
-                    return false;
-                }
-            }
-
-            // last domain part
-            if (preg_match('/[^a-zA-Z]/', array_pop($domain_array))) {
-                return false;
-            }
-
-            $rcube = rcube::get_instance();
-
-            if (!$dns_check || !$rcube->config->get('email_dns_check')) {
-                return true;
-            }
-
-            if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' && version_compare(PHP_VERSION, '5.3.0', '<')) {
-                $lookup = array();
-                @exec("nslookup -type=MX " . escapeshellarg($domain_part) . " 2>&1", $lookup);
-                foreach ($lookup as $line) {
-                    if (strpos($line, 'MX preference')) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            // find MX record(s)
-            if (!function_exists('getmxrr') || getmxrr($domain_part, $mx_records)) {
-                return true;
-            }
-
-            // find any DNS record
-            if (!function_exists('checkdnsrr') || checkdnsrr($domain_part, 'ANY')) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Validates IPv4 or IPv6 address
-     *
-     * @param string $ip IP address in v4 or v6 format
-     *
-     * @return bool True if the address is valid
-     */
-    public static function check_ip($ip)
-    {
-        // IPv6, but there's no build-in IPv6 support
-        if (strpos($ip, ':') !== false && !defined('AF_INET6')) {
-            $parts = explode(':', $ip);
-            $count = count($parts);
-
-            if ($count > 8 || $count < 2) {
-                return false;
-            }
-
-            foreach ($parts as $idx => $part) {
-                $length = strlen($part);
-                if (!$length) {
-                    // there can be only one ::
-                    if ($found_empty) {
-                        return false;
-                    }
-                    $found_empty = true;
-                }
-                // last part can be an IPv4 address
-                else if ($idx == $count - 1) {
-                    if (!preg_match('/^[0-9a-f]{1,4}$/i', $part)) {
-                        return @inet_pton($part) !== false;
-                    }
-                }
-                else if (!preg_match('/^[0-9a-f]{1,4}$/i', $part)) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        return @inet_pton($ip) !== false;
-    }
-
-
-    /**
-     * Check whether the HTTP referer matches the current request
-     *
-     * @return boolean True if referer is the same host+path, false if not
-     */
-    public static function check_referer()
-    {
-        $uri = parse_url($_SERVER['REQUEST_URI']);
-        $referer = parse_url(self::request_header('Referer'));
-        return $referer['host'] == self::request_header('Host') && $referer['path'] == $uri['path'];
-    }
-
-
-    /**
-     * Replacing specials characters to a specific encoding type
-     *
-     * @param  string  Input string
-     * @param  string  Encoding type: text|html|xml|js|url
-     * @param  string  Replace mode for tags: show|replace|remove
-     * @param  boolean Convert newlines
-     *
-     * @return string  The quoted string
-     */
-    public static function rep_specialchars_output($str, $enctype = '', $mode = '', $newlines = true)
-    {
-        static $html_encode_arr = false;
-        static $js_rep_table = false;
-        static $xml_rep_table = false;
-
-        if (!is_string($str)) {
-            $str = strval($str);
-        }
-
-        // encode for HTML output
-        if ($enctype == 'html') {
-            if (!$html_encode_arr) {
-                $html_encode_arr = get_html_translation_table(HTML_SPECIALCHARS);
-                unset($html_encode_arr['?']);
-            }
-
-            $encode_arr = $html_encode_arr;
-
-            // don't replace quotes and html tags
-            if ($mode == 'show' || $mode == '') {
-                $ltpos = strpos($str, '<');
-                if ($ltpos !== false && strpos($str, '>', $ltpos) !== false) {
-                    unset($encode_arr['"']);
-                    unset($encode_arr['<']);
-                    unset($encode_arr['>']);
-                    unset($encode_arr['&']);
-                }
-            }
-            else if ($mode == 'remove') {
-                $str = strip_tags($str);
-            }
-
-            $out = strtr($str, $encode_arr);
-
-            return $newlines ? nl2br($out) : $out;
-        }
-
-        // if the replace tables for XML and JS are not yet defined
-        if ($js_rep_table === false) {
-            $js_rep_table = $xml_rep_table = array();
-            $xml_rep_table['&'] = '&amp;';
-
-            // can be increased to support more charsets
-            for ($c=160; $c<256; $c++) {
-                $xml_rep_table[chr($c)] = "&#$c;";
-            }
-
-            $xml_rep_table['"'] = '&quot;';
-            $js_rep_table['"']  = '\\"';
-            $js_rep_table["'"]  = "\\'";
-            $js_rep_table["\\"] = "\\\\";
-            // Unicode line and paragraph separators (#1486310)
-            $js_rep_table[chr(hexdec(E2)).chr(hexdec(80)).chr(hexdec(A8))] = '&#8232;';
-            $js_rep_table[chr(hexdec(E2)).chr(hexdec(80)).chr(hexdec(A9))] = '&#8233;';
-        }
-
-        // encode for javascript use
-        if ($enctype == 'js') {
-            return preg_replace(array("/\r?\n/", "/\r/", '/<\\//'), array('\n', '\n', '<\\/'), strtr($str, $js_rep_table));
-        }
-
-        // encode for plaintext
-        if ($enctype == 'text') {
-            return str_replace("\r\n", "\n", $mode=='remove' ? strip_tags($str) : $str);
-        }
-
-        if ($enctype == 'url') {
-            return rawurlencode($str);
-        }
-
-        // encode for XML
-        if ($enctype == 'xml') {
-            return strtr($str, $xml_rep_table);
-        }
-
-        // no encoding given -> return original string
-        return $str;
-    }
-
-
-    /**
-     * Read input value and convert it for internal use
-     * Performs stripslashes() and charset conversion if necessary
-     *
-     * @param  string   Field name to read
-     * @param  int      Source to get value from (GPC)
-     * @param  boolean  Allow HTML tags in field value
-     * @param  string   Charset to convert into
-     *
-     * @return string   Field value or NULL if not available
-     */
-    public static function get_input_value($fname, $source, $allow_html=FALSE, $charset=NULL)
-    {
-        $value = NULL;
-
-        if ($source == self::INPUT_GET) {
-            if (isset($_GET[$fname])) {
-                $value = $_GET[$fname];
-            }
-        }
-        else if ($source == self::INPUT_POST) {
-            if (isset($_POST[$fname])) {
-                $value = $_POST[$fname];
-            }
-        }
-        else if ($source == self::INPUT_GPC) {
-            if (isset($_POST[$fname])) {
-                $value = $_POST[$fname];
-            }
-            else if (isset($_GET[$fname])) {
-                $value = $_GET[$fname];
-            }
-            else if (isset($_COOKIE[$fname])) {
-                $value = $_COOKIE[$fname];
-            }
-        }
-
-        return self::parse_input_value($value, $allow_html, $charset);
-    }
-
-
-    /**
-     * Parse/validate input value. See self::get_input_value()
-     * Performs stripslashes() and charset conversion if necessary
-     *
-     * @param  string   Input value
-     * @param  boolean  Allow HTML tags in field value
-     * @param  string   Charset to convert into
-     *
-     * @return string   Parsed value
-     */
-    public static function parse_input_value($value, $allow_html=FALSE, $charset=NULL)
-    {
-        global $OUTPUT;
-
-        if (empty($value)) {
-            return $value;
-        }
-
-        if (is_array($value)) {
-            foreach ($value as $idx => $val) {
-                $value[$idx] = self::parse_input_value($val, $allow_html, $charset);
-            }
-            return $value;
-        }
-
-        // strip slashes if magic_quotes enabled
-        if (get_magic_quotes_gpc() || get_magic_quotes_runtime()) {
-            $value = stripslashes($value);
-        }
-
-        // remove HTML tags if not allowed
-        if (!$allow_html) {
-            $value = strip_tags($value);
-        }
-
-        $output_charset = is_object($OUTPUT) ? $OUTPUT->get_charset() : null;
-
-        // remove invalid characters (#1488124)
-        if ($output_charset == 'UTF-8') {
-            $value = rcube_charset::clean($value);
-        }
-
-        // convert to internal charset
-        if ($charset && $output_charset) {
-            $value = rcube_charset::convert($value, $output_charset, $charset);
-        }
-
-        return $value;
-    }
-
-
-    /**
-     * Convert array of request parameters (prefixed with _)
-     * to a regular array with non-prefixed keys.
-     *
-     * @param int     $mode       Source to get value from (GPC)
-     * @param string  $ignore     PCRE expression to skip parameters by name
-     * @param boolean $allow_html Allow HTML tags in field value
-     *
-     * @return array Hash array with all request parameters
-     */
-    public static function request2param($mode = null, $ignore = 'task|action', $allow_html = false)
-    {
-        $out = array();
-        $src = $mode == self::INPUT_GET ? $_GET : ($mode == self::INPUT_POST ? $_POST : $_REQUEST);
-
-        foreach (array_keys($src) as $key) {
-            $fname = $key[0] == '_' ? substr($key, 1) : $key;
-            if ($ignore && !preg_match('/^(' . $ignore . ')$/', $fname)) {
-                $out[$fname] = self::get_input_value($key, $mode, $allow_html);
-            }
-        }
-
-        return $out;
-    }
-
-
-    /**
-     * Convert the given string into a valid HTML identifier
-     * Same functionality as done in app.js with rcube_webmail.html_identifier()
-     */
-    public static function html_identifier($str, $encode=false)
-    {
-        if ($encode) {
-            return rtrim(strtr(base64_encode($str), '+/', '-_'), '=');
-        }
-        else {
-            return asciiwords($str, true, '_');
-        }
-    }
-
-
-    /**
-     * Replace all css definitions with #container [def]
-     * and remove css-inlined scripting
-     *
-     * @param string CSS source code
-     * @param string Container ID to use as prefix
-     *
-     * @return string Modified CSS source
-     */
-    public static function mod_css_styles($source, $container_id, $allow_remote=false)
-    {
-        $last_pos = 0;
-        $replacements = new rcube_string_replacer;
-
-        // ignore the whole block if evil styles are detected
-        $source   = self::xss_entity_decode($source);
-        $stripped = preg_replace('/[^a-z\(:;]/i', '', $source);
-        $evilexpr = 'expression|behavior|javascript:|import[^a]' . (!$allow_remote ? '|url\(' : '');
-
-        if (preg_match("/$evilexpr/i", $stripped)) {
-            return '/* evil! */';
-        }
-
-        $strict_url_regexp = '!url\s*\([ "\'](https?:)//[a-z0-9/._+-]+["\' ]\)!Uims';
-
-        // cut out all contents between { and }
-        while (($pos = strpos($source, '{', $last_pos)) && ($pos2 = strpos($source, '}', $pos))) {
-            $nested = strpos($source, '{', $pos+1);
-            if ($nested && $nested < $pos2)  // when dealing with nested blocks (e.g. @media), take the inner one
-                $pos = $nested;
-            $length = $pos2 - $pos - 1;
-            $styles = substr($source, $pos+1, $length);
-
-            // check every line of a style block...
-            if ($allow_remote) {
-                $a_styles = preg_split('/;[\r\n]*/', $styles, -1, PREG_SPLIT_NO_EMPTY);
-
-                foreach ($a_styles as $line) {
-                    $stripped = preg_replace('/[^a-z\(:;]/i', '', $line);
-                    // ... and only allow strict url() values
-                    if (stripos($stripped, 'url(') && !preg_match($strict_url_regexp, $line)) {
-                        $a_styles = array('/* evil! */');
-                        break;
-                    }
-                }
-
-                $styles = join(";\n", $a_styles);
-            }
-
-            $key      = $replacements->add($styles);
-            $repl     = $replacements->get_replacement($key);
-            $source   = substr_replace($source, $repl, $pos+1, $length);
-            $last_pos = $pos2 - ($length - strlen($repl));
-        }
-
-        // remove html comments and add #container to each tag selector.
-        // also replace body definition because we also stripped off the <body> tag
-        $source = preg_replace(
-            array(
-                '/(^\s*<\!--)|(-->\s*$)/m',
-                '/(^\s*|,\s*|\}\s*)([a-z0-9\._#\*][a-z0-9\.\-_]*)/im',
-                '/'.preg_quote($container_id, '/').'\s+body/i',
-            ),
-            array(
-                '',
-                "\\1#$container_id \\2",
-                $container_id,
-            ),
-            $source);
-
-        // put block contents back in
-        $source = $replacements->resolve($source);
-
-        return $source;
-    }
-
-
-    /**
-     * Generate CSS classes from mimetype and filename extension
-     *
-     * @param string $mimetype  Mimetype
-     * @param string $filename  Filename
-     *
-     * @return string CSS classes separated by space
-     */
-    public static function file2class($mimetype, $filename)
-    {
-        $mimetype = strtolower($mimetype);
-        $filename = strtolower($filename);
-
-        list($primary, $secondary) = explode('/', $mimetype);
-
-        $classes = array($primary ? $primary : 'unknown');
-
-        if ($secondary) {
-            $classes[] = $secondary;
-        }
-
-        if (preg_match('/\.([a-z0-9]+)$/', $filename, $m)) {
-            if (!in_array($m[1], $classes)) {
-                $classes[] = $m[1];
-            }
-        }
-
-        return join(" ", $classes);
-    }
-
-
-    /**
-     * Decode escaped entities used by known XSS exploits.
-     * See http://downloads.securityfocus.com/vulnerabilities/exploits/26800.eml for examples
-     *
-     * @param string CSS content to decode
-     *
-     * @return string Decoded string
-     */
-    public static function xss_entity_decode($content)
-    {
-        $out = html_entity_decode(html_entity_decode($content));
-        $out = preg_replace_callback('/\\\([0-9a-f]{4})/i',
-            array(self, 'xss_entity_decode_callback'), $out);
-        $out = preg_replace('#/\*.*\*/#Ums', '', $out);
-
-        return $out;
-    }
-
-
-    /**
-     * preg_replace_callback callback for xss_entity_decode
-     *
-     * @param array $matches Result from preg_replace_callback
-     *
-     * @return string Decoded entity
-     */
-    public static function xss_entity_decode_callback($matches)
-    {
-        return chr(hexdec($matches[1]));
-    }
-
-
-    /**
-     * Check if we can process not exceeding memory_limit
-     *
-     * @param integer Required amount of memory
-     *
-     * @return boolean True if memory won't be exceeded, False otherwise
-     */
-    public static function mem_check($need)
-    {
-        $mem_limit = parse_bytes(ini_get('memory_limit'));
-        $memory    = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB
-
-        return $mem_limit > 0 && $memory + $need > $mem_limit ? false : true;
-    }
-
-
-    /**
-     * Check if working in SSL mode
-     *
-     * @param integer $port      HTTPS port number
-     * @param boolean $use_https Enables 'use_https' option checking
-     *
-     * @return boolean
-     */
-    public static function https_check($port=null, $use_https=true)
-    {
-        global $RCMAIL;
-
-        if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') {
-            return true;
-        }
-        if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https') {
-            return true;
-        }
-        if ($port && $_SERVER['SERVER_PORT'] == $port) {
-            return true;
-        }
-        if ($use_https && isset($RCMAIL) && $RCMAIL->config->get('use_https')) {
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Replaces hostname variables.
-     *
-     * @param string $name Hostname
-     * @param string $host Optional IMAP hostname
-     *
-     * @return string Hostname
-     */
-    public static function parse_host($name, $host = '')
-    {
-        // %n - host
-        $n = preg_replace('/:\d+$/', '', $_SERVER['SERVER_NAME']);
-        // %t - host name without first part, e.g. %n=mail.domain.tld, %t=domain.tld
-        $t = preg_replace('/^[^\.]+\./', '', $n);
-        // %d - domain name without first part
-        $d = preg_replace('/^[^\.]+\./', '', $_SERVER['HTTP_HOST']);
-        // %h - IMAP host
-        $h = $_SESSION['storage_host'] ? $_SESSION['storage_host'] : $host;
-        // %z - IMAP domain without first part, e.g. %h=imap.domain.tld, %z=domain.tld
-        $z = preg_replace('/^[^\.]+\./', '', $h);
-        // %s - domain name after the '@' from e-mail address provided at login screen. Returns FALSE if an invalid email is provided
-        if (strpos($name, '%s') !== false) {
-            $user_email = self::get_input_value('_user', self::INPUT_POST);
-            $user_email = self::idn_convert($user_email, true);
-            $matches    = preg_match('/(.*)@([a-z0-9\.\-\[\]\:]+)/i', $user_email, $s);
-            if ($matches < 1 || filter_var($s[1]."@".$s[2], FILTER_VALIDATE_EMAIL) === false) {
-                return false;
-            }
-        }
-
-        $name = str_replace(array('%n', '%t', '%d', '%h', '%z', '%s'), array($n, $t, $d, $h, $z, $s[2]), $name);
-        return $name;
-    }
-
-
-    /**
-     * Returns remote IP address and forwarded addresses if found
-     *
-     * @return string Remote IP address(es)
-     */
-    public static function remote_ip()
-    {
-        $address = $_SERVER['REMOTE_ADDR'];
-
-        // append the NGINX X-Real-IP header, if set
-        if (!empty($_SERVER['HTTP_X_REAL_IP'])) {
-            $remote_ip[] = 'X-Real-IP: ' . $_SERVER['HTTP_X_REAL_IP'];
-        }
-        // append the X-Forwarded-For header, if set
-        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-            $remote_ip[] = 'X-Forwarded-For: ' . $_SERVER['HTTP_X_FORWARDED_FOR'];
-        }
-
-        if (!empty($remote_ip)) {
-            $address .= '(' . implode(',', $remote_ip) . ')';
-        }
-
-        return $address;
-    }
-
-
-    /**
-     * Returns the real remote IP address
-     *
-     * @return string Remote IP address
-     */
-    public static function remote_addr()
-    {
-        foreach (array('HTTP_X_FORWARDED_FOR','HTTP_X_REAL_IP','REMOTE_ADDR') as $prop) {
-            if (!empty($_SERVER[$prop]))
-                return $_SERVER[$prop];
-        }
-
-        return '';
-    }
-
-    /**
-     * Read a specific HTTP request header.
-     *
-     * @param  string $name Header name
-     *
-     * @return mixed  Header value or null if not available
-     */
-    public static function request_header($name)
-    {
-        if (function_exists('getallheaders')) {
-            $hdrs = array_change_key_case(getallheaders(), CASE_UPPER);
-            $key  = strtoupper($name);
-        }
-        else {
-            $key  = 'HTTP_' . strtoupper(strtr($name, '-', '_'));
-            $hdrs = array_change_key_case($_SERVER, CASE_UPPER);
-        }
-
-        return $hdrs[$key];
-    }
-
-    /**
-     * Explode quoted string
-     *
-     * @param string Delimiter expression string for preg_match()
-     * @param string Input string
-     *
-     * @return array String items
-     */
-    public static function explode_quoted_string($delimiter, $string)
-    {
-        $result = array();
-        $strlen = strlen($string);
-
-        for ($q=$p=$i=0; $i < $strlen; $i++) {
-            if ($string[$i] == "\"" && $string[$i-1] != "\\") {
-                $q = $q ? false : true;
-            }
-            else if (!$q && preg_match("/$delimiter/", $string[$i])) {
-                $result[] = substr($string, $p, $i - $p);
-                $p = $i + 1;
-            }
-        }
-
-        $result[] = (string) substr($string, $p);
-
-        return $result;
-    }
-
-
-    /**
-     * Improved equivalent to strtotime()
-     *
-     * @param string $date  Date string
-     *
-     * @return int Unix timestamp
-     */
-    public static function strtotime($date)
-    {
-        $date = self::clean_datestr($date);
-
-        // unix timestamp
-        if (is_numeric($date)) {
-            return (int) $date;
-        }
-
-        // if date parsing fails, we have a date in non-rfc format.
-        // remove token from the end and try again
-        while ((($ts = @strtotime($date)) === false) || ($ts < 0)) {
-            $d = explode(' ', $date);
-            array_pop($d);
-            if (!$d) {
-                break;
-            }
-            $date = implode(' ', $d);
-        }
-
-        return (int) $ts;
-    }
-
-    /**
-     * Date parsing function that turns the given value into a DateTime object
-     *
-     * @param string $date  Date string
-     *
-     * @return object DateTime instance or false on failure
-     */
-    public static function anytodatetime($date)
-    {
-        if (is_object($date) && is_a($date, 'DateTime')) {
-            return $date;
-        }
-
-        $dt   = false;
-        $date = self::clean_datestr($date);
-
-        // try to parse string with DateTime first
-        if (!empty($date)) {
-            try {
-                $dt = new DateTime($date);
-            }
-            catch (Exception $e) {
-                // ignore
-            }
-        }
-
-        // try our advanced strtotime() method
-        if (!$dt && ($timestamp = self::strtotime($date))) {
-            try {
-                $dt = new DateTime("@".$timestamp);
-            }
-            catch (Exception $e) {
-                // ignore
-            }
-        }
-
-        return $dt;
-    }
-
-    /**
-     * Clean up date string for strtotime() input
-     *
-     * @param string $date Date string
-     *
-     * @return string Date string
-     */
-    public static function clean_datestr($date)
-    {
-        $date = trim($date);
-
-        // check for MS Outlook vCard date format YYYYMMDD
-        if (preg_match('/^([12][90]\d\d)([01]\d)([0123]\d)$/', $date, $m)) {
-            return sprintf('%04d-%02d-%02d 00:00:00', intval($m[1]), intval($m[2]), intval($m[3]));
-        }
-
-        // Clean malformed data
-        $date = preg_replace(
-            array(
-                '/GMT\s*([+-][0-9]+)/',                     // support non-standard "GMTXXXX" literal
-                '/[^a-z0-9\x20\x09:+-\/]/i',                  // remove any invalid characters
-                '/\s*(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*/i',   // remove weekday names
-            ),
-            array(
-                '\\1',
-                '',
-                '',
-            ), $date);
-
-        $date = trim($date);
-
-        // try to fix dd/mm vs. mm/dd discrepancy, we can't do more here
-        if (preg_match('/^(\d{1,2})[.\/-](\d{1,2})[.\/-](\d{4})$/', $date, $m)) {
-            $mdy   = $m[2] > 12 && $m[1] <= 12;
-            $day   = $mdy ? $m[2] : $m[1];
-            $month = $mdy ? $m[1] : $m[2];
-            $date  = sprintf('%04d-%02d-%02d 00:00:00', intval($m[3]), $month, $day);
-        }
-        // I've found that YYYY.MM.DD is recognized wrong, so here's a fix
-        else if (preg_match('/^(\d{4})\.(\d{1,2})\.(\d{1,2})$/', $date)) {
-            $date = str_replace('.', '-', $date) . ' 00:00:00';
-        }
-
-        return $date;
-    }
-
-    /*
-     * Idn_to_ascii wrapper.
-     * Intl/Idn modules version of this function doesn't work with e-mail address
-     */
-    public static function idn_to_ascii($str)
-    {
-        return self::idn_convert($str, true);
-    }
-
-
-    /*
-     * Idn_to_ascii wrapper.
-     * Intl/Idn modules version of this function doesn't work with e-mail address
-     */
-    public static function idn_to_utf8($str)
-    {
-        return self::idn_convert($str, false);
-    }
-
-
-    public static function idn_convert($input, $is_utf=false)
-    {
-        if ($at = strpos($input, '@')) {
-            $user   = substr($input, 0, $at);
-            $domain = substr($input, $at+1);
-        }
-        else {
-            $domain = $input;
-        }
-
-        $domain = $is_utf ? idn_to_ascii($domain) : idn_to_utf8($domain);
-
-        if ($domain === false) {
-            return '';
-        }
-
-        return $at ? $user . '@' . $domain : $domain;
-    }
-
-    /**
-     * Split the given string into word tokens
-     *
-     * @param string Input to tokenize
-     * @return array List of tokens
-     */
-    public static function tokenize_string($str)
-    {
-        return explode(" ", preg_replace(
-            array('/[\s;\/+-]+/i', '/(\d)[-.\s]+(\d)/', '/\s\w{1,3}\s/u'),
-            array(' ', '\\1\\2', ' '),
-            $str));
-    }
-
-    /**
-     * Normalize the given string for fulltext search.
-     * Currently only optimized for Latin-1 characters; to be extended
-     *
-     * @param string  Input string (UTF-8)
-     * @param boolean True to return list of words as array
-     * @return mixed  Normalized string or a list of normalized tokens
-     */
-    public static function normalize_string($str, $as_array = false)
-    {
-        // split by words
-        $arr = self::tokenize_string($str);
-
-        foreach ($arr as $i => $part) {
-            if (utf8_encode(utf8_decode($part)) == $part) {  // is latin-1 ?
-                $arr[$i] = utf8_encode(strtr(strtolower(strtr(utf8_decode($part),
-                    'ÇçäâàåéêëèïîìÅÉöôòüûùÿøØáíóúñÑÁÂÀãÃÊËÈÍÎÏÓÔõÕÚÛÙýÝ',
-                    'ccaaaaeeeeiiiaeooouuuyooaiounnaaaaaeeeiiioooouuuyy')),
-                    array('ß' => 'ss', 'ae' => 'a', 'oe' => 'o', 'ue' => 'u')));
-            }
-            else
-                $arr[$i] = mb_strtolower($part);
-        }
-
-        return $as_array ? $arr : join(" ", $arr);
-    }
-
-    /**
-     * Parse commandline arguments into a hash array
-     *
-     * @param array $aliases Argument alias names
-     *
-     * @return array Argument values hash
-     */
-    public static function get_opt($aliases = array())
-    {
-        $args = array();
-
-        for ($i=1; $i < count($_SERVER['argv']); $i++) {
-            $arg   = $_SERVER['argv'][$i];
-            $value = true;
-            $key   = null;
-
-            if ($arg[0] == '-') {
-                $key = preg_replace('/^-+/', '', $arg);
-                $sp  = strpos($arg, '=');
-                if ($sp > 0) {
-                    $key   = substr($key, 0, $sp - 2);
-                    $value = substr($arg, $sp+1);
-                }
-                else if (strlen($_SERVER['argv'][$i+1]) && $_SERVER['argv'][$i+1][0] != '-') {
-                    $value = $_SERVER['argv'][++$i];
-                }
-
-                $args[$key] = is_string($value) ? preg_replace(array('/^["\']/', '/["\']$/'), '', $value) : $value;
-            }
-            else {
-                $args[] = $arg;
-            }
-
-            if ($alias = $aliases[$key]) {
-                $args[$alias] = $args[$key];
-            }
-        }
-
-        return $args;
-    }
-
-    /**
-     * Safe password prompt for command line
-     * from http://blogs.sitepoint.com/2009/05/01/interactive-cli-password-prompt-in-php/
-     *
-     * @return string Password
-     */
-    public static function prompt_silent($prompt = "Password:")
-    {
-        if (preg_match('/^win/i', PHP_OS)) {
-            $vbscript  = sys_get_temp_dir() . 'prompt_password.vbs';
-            $vbcontent = 'wscript.echo(InputBox("' . addslashes($prompt) . '", "", "password here"))';
-            file_put_contents($vbscript, $vbcontent);
-
-            $command  = "cscript //nologo " . escapeshellarg($vbscript);
-            $password = rtrim(shell_exec($command));
-            unlink($vbscript);
-
-            return $password;
-        }
-        else {
-            $command = "/usr/bin/env bash -c 'echo OK'";
-            if (rtrim(shell_exec($command)) !== 'OK') {
-                echo $prompt;
-                $pass = trim(fgets(STDIN));
-                echo chr(8)."\r" . $prompt . str_repeat("*", strlen($pass))."\n";
-                return $pass;
-            }
-
-            $command = "/usr/bin/env bash -c 'read -s -p \"" . addslashes($prompt) . "\" mypassword && echo \$mypassword'";
-            $password = rtrim(shell_exec($command));
-            echo "\n";
-            return $password;
-        }
-    }
-
-
-    /**
-     * Find out if the string content means true or false
-     *
-     * @param string $str Input value
-     *
-     * @return boolean Boolean value
-     */
-    public static function get_boolean($str)
-    {
-        $str = strtolower($str);
-
-        return !in_array($str, array('false', '0', 'no', 'off', 'nein', ''), true);
-    }
-
-}
diff --git a/lib/ext/Roundcube/rcube_vcard.php b/lib/ext/Roundcube/rcube_vcard.php
deleted file mode 100644
index 5f74ccb..0000000
--- a/lib/ext/Roundcube/rcube_vcard.php
+++ /dev/null
@@ -1,884 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Logical representation of a vcard address record                    |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Logical representation of a vcard-based address record
- * Provides functions to parse and export vCard data format
- *
- * @package    Framework
- * @subpackage Addressbook
- */
-class rcube_vcard
-{
-    private static $values_decoded = false;
-    private $raw = array(
-        'FN' => array(),
-        'N'  => array(array('','','','','')),
-    );
-    private static $fieldmap = array(
-        'phone'    => 'TEL',
-        'birthday' => 'BDAY',
-        'website'  => 'URL',
-        'notes'    => 'NOTE',
-        'email'    => 'EMAIL',
-        'address'  => 'ADR',
-        'jobtitle' => 'TITLE',
-        'department'  => 'X-DEPARTMENT',
-        'gender'      => 'X-GENDER',
-        'maidenname'  => 'X-MAIDENNAME',
-        'anniversary' => 'X-ANNIVERSARY',
-        'assistant'   => 'X-ASSISTANT',
-        'manager'     => 'X-MANAGER',
-        'spouse'      => 'X-SPOUSE',
-        'edit'        => 'X-AB-EDIT',
-        'groups'      => 'CATEGORIES',
-    );
-    private $typemap = array(
-        'IPHONE'   => 'mobile',
-        'CELL'     => 'mobile',
-        'WORK,FAX' => 'workfax',
-    );
-    private $phonetypemap = array(
-        'HOME1'       => 'HOME',
-        'BUSINESS1'   => 'WORK',
-        'BUSINESS2'   => 'WORK2',
-        'BUSINESSFAX' => 'WORK,FAX',
-        'MOBILE'      => 'CELL',
-    );
-    private $addresstypemap = array(
-        'BUSINESS' => 'WORK',
-    );
-    private $immap = array(
-        'X-JABBER' => 'jabber',
-        'X-ICQ'    => 'icq',
-        'X-MSN'    => 'msn',
-        'X-AIM'    => 'aim',
-        'X-YAHOO'  => 'yahoo',
-        'X-SKYPE'  => 'skype',
-        'X-SKYPE-USERNAME' => 'skype',
-    );
-
-    public $business = false;
-    public $displayname;
-    public $surname;
-    public $firstname;
-    public $middlename;
-    public $nickname;
-    public $organization;
-    public $email = array();
-
-    public static $eol = "\r\n";
-
-
-    /**
-     * Constructor
-     */
-    public function __construct($vcard = null, $charset = RCUBE_CHARSET, $detect = false, $fieldmap = array())
-    {
-        if (!empty($fieldmap)) {
-            $this->extend_fieldmap($fieldmap);
-        }
-
-        if (!empty($vcard)) {
-            $this->load($vcard, $charset, $detect);
-        }
-    }
-
-    /**
-     * Load record from (internal, unfolded) vcard 3.0 format
-     *
-     * @param string vCard string to parse
-     * @param string Charset of string values
-     * @param boolean True if loading a 'foreign' vcard and extra heuristics for charset detection is required
-     */
-    public function load($vcard, $charset = RCUBE_CHARSET, $detect = false)
-    {
-        self::$values_decoded = false;
-        $this->raw = self::vcard_decode($vcard);
-
-        // resolve charset parameters
-        if ($charset == null) {
-            $this->raw = self::charset_convert($this->raw);
-        }
-        // vcard has encoded values and charset should be detected
-        else if ($detect && self::$values_decoded
-            && ($detected_charset = self::detect_encoding(self::vcard_encode($this->raw)))
-            && $detected_charset != RCUBE_CHARSET
-        ) {
-            $this->raw = self::charset_convert($this->raw, $detected_charset);
-        }
-
-        // consider FN empty if the same as the primary e-mail address
-        if ($this->raw['FN'][0][0] == $this->raw['EMAIL'][0][0]) {
-            $this->raw['FN'][0][0] = '';
-        }
-
-        // find well-known address fields
-        $this->displayname  = $this->raw['FN'][0][0];
-        $this->surname      = $this->raw['N'][0][0];
-        $this->firstname    = $this->raw['N'][0][1];
-        $this->middlename   = $this->raw['N'][0][2];
-        $this->nickname     = $this->raw['NICKNAME'][0][0];
-        $this->organization = $this->raw['ORG'][0][0];
-        $this->business     = ($this->raw['X-ABSHOWAS'][0][0] == 'COMPANY') || (join('', (array)$this->raw['N'][0]) == '' && !empty($this->organization));
-
-        foreach ((array)$this->raw['EMAIL'] as $i => $raw_email) {
-            $this->email[$i] = is_array($raw_email) ? $raw_email[0] : $raw_email;
-        }
-
-        // make the pref e-mail address the first entry in $this->email
-        $pref_index = $this->get_type_index('EMAIL', 'pref');
-        if ($pref_index > 0) {
-            $tmp = $this->email[0];
-            $this->email[0] = $this->email[$pref_index];
-            $this->email[$pref_index] = $tmp;
-        }
-    }
-
-    /**
-     * Return vCard data as associative array to be unsed in Roundcube address books
-     *
-     * @return array Hash array with key-value pairs
-     */
-    public function get_assoc()
-    {
-        $out     = array('name' => $this->displayname);
-        $typemap = $this->typemap;
-
-        // copy name fields to output array
-        foreach (array('firstname','surname','middlename','nickname','organization') as $col) {
-            if (strlen($this->$col)) {
-                $out[$col] = $this->$col;
-            }
-        }
-
-        if ($this->raw['N'][0][3])
-            $out['prefix'] = $this->raw['N'][0][3];
-        if ($this->raw['N'][0][4])
-            $out['suffix'] = $this->raw['N'][0][4];
-
-        // convert from raw vcard data into associative data for Roundcube
-        foreach (array_flip(self::$fieldmap) as $tag => $col) {
-            foreach ((array)$this->raw[$tag] as $i => $raw) {
-                if (is_array($raw)) {
-                    $k       = -1;
-                    $key     = $col;
-                    $subtype = '';
-
-                    if (!empty($raw['type'])) {
-                        $combined = join(',', self::array_filter((array)$raw['type'], 'internet,pref', true));
-                        $combined = strtoupper($combined);
-
-                        if ($typemap[$combined]) {
-                            $subtype = $typemap[$combined];
-                        }
-                        else if ($typemap[$raw['type'][++$k]]) {
-                            $subtype = $typemap[$raw['type'][$k]];
-                        }
-                        else {
-                            $subtype = strtolower($raw['type'][$k]);
-                        }
-
-                        while ($k < count($raw['type']) && ($subtype == 'internet' || $subtype == 'pref')) {
-                            $subtype = $typemap[$raw['type'][++$k]] ? $typemap[$raw['type'][$k]] : strtolower($raw['type'][$k]);
-                        }
-                    }
-
-                    // read vcard 2.1 subtype
-                    if (!$subtype) {
-                        foreach ($raw as $k => $v) {
-                            if (!is_numeric($k) && $v === true && ($k = strtolower($k))
-                                && !in_array($k, array('pref','internet','voice','base64'))
-                            ) {
-                                $k_uc    = strtoupper($k);
-                                $subtype = $typemap[$k_uc] ? $typemap[$k_uc] : $k;
-                                break;
-                            }
-                        }
-                    }
-
-                    // force subtype if none set
-                    if (!$subtype && preg_match('/^(email|phone|address|website)/', $key)) {
-                        $subtype = 'other';
-                    }
-
-                    if ($subtype) {
-                        $key .= ':' . $subtype;
-                    }
-
-                    // split ADR values into assoc array
-                    if ($tag == 'ADR') {
-                        list(,, $value['street'], $value['locality'], $value['region'], $value['zipcode'], $value['country']) = $raw;
-                        $out[$key][] = $value;
-                    }
-                    else {
-                        $out[$key][] = $raw[0];
-                    }
-                }
-                else {
-                    $out[$col][] = $raw;
-                }
-            }
-        }
-
-        // handle special IM fields as used by Apple
-        foreach ($this->immap as $tag => $type) {
-            foreach ((array)$this->raw[$tag] as $i => $raw) {
-                $out['im:'.$type][] = $raw[0];
-            }
-        }
-
-        // copy photo data
-        if ($this->raw['PHOTO']) {
-            $out['photo'] = $this->raw['PHOTO'][0][0];
-        }
-
-        return $out;
-    }
-
-    /**
-     * Convert the data structure into a vcard 3.0 string
-     */
-    public function export($folded = true)
-    {
-        $vcard = self::vcard_encode($this->raw);
-        return $folded ? self::rfc2425_fold($vcard) : $vcard;
-    }
-
-    /**
-     * Clear the given fields in the loaded vcard data
-     *
-     * @param array List of field names to be reset
-     */
-    public function reset($fields = null)
-    {
-        if (!$fields) {
-            $fields = array_merge(array_values(self::$fieldmap), array_keys($this->immap),
-                array('FN','N','ORG','NICKNAME','EMAIL','ADR','BDAY'));
-        }
-
-        foreach ($fields as $f) {
-            unset($this->raw[$f]);
-        }
-
-        if (!$this->raw['N']) {
-            $this->raw['N'] = array(array('','','','',''));
-        }
-        if (!$this->raw['FN']) {
-            $this->raw['FN'] = array();
-        }
-
-        $this->email = array();
-    }
-
-    /**
-     * Setter for address record fields
-     *
-     * @param string Field name
-     * @param string Field value
-     * @param string Type/section name
-     */
-    public function set($field, $value, $type = 'HOME')
-    {
-        $field   = strtolower($field);
-        $type_uc = strtoupper($type);
-
-        switch ($field) {
-        case 'name':
-        case 'displayname':
-            $this->raw['FN'][0][0] = $this->displayname = $value;
-            break;
-
-        case 'surname':
-            $this->raw['N'][0][0] = $this->surname = $value;
-            break;
-
-        case 'firstname':
-            $this->raw['N'][0][1] = $this->firstname = $value;
-            break;
-
-        case 'middlename':
-            $this->raw['N'][0][2] = $this->middlename = $value;
-            break;
-
-        case 'prefix':
-            $this->raw['N'][0][3] = $value;
-            break;
-
-        case 'suffix':
-            $this->raw['N'][0][4] = $value;
-            break;
-
-        case 'nickname':
-            $this->raw['NICKNAME'][0][0] = $this->nickname = $value;
-            break;
-
-        case 'organization':
-            $this->raw['ORG'][0][0] = $this->organization = $value;
-            break;
-
-        case 'photo':
-            if (strpos($value, 'http:') === 0) {
-                // TODO: fetch file from URL and save it locally?
-                $this->raw['PHOTO'][0] = array(0 => $value, 'url' => true);
-            }
-            else {
-                $this->raw['PHOTO'][0] = array(0 => $value, 'base64' => (bool) preg_match('![^a-z0-9/=+-]!i', $value));
-            }
-            break;
-
-        case 'email':
-            $this->raw['EMAIL'][] = array(0 => $value, 'type' => array_filter(array('INTERNET', $type_uc)));
-            $this->email[] = $value;
-            break;
-
-        case 'im':
-            // save IM subtypes into extension fields
-            $typemap = array_flip($this->immap);
-            if ($field = $typemap[strtolower($type)]) {
-                $this->raw[$field][] = array(0 => $value);
-            }
-            break;
-
-        case 'birthday':
-        case 'anniversary':
-            if (($val = rcube_utils::anytodatetime($value)) && ($fn = self::$fieldmap[$field])) {
-                $this->raw[$fn][] = array(0 => $val->format('Y-m-d'), 'value' => array('date'));
-            }
-            break;
-
-        case 'address':
-            if ($this->addresstypemap[$type_uc]) {
-                $type = $this->addresstypemap[$type_uc];
-            }
-
-            $value = $value[0] ? $value : array('', '', $value['street'], $value['locality'], $value['region'], $value['zipcode'], $value['country']);
-
-            // fall through if not empty
-            if (!strlen(join('', $value))) {
-                break;
-            }
-
-        default:
-            if ($field == 'phone' && $this->phonetypemap[$type_uc]) {
-                $type = $this->phonetypemap[$type_uc];
-             }
-
-            if (($tag = self::$fieldmap[$field]) && (is_array($value) || strlen($value))) {
-                $index = count($this->raw[$tag]);
-                $this->raw[$tag][$index] = (array)$value;
-                if ($type) {
-                    $typemap = array_flip($this->typemap);
-                    $this->raw[$tag][$index]['type'] = explode(',', ($typemap[$type_uc] ? $typemap[$type_uc] : $type));
-                }
-            }
-            break;
-        }
-    }
-
-    /**
-     * Setter for individual vcard properties
-     *
-     * @param string VCard tag name
-     * @param array Value-set of this vcard property
-     * @param boolean Set to true if the value-set should be appended instead of replacing any existing value-set
-     */
-    public function set_raw($tag, $value, $append = false)
-    {
-        $index = $append ? count($this->raw[$tag]) : 0;
-        $this->raw[$tag][$index] = (array)$value;
-    }
-
-    /**
-     * Find index with the '$type' attribute
-     *
-     * @param string Field name
-     * @return int Field index having $type set
-     */
-    private function get_type_index($field, $type = 'pref')
-    {
-        $result = 0;
-        if ($this->raw[$field]) {
-            foreach ($this->raw[$field] as $i => $data) {
-                if (is_array($data['type']) && in_array_nocase('pref', $data['type'])) {
-                    $result = $i;
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Convert a whole vcard (array) to UTF-8.
-     * If $force_charset is null, each member value that has a charset parameter will be converted
-     */
-    private static function charset_convert($card, $force_charset = null)
-    {
-        foreach ($card as $key => $node) {
-            foreach ($node as $i => $subnode) {
-                if (is_array($subnode) && (($charset = $force_charset) || ($subnode['charset'] && ($charset = $subnode['charset'][0])))) {
-                    foreach ($subnode as $j => $value) {
-                        if (is_numeric($j) && is_string($value)) {
-                            $card[$key][$i][$j] = rcube_charset::convert($value, $charset);
-                        }
-                    }
-                    unset($card[$key][$i]['charset']);
-                }
-            }
-        }
-
-        return $card;
-    }
-
-    /**
-     * Extends fieldmap definition
-     */
-    public function extend_fieldmap($map)
-    {
-        if (is_array($map)) {
-            self::$fieldmap = array_merge($map, self::$fieldmap);
-        }
-    }
-
-    /**
-     * Factory method to import a vcard file
-     *
-     * @param string vCard file content
-     *
-     * @return array List of rcube_vcard objects
-     */
-    public static function import($data)
-    {
-        $out = array();
-
-        // check if charsets are specified (usually vcard version < 3.0 but this is not reliable)
-        if (preg_match('/charset=/i', substr($data, 0, 2048))) {
-            $charset = null;
-        }
-        // detect charset and convert to utf-8
-        else if (($charset = self::detect_encoding($data)) && $charset != RCUBE_CHARSET) {
-            $data = rcube_charset::convert($data, $charset);
-            $data = preg_replace(array('/^[\xFE\xFF]{2}/', '/^\xEF\xBB\xBF/', '/^\x00+/'), '', $data); // also remove BOM
-            $charset = RCUBE_CHARSET;
-        }
-
-        $vcard_block    = '';
-        $in_vcard_block = false;
-
-        foreach (preg_split("/[\r\n]+/", $data) as $line) {
-            if ($in_vcard_block && !empty($line)) {
-                $vcard_block .= $line . "\n";
-            }
-
-            $line = trim($line);
-
-            if (preg_match('/^END:VCARD$/i', $line)) {
-                // parse vcard
-                $obj = new rcube_vcard(self::cleanup($vcard_block), $charset, true, self::$fieldmap);
-                // FN and N is required by vCard format (RFC 2426)
-                // on import we can be less restrictive, let's addressbook decide
-                if (!empty($obj->displayname) || !empty($obj->surname) || !empty($obj->firstname) || !empty($obj->email)) {
-                    $out[] = $obj;
-                }
-
-                $in_vcard_block = false;
-            }
-            else if (preg_match('/^BEGIN:VCARD$/i', $line)) {
-                $vcard_block    = $line . "\n";
-                $in_vcard_block = true;
-            }
-        }
-
-        return $out;
-    }
-
-    /**
-     * Normalize vcard data for better parsing
-     *
-     * @param string vCard block
-     *
-     * @return string Cleaned vcard block
-     */
-    public static function cleanup($vcard)
-    {
-        // convert Apple X-ABRELATEDNAMES into X-* fields for better compatibility
-        $vcard = preg_replace_callback(
-            '/item(\d+)\.(X-ABRELATEDNAMES)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w-() ]*)(?:>!\$_)?./s',
-            array('self', 'x_abrelatednames_callback'),
-            $vcard);
-
-        // Cleanup
-        $vcard = preg_replace(array(
-                // convert special types (like Skype) to normal type='skype' classes with this simple regex ;)
-                '/item(\d+)\.(TEL|EMAIL|URL)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w-() ]*)(?:>!\$_)?./s',
-                '/^item\d*\.X-AB.*$/m',  // remove cruft like item1.X-AB*
-                '/^item\d*\./m',         // remove item1.ADR instead of ADR
-                '/\n+/',                 // remove empty lines
-                '/^(N:[^;\R]*)$/m',      // if N doesn't have any semicolons, add some
-            ),
-            array(
-                '\2;type=\5\3:\4',
-                '',
-                '',
-                "\n",
-                '\1;;;;',
-            ), $vcard);
-
-        // convert X-WAB-GENDER to X-GENDER
-        if (preg_match('/X-WAB-GENDER:(\d)/', $vcard, $matches)) {
-            $value = $matches[1] == '2' ? 'male' : 'female';
-            $vcard = preg_replace('/X-WAB-GENDER:\d/', 'X-GENDER:' . $value, $vcard);
-        }
-
-        return $vcard;
-    }
-
-    private static function x_abrelatednames_callback($matches)
-    {
-        return 'X-' . strtoupper($matches[5]) . $matches[3] . ':'. $matches[4];
-    }
-
-    private static function rfc2425_fold_callback($matches)
-    {
-        // chunk_split string and avoid lines breaking multibyte characters
-        $c = 71;
-        $out .= substr($matches[1], 0, $c);
-        for ($n = $c; $c < strlen($matches[1]); $c++) {
-            // break if length > 75 or mutlibyte character starts after position 71
-            if ($n > 75 || ($n > 71 && ord($matches[1][$c]) >> 6 == 3)) {
-                $out .= "\r\n ";
-                $n = 0;
-            }
-            $out .= $matches[1][$c];
-            $n++;
-        }
-
-        return $out;
-    }
-
-    public static function rfc2425_fold($val)
-    {
-        return preg_replace_callback('/([^\n]{72,})/', array('self', 'rfc2425_fold_callback'), $val);
-    }
-
-    /**
-     * Decodes a vcard block (vcard 3.0 format, unfolded)
-     * into an array structure
-     *
-     * @param string vCard block to parse
-     *
-     * @return array Raw data structure
-     */
-    private static function vcard_decode($vcard)
-    {
-        // Perform RFC2425 line unfolding and split lines
-        $vcard = preg_replace(array("/\r/", "/\n\s+/"), '', $vcard);
-        $lines = explode("\n", $vcard);
-        $data  = array();
-
-        for ($i=0; $i < count($lines); $i++) {
-            if (!preg_match('/^([^:]+):(.+)$/', $lines[$i], $line))
-                continue;
-
-            if (preg_match('/^(BEGIN|END)$/i', $line[1]))
-                continue;
-
-            // convert 2.1-style "EMAIL;internet;home:" to 3.0-style "EMAIL;TYPE=internet;TYPE=home:"
-            if ($data['VERSION'][0] == "2.1"
-                && preg_match('/^([^;]+);([^:]+)/', $line[1], $regs2)
-                && !preg_match('/^TYPE=/i', $regs2[2])
-            ) {
-                $line[1] = $regs2[1];
-                foreach (explode(';', $regs2[2]) as $prop) {
-                    $line[1] .= ';' . (strpos($prop, '=') ? $prop : 'TYPE='.$prop);
-                }
-            }
-
-            if (preg_match_all('/([^\\;]+);?/', $line[1], $regs2)) {
-                $entry = array();
-                $field = strtoupper($regs2[1][0]);
-                $enc   = null;
-
-                foreach($regs2[1] as $attrid => $attr) {
-                    $attr = preg_replace('/[\s\t\n\r\0\x0B]/', '', $attr);
-                    if ((list($key, $value) = explode('=', $attr)) && $value) {
-                        if ($key == 'ENCODING') {
-                            $value = strtoupper($value);
-                            // add next line(s) to value string if QP line end detected
-                            if ($value == 'QUOTED-PRINTABLE') {
-                                while (preg_match('/=$/', $lines[$i])) {
-                                    $line[2] .= "\n" . $lines[++$i];
-                                }
-                            }
-                            $enc = $value;
-                        }
-                        else {
-                            $lc_key = strtolower($key);
-                            $entry[$lc_key] = array_merge((array)$entry[$lc_key], (array)self::vcard_unquote($value, ','));
-                        }
-                    }
-                    else if ($attrid > 0) {
-                        $entry[strtolower($key)] = true;  // true means attr without =value
-                    }
-                }
-
-                // decode value
-                if ($enc || !empty($entry['base64'])) {
-                    // save encoding type (#1488432)
-                    if ($enc == 'B') {
-                        $entry['encoding'] = 'B';
-                        // should we use vCard 3.0 instead?
-                        // $entry['base64'] = true;
-                    }
-                    $line[2] = self::decode_value($line[2], $enc ? $enc : 'base64');
-                }
-
-                if ($enc != 'B' && empty($entry['base64'])) {
-                    $line[2] = self::vcard_unquote($line[2]);
-                }
-
-                $entry = array_merge($entry, (array) $line[2]);
-                $data[$field][] = $entry;
-            }
-        }
-
-        unset($data['VERSION']);
-        return $data;
-    }
-
-    /**
-     * Decode a given string with the encoding rule from ENCODING attributes
-     *
-     * @param string String to decode
-     * @param string Encoding type (quoted-printable and base64 supported)
-     *
-     * @return string Decoded 8bit value
-     */
-    private static function decode_value($value, $encoding)
-    {
-        switch (strtolower($encoding)) {
-        case 'quoted-printable':
-            self::$values_decoded = true;
-            return quoted_printable_decode($value);
-
-        case 'base64':
-        case 'b':
-            self::$values_decoded = true;
-            return base64_decode($value);
-
-        default:
-            return $value;
-        }
-    }
-
-    /**
-     * Encodes an entry for storage in our database (vcard 3.0 format, unfolded)
-     *
-     * @param array Raw data structure to encode
-     *
-     * @return string vCard encoded string
-     */
-    static function vcard_encode($data)
-    {
-        foreach ((array)$data as $type => $entries) {
-            // valid N has 5 properties
-            while ($type == "N" && is_array($entries[0]) && count($entries[0]) < 5) {
-                $entries[0][] = "";
-            }
-
-            // make sure FN is not empty (required by RFC2426)
-            if ($type == "FN" && empty($entries)) {
-                $entries[0] = $data['EMAIL'][0][0];
-            }
-
-            foreach ((array)$entries as $entry) {
-                $attr = '';
-                if (is_array($entry)) {
-                    $value = array();
-                    foreach ($entry as $attrname => $attrvalues) {
-                        if (is_int($attrname)) {
-                            if (!empty($entry['base64']) || $entry['encoding'] == 'B') {
-                                $attrvalues = base64_encode($attrvalues);
-                            }
-                            $value[] = $attrvalues;
-                        }
-                        else if (is_bool($attrvalues)) {
-                            // true means just a tag, not tag=value, as in PHOTO;BASE64:...
-                            if ($attrvalues) {
-                                // vCard v3 uses ENCODING=B (#1489183)
-                                if ($attrname == 'base64') {
-                                    $attr .= ";ENCODING=B";
-                                }
-                                else {
-                                    $attr .= strtoupper(";$attrname");
-                                }
-                            }
-                        }
-                        else {
-                            foreach((array)$attrvalues as $attrvalue) {
-                                $attr .= strtoupper(";$attrname=") . self::vcard_quote($attrvalue, ',');
-                            }
-                        }
-                    }
-                }
-                else {
-                    $value = $entry;
-                }
-
-                // skip empty entries
-                if (self::is_empty($value)) {
-                    continue;
-                }
-
-                $vcard .= self::vcard_quote($type) . $attr . ':' . self::vcard_quote($value) . self::$eol;
-            }
-        }
-
-        return 'BEGIN:VCARD' . self::$eol . 'VERSION:3.0' . self::$eol . $vcard . 'END:VCARD';
-    }
-
-    /**
-     * Join indexed data array to a vcard quoted string
-     *
-     * @param array Field data
-     * @param string Separator
-     *
-     * @return string Joined and quoted string
-     */
-    public static function vcard_quote($s, $sep = ';')
-    {
-        if (is_array($s)) {
-            foreach($s as $part) {
-                $r[] = self::vcard_quote($part, $sep);
-            }
-            return(implode($sep, (array)$r));
-        }
-
-        return strtr($s, array('\\' => '\\\\', "\r" => '', "\n" => '\n', $sep => '\\'.$sep));
-    }
-
-    /**
-     * Split quoted string
-     *
-     * @param string vCard string to split
-     * @param string Separator char/string
-     *
-     * @return array List with splited values
-     */
-    private static function vcard_unquote($s, $sep = ';')
-    {
-        // break string into parts separated by $sep
-        if (!empty($sep)) {
-            // Handle properly backslash escaping (#1488896)
-            $rep1 = array("\\\\" => "\010", "\\$sep" => "\007");
-            $rep2 = array("\007" => "\\$sep", "\010" => "\\\\");
-
-            if (count($parts = explode($sep, strtr($s, $rep1))) > 1) {
-                foreach ($parts as $s) {
-                    $result[] = self::vcard_unquote(strtr($s, $rep2));
-                }
-                return $result;
-            }
-
-            $s = trim(strtr($s, $rep2));
-        }
-
-        // some implementations (GMail) use non-standard backslash before colon (#1489085)
-        // we will handle properly any backslashed character - removing dummy backslahes
-        // return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\N' => "\n", '\,' => ',', '\;' => ';'));
-
-        $s   = str_replace("\r", '', $s);
-        $pos = 0;
-
-        while (($pos = strpos($s, '\\', $pos)) !== false) {
-            $next = substr($s, $pos + 1, 1);
-            if ($next == 'n' || $next == 'N') {
-                $s = substr_replace($s, "\n", $pos, 2);
-            }
-            else {
-                $s = substr_replace($s, '', $pos, 1);
-            }
-
-            $pos += 1;
-        }
-
-        return $s;
-    }
-
-    /**
-     * Check if vCard entry is empty: empty string or an array with
-     * all entries empty.
-     *
-     * @param mixed $value Attribute value (string or array)
-     *
-     * @return bool True if the value is empty, False otherwise
-     */
-    private static function is_empty($value)
-    {
-        foreach ((array)$value as $v) {
-            if (((string)$v) !== '') {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Extract array values by a filter
-     *
-     * @param array Array to filter
-     * @param keys Array or comma separated list of values to keep
-     * @param boolean Invert key selection: remove the listed values
-     *
-     * @return array The filtered array
-     */
-    private static function array_filter($arr, $values, $inverse = false)
-    {
-        if (!is_array($values)) {
-            $values = explode(',', $values);
-        }
-
-        $result = array();
-        $keep   = array_flip((array)$values);
-
-        foreach ($arr as $key => $val) {
-            if ($inverse != isset($keep[strtolower($val)])) {
-                $result[$key] = $val;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns UNICODE type based on BOM (Byte Order Mark)
-     *
-     * @param string Input string to test
-     *
-     * @return string Detected encoding
-     */
-    private static function detect_encoding($string)
-    {
-        $fallback = rcube::get_instance()->config->get('default_charset', 'ISO-8859-1'); // fallback to Latin-1
-
-        return rcube_charset::detect($string, $fallback);
-    }
-}
diff --git a/lib/ext/Roundcube/rcube_washtml.php b/lib/ext/Roundcube/rcube_washtml.php
deleted file mode 100644
index e746754..0000000
--- a/lib/ext/Roundcube/rcube_washtml.php
+++ /dev/null
@@ -1,499 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Utility class providing HTML sanityzer (based on Washtml class)     |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- | Author: Frederic Motte <fmotte@ubixis.com>                            |
- +-----------------------------------------------------------------------+
- */
-
-/**
- *                Washtml, a HTML sanityzer.
- *
- * Copyright (c) 2007 Frederic Motte <fmotte@ubixis.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * OVERVIEW:
- *
- * Wahstml take an untrusted HTML and return a safe html string.
- *
- * SYNOPSIS:
- *
- * $washer = new washtml($config);
- * $washer->wash($html);
- * It return a sanityzed string of the $html parameter without html and head tags.
- * $html is a string containing the html code to wash.
- * $config is an array containing options:
- *   $config['allow_remote'] is a boolean to allow link to remote images.
- *   $config['blocked_src'] string with image-src to be used for blocked remote images
- *   $config['show_washed'] is a boolean to include washed out attributes as x-washed
- *   $config['cid_map'] is an array where cid urls index urls to replace them.
- *   $config['charset'] is a string containing the charset of the HTML document if it is not defined in it.
- * $washer->extlinks is a reference to a boolean that is set to true if remote images were removed. (FE: show remote images link)
- *
- * INTERNALS:
- *
- * Only tags and attributes in the static lists $html_elements and $html_attributes
- * are kept, inline styles are also filtered: all style identifiers matching
- * /[a-z\-]/i are allowed. Values matching colors, sizes, /[a-z\-]/i and safe
- * urls if allowed and cid urls if mapped are kept.
- *
- * Roundcube Changes:
- * - added $block_elements
- * - changed $ignore_elements behaviour
- * - added RFC2397 support
- * - base URL support
- * - invalid HTML comments removal before parsing
- * - "fixing" unitless CSS values for XHTML output
- * - base url resolving
- */
-
-/**
- * Utility class providing HTML sanityzer
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_washtml
-{
-    /* Allowed HTML elements (default) */
-    static $html_elements = array('a', 'abbr', 'acronym', 'address', 'area', 'b',
-        'basefont', 'bdo', 'big', 'blockquote', 'br', 'caption', 'center',
-        'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl',
-        'dt', 'em', 'fieldset', 'font', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i',
-        'ins', 'label', 'legend', 'li', 'map', 'menu', 'nobr', 'ol', 'p', 'pre', 'q',
-        's', 'samp', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'table',
-        'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'wbr', 'img',
-        // form elements
-        'button', 'input', 'textarea', 'select', 'option', 'optgroup'
-    );
-
-    /* Ignore these HTML tags and their content */
-    static $ignore_elements = array('script', 'applet', 'embed', 'object', 'style');
-
-    /* Allowed HTML attributes */
-    static $html_attribs = array('name', 'class', 'title', 'alt', 'width', 'height',
-        'align', 'nowrap', 'col', 'row', 'id', 'rowspan', 'colspan', 'cellspacing',
-        'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight',
-        'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border',
-        'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace',
-        'cellborder', 'size', 'lang', 'dir', 'usemap', 'shape', 'media',
-        // attributes of form elements
-        'type', 'rows', 'cols', 'disabled', 'readonly', 'checked', 'multiple', 'value'
-    );
-
-    /* Elements which could be empty and be returned in short form (<tag />) */
-    static $void_elements = array('area', 'base', 'br', 'col', 'command', 'embed', 'hr',
-        'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'
-    );
-
-    /* State for linked objects in HTML */
-    public $extlinks = false;
-
-    /* Current settings */
-    private $config = array();
-
-    /* Registered callback functions for tags */
-    private $handlers = array();
-
-    /* Allowed HTML elements */
-    private $_html_elements = array();
-
-    /* Ignore these HTML tags but process their content */
-    private $_ignore_elements = array();
-
-    /* Elements which could be empty and be returned in short form (<tag />) */
-    private $_void_elements = array();
-
-    /* Allowed HTML attributes */
-    private $_html_attribs = array();
-
-    /* Max nesting level */
-    private $max_nesting_level;
-
-
-    /**
-     * Class constructor
-     */
-    public function __construct($p = array())
-    {
-        $this->_html_elements   = array_flip((array)$p['html_elements']) + array_flip(self::$html_elements) ;
-        $this->_html_attribs    = array_flip((array)$p['html_attribs']) + array_flip(self::$html_attribs);
-        $this->_ignore_elements = array_flip((array)$p['ignore_elements']) + array_flip(self::$ignore_elements);
-        $this->_void_elements   = array_flip((array)$p['void_elements']) + array_flip(self::$void_elements);
-
-        unset($p['html_elements'], $p['html_attribs'], $p['ignore_elements'], $p['void_elements']);
-
-        $this->config = $p + array('show_washed' => true, 'allow_remote' => false, 'cid_map' => array());
-    }
-
-    /**
-     * Register a callback function for a certain tag
-     */
-    public function add_callback($tagName, $callback)
-    {
-        $this->handlers[$tagName] = $callback;
-    }
-
-    /**
-     * Check CSS style
-     */
-    private function wash_style($style)
-    {
-        $s = '';
-
-        foreach (explode(';', $style) as $declaration) {
-            if (preg_match('/^\s*([a-z\-]+)\s*:\s*(.*)\s*$/i', $declaration, $match)) {
-                $cssid = $match[1];
-                $str   = $match[2];
-                $value = '';
-
-                while (sizeof($str) > 0 &&
-                    preg_match('/^(url\(\s*[\'"]?([^\'"\)]*)[\'"]?\s*\)'./*1,2*/
-                        '|rgb\(\s*[0-9]+\s*,\s*[0-9]+\s*,\s*[0-9]+\s*\)'.
-                        '|-?[0-9.]+\s*(em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)?'.
-                        '|#[0-9a-f]{3,6}'.
-                        '|[a-z0-9", -]+'.
-                        ')\s*/i', $str, $match)
-                ) {
-                    if ($match[2]) {
-                        if (($src = $this->config['cid_map'][$match[2]])
-                            || ($src = $this->config['cid_map'][$this->config['base_url'].$match[2]])
-                        ) {
-                            $value .= ' url('.htmlspecialchars($src, ENT_QUOTES) . ')';
-                        }
-                        else if (preg_match('!^(https?:)?//[a-z0-9/._+-]+$!i', $match[2], $url)) {
-                            if ($this->config['allow_remote']) {
-                                $value .= ' url('.htmlspecialchars($url[0], ENT_QUOTES).')';
-                            }
-                            else {
-                                $this->extlinks = true;
-                            }
-                        }
-                        else if (preg_match('/^data:.+/i', $match[2])) { // RFC2397
-                            $value .= ' url('.htmlspecialchars($match[2], ENT_QUOTES).')';
-                        }
-                    }
-                    else {
-                        // whitelist ?
-                        $value .= ' ' . $match[0];
-
-                        // #1488535: Fix size units, so width:800 would be changed to width:800px
-                        if (preg_match('/(left|right|top|bottom|width|height)/i', $cssid)
-                            && preg_match('/^[0-9]+$/', $match[0])
-                        ) {
-                            $value .= 'px';
-                        }
-                    }
-
-                    $str = substr($str, strlen($match[0]));
-                }
-
-                if (isset($value[0])) {
-                    $s .= ($s?' ':'') . $cssid . ':' . $value . ';';
-                }
-            }
-        }
-
-        return $s;
-    }
-
-    /**
-     * Take a node and return allowed attributes and check values
-     */
-    private function wash_attribs($node)
-    {
-        $t = '';
-        $washed = '';
-
-        foreach ($node->attributes as $key => $plop) {
-            $key   = strtolower($key);
-            $value = $node->getAttribute($key);
-
-            if (isset($this->_html_attribs[$key]) ||
-                ($key == 'href' && ($value = trim($value))
-                    && !preg_match('!^(javascript|vbscript|data:text)!i', $value)
-                    && preg_match('!^([a-z][a-z0-9.+-]+:|//|#).+!i', $value))
-            ) {
-                $t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
-            }
-            else if ($key == 'style' && ($style = $this->wash_style($value))) {
-                $quot = strpos($style, '"') !== false ? "'" : '"';
-                $t .= ' style=' . $quot . $style . $quot;
-            }
-            else if ($key == 'background' || ($key == 'src' && strtolower($node->tagName) == 'img')) { //check tagName anyway
-                if (($src = $this->config['cid_map'][$value])
-                    || ($src = $this->config['cid_map'][$this->config['base_url'].$value])
-                ) {
-                    $t .= ' ' . $key . '="' . htmlspecialchars($src, ENT_QUOTES) . '"';
-                }
-                else if (preg_match('/^(http|https|ftp):.+/i', $value)) {
-                    if ($this->config['allow_remote']) {
-                        $t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
-                    }
-                    else {
-                        $this->extlinks = true;
-                        if ($this->config['blocked_src']) {
-                            $t .= ' ' . $key . '="' . htmlspecialchars($this->config['blocked_src'], ENT_QUOTES) . '"';
-                        }
-                    }
-                }
-                else if (preg_match('/^data:.+/i', $value)) { // RFC2397
-                    $t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
-                }
-            }
-            else {
-                $washed .= ($washed ? ' ' : '') . $key;
-            }
-        }
-
-        return $t . ($washed && $this->config['show_washed'] ? ' x-washed="'.$washed.'"' : '');
-    }
-
-    /**
-     * The main loop that recurse on a node tree.
-     * It output only allowed tags with allowed attributes
-     * and allowed inline styles
-     */
-    private function dumpHtml($node, $level = 0)
-    {
-        if (!$node->hasChildNodes()) {
-            return '';
-        }
-
-        $level++;
-
-        if ($this->max_nesting_level > 0 && $level == $this->max_nesting_level - 1) {
-            // log error message once
-            if (!$this->max_nesting_level_error) {
-                $this->max_nesting_level_error = true;
-                rcube::raise_error(array('code' => 500, 'type' => 'php',
-                    'line' => __LINE__, 'file' => __FILE__,
-                    'message' => "Maximum nesting level exceeded (xdebug.max_nesting_level={$this->max_nesting_level})"),
-                    true, false);
-            }
-            return '<!-- ignored -->';
-        }
-
-        $node = $node->firstChild;
-        $dump = '';
-
-        do {
-            switch($node->nodeType) {
-            case XML_ELEMENT_NODE: //Check element
-                $tagName = strtolower($node->tagName);
-                if ($callback = $this->handlers[$tagName]) {
-                    $dump .= call_user_func($callback, $tagName,
-                        $this->wash_attribs($node), $this->dumpHtml($node, $level), $this);
-                }
-                else if (isset($this->_html_elements[$tagName])) {
-                    $content = $this->dumpHtml($node, $level);
-                    $dump .= '<' . $tagName . $this->wash_attribs($node) .
-                        ($content === '' && isset($this->_void_elements[$tagName]) ? ' />' : ">$content</$tagName>");
-                }
-                else if (isset($this->_ignore_elements[$tagName])) {
-                    $dump .= '<!-- ' . htmlspecialchars($tagName, ENT_QUOTES) . ' not allowed -->';
-                }
-                else {
-                    $dump .= '<!-- ' . htmlspecialchars($tagName, ENT_QUOTES) . ' ignored -->';
-                    $dump .= $this->dumpHtml($node, $level); // ignore tags not its content
-                }
-                break;
-
-            case XML_CDATA_SECTION_NODE:
-                $dump .= $node->nodeValue;
-                break;
-
-            case XML_TEXT_NODE:
-                $dump .= htmlspecialchars($node->nodeValue);
-                break;
-
-            case XML_HTML_DOCUMENT_NODE:
-                $dump .= $this->dumpHtml($node, $level);
-                break;
-
-            case XML_DOCUMENT_TYPE_NODE:
-                break;
-
-            default:
-                $dump .= '<!-- node type ' . $node->nodeType . ' -->';
-            }
-        } while($node = $node->nextSibling);
-
-        return $dump;
-    }
-
-    /**
-     * Main function, give it untrusted HTML, tell it if you allow loading
-     * remote images and give it a map to convert "cid:" urls.
-     */
-    public function wash($html)
-    {
-        // Charset seems to be ignored (probably if defined in the HTML document)
-        $node = new DOMDocument('1.0', $this->config['charset']);
-        $this->extlinks = false;
-
-        $html = $this->cleanup($html);
-
-        // Find base URL for images
-        if (preg_match('/<base\s+href=[\'"]*([^\'"]+)/is', $html, $matches)) {
-            $this->config['base_url'] = $matches[1];
-        }
-        else {
-            $this->config['base_url'] = '';
-        }
-
-        // Detect max nesting level (for dumpHTML) (#1489110)
-        $this->max_nesting_level = (int) @ini_get('xdebug.max_nesting_level');
-
-        // Use optimizations if supported
-        if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-            @$node->loadHTML($html, LIBXML_PARSEHUGE | LIBXML_COMPACT);
-        }
-        else {
-            @$node->loadHTML($html);
-        }
-
-        return $this->dumpHtml($node);
-    }
-
-    /**
-     * Getter for config parameters
-     */
-    public function get_config($prop)
-    {
-        return $this->config[$prop];
-    }
-
-    /**
-     * Clean HTML input
-     */
-    private function cleanup($html)
-    {
-        // special replacements (not properly handled by washtml class)
-        $html_search = array(
-            '/(<\/nobr>)(\s+)(<nobr>)/i',       // space(s) between <NOBR>
-            '/<title[^>]*>[^<]*<\/title>/i',    // PHP bug #32547 workaround: remove title tag
-            '/^(\0\0\xFE\xFF|\xFF\xFE\0\0|\xFE\xFF|\xFF\xFE|\xEF\xBB\xBF)/',    // byte-order mark (only outlook?)
-            '/<html\s[^>]+>/i',                 // washtml/DOMDocument cannot handle xml namespaces
-        );
-
-        $html_replace = array(
-            '\\1'.' &nbsp; '.'\\3',
-            '',
-            '',
-            '<html>',
-        );
-        $html = preg_replace($html_search, $html_replace, trim($html));
-
-        //-> Replace all of those weird MS Word quotes and other high characters
-        $badwordchars=array(
-            "\xe2\x80\x98", // left single quote
-            "\xe2\x80\x99", // right single quote
-            "\xe2\x80\x9c", // left double quote
-            "\xe2\x80\x9d", // right double quote
-            "\xe2\x80\x94", // em dash
-            "\xe2\x80\xa6" // elipses
-        );
-        $fixedwordchars=array(
-            "'",
-            "'",
-            '"',
-            '"',
-            '&mdash;',
-            '...'
-        );
-        $html = str_replace($badwordchars,$fixedwordchars, $html);
-
-        // PCRE errors handling (#1486856), should we use something like for every preg_* use?
-        if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) {
-            $errstr = "Could not clean up HTML message! PCRE Error: $preg_error.";
-
-            if ($preg_error == PREG_BACKTRACK_LIMIT_ERROR) {
-                $errstr .= " Consider raising pcre.backtrack_limit!";
-            }
-            if ($preg_error == PREG_RECURSION_LIMIT_ERROR) {
-                $errstr .= " Consider raising pcre.recursion_limit!";
-            }
-
-            rcube::raise_error(array('code' => 620, 'type' => 'php',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => $errstr), true, false);
-
-            return '';
-        }
-
-        // fix (unknown/malformed) HTML tags before "wash"
-        $html = preg_replace_callback('/(<(?!\!)[\/]*)([^\s>]+)/', array($this, 'html_tag_callback'), $html);
-
-        // Remove invalid HTML comments (#1487759)
-        // Don't remove valid conditional comments
-        // Don't remove MSOutlook (<!-->) conditional comments (#1489004)
-        $html = preg_replace('/<!--[^->\[\n]+>/', '', $html);
-
-        // turn relative into absolute urls
-        $html = self::resolve_base($html);
-
-        return $html;
-    }
-
-    /**
-     * Callback function for HTML tags fixing
-     */
-    public static function html_tag_callback($matches)
-    {
-        $tagname = $matches[2];
-        $tagname = preg_replace(array(
-            '/:.*$/',               // Microsoft's Smart Tags <st1:xxxx>
-            '/[^a-z0-9_\[\]\!-]/i', // forbidden characters
-        ), '', $tagname);
-
-        return $matches[1] . $tagname;
-    }
-
-    /**
-     * Convert all relative URLs according to a <base> in HTML
-     */
-    public static function resolve_base($body)
-    {
-        // check for <base href=...>
-        if (preg_match('!(<base.*href=["\']?)([hftps]{3,5}://[a-z0-9/.%-]+)!i', $body, $regs)) {
-            $replacer = new rcube_base_replacer($regs[2]);
-            $body     = $replacer->replace($body);
-        }
-
-        return $body;
-    }
-}
-
diff --git a/lib/init.php b/lib/init.php
index 2ff13a1..ff261e4 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -1,40 +1,45 @@
 <?php
 
 /**
  +--------------------------------------------------------------------------+
  | Kolab File API                                                           |
  |                                                                          |
  | Copyright (C) 2011-2012, Kolab Systems AG <contact@kolabsys.com>         |
  |                                                                          |
  | This program is free software: you can redistribute it and/or modify     |
  | it under the terms of the GNU Affero General Public License as published |
  | by the Free Software Foundation, either version 3 of the License, or     |
  | (at your option) any later version.                                      |
  |                                                                          |
  | This program is distributed in the hope that it will be useful,          |
  | but WITHOUT ANY WARRANTY; without even the implied warranty of           |
  | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |
  | GNU Affero General Public License for more details.                      |
  |                                                                          |
  | You should have received a copy of the GNU Affero General Public License |
  | along with this program. If not, see <http://www.gnu.org/licenses/>      |
  +--------------------------------------------------------------------------+
  | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
  +--------------------------------------------------------------------------+
 */
 
 // Roundcube Framework constants
 define('FILE_API_START', microtime(true));
 define('RCUBE_INSTALL_PATH', realpath(__DIR__) . '/../');
 define('RCUBE_CONFIG_DIR', RCUBE_INSTALL_PATH . 'config/');
 define('RCUBE_PLUGINS_DIR', RCUBE_INSTALL_PATH . 'lib/drivers/kolab/plugins');
 
 // Define include path
 $include_path  = RCUBE_INSTALL_PATH . '/lib' . PATH_SEPARATOR;
-$include_path .= RCUBE_INSTALL_PATH . '/lib/ext' . PATH_SEPARATOR;
+$include_path  = RCUBE_INSTALL_PATH . '/lib/ext' . PATH_SEPARATOR;
 $include_path .= RCUBE_INSTALL_PATH . '/lib/client' . PATH_SEPARATOR;
 $include_path .= ini_get('include_path');
 set_include_path($include_path);
 
+// include composer autoloader (if available)
+if (@file_exists(RCUBE_INSTALL_PATH . 'vendor/autoload.php')) {
+    require RCUBE_INSTALL_PATH . 'vendor/autoload.php';
+}
+
 // include global functions from Roundcube Framework
 require_once 'Roundcube/bootstrap.php';