diff --git a/.gitignore b/.gitignore index 7b69a62d3..b9a13560a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,15 @@ /.idea +/api.php /error.log /nbproject /npm-debug.log /rainloop.sublime-project /rainloop.sublime-workspace +/rainloop/v/0.0.0/static/fonts/* +!/rainloop/v/0.0.0/static/fonts/.gitempty +/rainloop/v/0.0.0/static/svg/* +!/rainloop/v/0.0.0/static/svg/.gitempty /rainloop/v/0.0.0/static/css/*.css -/rainloop/v/0.0.0/static/js/*.js /rainloop/v/0.0.0/static/js/**/*.js /node_modules /build/local diff --git a/.jshintrc b/.jshintrc index 25fd75f03..969b1a4ad 100644 --- a/.jshintrc +++ b/.jshintrc @@ -51,6 +51,7 @@ "jquery" : true, "globals": { + "RL_COMMUNITY" : true, "module" : true, "require" : true, "ko" : true, diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..4b6c3357f --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,7 @@ +Thanks for contributing to RainLoop Webmail! + +1. Sign the CLA (individual or corporate) at . +2. Fork the repo, do work in a feature branch. +3. Issue a pull request. + +If you have any questions, open an issue or email [support@rainloop.net](mailto:support@rainloop.net). \ No newline at end of file diff --git a/LICENSE b/LICENSE index 70fc6a921..2def0e883 100644 --- a/LICENSE +++ b/LICENSE @@ -1,25 +1,661 @@ -Creative Commons — Attribution-NonCommercial-ShareAlike 3.0 Unported — CC BY-NC-SA 3.0 -(http://creativecommons.org/licenses/by-nc-sa/3.0/) + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 -You are free: + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. - to Share — to copy, distribute and transmit the work - to Remix — to adapt the work + Preamble -Under the following conditions: + 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. - Attribution — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work). - Noncommercial — You may not use this work for commercial purposes. - Share Alike — If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one. + 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. -With the understanding that: + 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. - Waiver — Any of the above conditions can be waived if you get permission from the copyright holder. - Public Domain — Where the work or any of its elements is in the public domain under applicable law, that status is in no way affected by the license. + 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. -Other Rights — In no way are any of the following rights affected by the license: - Your fair dealing or fair use rights, or other applicable copyright exceptions and limitations; - The author's moral rights; - Rights other persons may have either in the work itself or in how the work is used, such as publicity or privacy rights. + 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. -Notice — For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page. \ No newline at end of file + 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. + + + Copyright (C) + + 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 . + +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 +. \ No newline at end of file diff --git a/README.md b/README.md index 0d358d727..96b3c1c2e 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,13 @@ RainLoop Webmail ================== -[![Join the chat at https://gitter.im/RainLoop/rainloop-webmail](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/RainLoop/rainloop-webmail?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - Simple, modern & fast web-based email client. Modest system requirements, decent performance, simple installation and upgrade, no database required - all these make RainLoop Webmail a perfect choice for your email solution. -For more information about the product, check [http://rainloop.net](http://rainloop.net). +For more information about the product, check [rainloop.net](http://www.rainloop.net/). -Information about installing the product, check the [documentation page](http://rainloop.net/docs/installation/). +Information about installing the product, check the [documentation page](http://www.rainloop.net/docs/installation/). ## Attention @@ -18,7 +16,8 @@ It's not recommended to use in production environment. ## License -**Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0)** -http://creativecommons.org/licenses/by-nc-sa/3.0/ +**RainLoop Webmail (Community edition)** is released under +**GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**. +http://www.gnu.org/licenses/agpl-3.0.html Copyright (c) 2015 Rainloop Team diff --git a/_include.php b/_include.php index eefd7e088..b615511b3 100644 --- a/_include.php +++ b/_include.php @@ -10,3 +10,12 @@ function __get_custom_data_full_path() return ''; return '/var/external-rainloop-data-folder/'; // custom data folder path } + +/** + * @return string + */ +function __get_additional_configuration_name() +{ + return ''; + return defined('APP_SITE') && 0 < strlen(APP_SITE) ? APP_SITE.'.ini' : ''; // additional configuration file name +} diff --git a/build/langs.php b/build/langs.php index 9d6248989..339c8bc88 100644 --- a/build/langs.php +++ b/build/langs.php @@ -48,7 +48,7 @@ function saveLangStructure($sLangFile, $aLang) } } - \file_put_contents(LANGS_PATH.'/'.$sLangFile, implode("\n", $aResultLines)); + \file_put_contents(LANGS_PATH.'/'.$sLangFile, implode("\n", $aResultLines)."\n"); } $sNL = "\n"; diff --git a/build/owncloud/rainloop-app/appinfo/info.xml b/build/owncloud/rainloop-app/appinfo/info.xml index 7ec7dbdd9..84b506124 100644 --- a/build/owncloud/rainloop-app/appinfo/info.xml +++ b/build/owncloud/rainloop-app/appinfo/info.xml @@ -4,7 +4,7 @@ RainLoop Simple, modern and fast web-based email client. 0.0 - CC BY-NC-SA 3.0 + RainLoop Team 6.0 diff --git a/build/test.php b/build/test.php new file mode 100644 index 000000000..e5e1422dd --- /dev/null +++ b/build/test.php @@ -0,0 +1,19 @@ + iMinWidth ? iWidth : iMinWidth); } }, + fResizeCreateFunction = function (oEvent) { + if (oEvent && oEvent.target) + { + var oResizableHandle = $(oEvent.target).find('.ui-resizable-handle'); - fResizeFunction = function (oEvent, oObject) { + oResizableHandle + .on('mousedown', function () { + Globals.$html.addClass('rl-resizer'); + }) + .on('mouseup', function () { + Globals.$html.removeClass('rl-resizer'); + }) + ; + } + }, + fResizeResizeFunction = _.debounce(function () { + Globals.$html.addClass('rl-resizer'); + }, 500, true), + fResizeStartFunction = function () { + Globals.$html.addClass('rl-resizer'); + }, + fResizeStopFunction = function (oEvent, oObject) { + Globals.$html.removeClass('rl-resizer'); if (oObject && oObject.size && oObject.size.width) { Local.set(sClientSideKeyName, oObject.size.width); @@ -1210,7 +1243,10 @@ 'minWidth': iMinWidth, 'maxWidth': 350, 'handles': 'e', - 'stop': fResizeFunction + 'create': fResizeCreateFunction, + 'resize': fResizeResizeFunction, + 'start': fResizeStartFunction, + 'stop': fResizeStopFunction }); Events.sub('left-panel.off', function () { @@ -1271,9 +1307,9 @@ { kn.hideLoading(); - if (SimplePace) + if (progressJs) { - SimplePace.set(100); + progressJs().end(); } }; @@ -1291,16 +1327,16 @@ self = this, $LAB = require('$LAB'), sJsHash = Settings.settingsGet('JsHash'), + sStartupUrl = Utils.pString(Settings.settingsGet('StartupUrl')), iContactsSyncInterval = Utils.pInt(Settings.settingsGet('ContactsSyncInterval')), bGoogle = Settings.settingsGet('AllowGoogleSocial'), bFacebook = Settings.settingsGet('AllowFacebookSocial'), bTwitter = Settings.settingsGet('AllowTwitterSocial') ; - if (SimplePace) + if (progressJs) { - SimplePace.set(70); - SimplePace.sleep(); + progressJs().set(70); } Globals.leftPanelDisabled.subscribe(function (bValue) { @@ -1332,10 +1368,26 @@ if (bValue) { + if ('' !== sStartupUrl) + { + kn.routeOff(); + kn.setHash(Links.root(sStartupUrl), true); + kn.routeOn(); + } + if ($LAB && window.crypto && window.crypto.getRandomValues && Settings.capa(Enums.Capa.OpenPGP)) { var fOpenpgpCallback = function (openpgp) { + PgpStore.openpgp = openpgp; + + if (window.Worker) + { + PgpStore.openpgp.initWorker(Links.openPgpWorkerJs()); + } + +// PgpStore.openpgp.config.useWebCrypto = false; + PgpStore.openpgpKeyring = new openpgp.Keyring(); PgpStore.capaOpenPGP(true); @@ -1365,8 +1417,8 @@ kn.startScreens([ require('Screen/User/MailBox'), - require('Screen/User/Settings'), - require('Screen/User/About') + Settings.capa(Enums.Capa.Settings) ? require('Screen/User/Settings') : null, + false ? require('Screen/User/About') : null ]); if (bGoogle || bFacebook || bTwitter) @@ -1386,7 +1438,7 @@ } }); - Events.sub('interval.5m-after5m', function () { + Events.sub('interval.2m-after5m', function () { self.folderInformationMultiply(); }); @@ -1445,7 +1497,9 @@ }, 1000); } - if (!!Settings.settingsGet('AccountSignMe') && window.navigator.registerProtocolHandler) + if (!!Settings.settingsGet('AccountSignMe') && + window.navigator.registerProtocolHandler && + Settings.capa(Enums.Capa.Composer)) { _.delay(function () { try { @@ -1467,7 +1521,7 @@ self.initVerticalLayoutResizer(Enums.ClientSideKeyName.FolderListSize); }); - if (Tinycon) + if (Tinycon && Settings.settingsGet('FaviconStatus') && !Settings.settingsGet('Filtered') ) { Tinycon.setOptions({ fallback: false @@ -1481,7 +1535,7 @@ } else { - this.bootstartLoginScreen(); + this.logout(); } }, self)); diff --git a/dev/Common/Audio.js b/dev/Common/Audio.js index 8e437fc88..13863510d 100644 --- a/dev/Common/Audio.js +++ b/dev/Common/Audio.js @@ -74,9 +74,7 @@ // Audio.prototype.record = function () // { // this.getUserMedia({audio:true}, function () { -// window.console.log(arguments); // }, function(oError) { -// window.console.log(arguments); // }); // }; diff --git a/dev/Common/Cache.js b/dev/Common/Cache.js index bacc24b80..86dc950e9 100644 --- a/dev/Common/Cache.js +++ b/dev/Common/Cache.js @@ -204,7 +204,10 @@ */ CacheUserStorage.prototype.setFolderHash = function (sFolderFullNameRaw, sFolderHash) { - this.oFolderHashCache[sFolderFullNameRaw] = sFolderHash; + if ('' !== sFolderFullNameRaw) + { + this.oFolderHashCache[sFolderFullNameRaw] = sFolderHash; + } }; /** diff --git a/dev/Common/Enums.js b/dev/Common/Enums.js index 36c56ad5e..7dd46a727 100644 --- a/dev/Common/Enums.js +++ b/dev/Common/Enums.js @@ -22,6 +22,7 @@ 'Sheet': 'sheet', 'Presentation': 'presentation', 'Certificate': 'certificate', + 'CertificateBin': 'certificate-bin', 'Archive': 'archive' }; @@ -71,6 +72,18 @@ 'OpenPGP': 'OPEN_PGP', 'Prefetch': 'PREFETCH', 'Gravatar': 'GRAVATAR', + 'Folders': 'FOLDERS', + 'Composer': 'COMPOSER', + 'Contacts': 'CONTACTS', + 'Reload': 'RELOAD', + 'Search': 'SEARCH', + 'SearchAdv': 'SEARCH_ADV', + 'MessageActions': 'MESSAGE_ACTIONS', + 'MessageListActions': 'MESSAGELIST_ACTIONS', + 'AttachmentsActions': 'ATTACHMENTS_ACTIONS', + 'DangerousActions': 'DANGEROUS_ACTIONS', + 'Settings': 'SETTINGS', + 'Help': 'HELP', 'Themes': 'THEMES', 'UserBackground': 'USER_BACKGROUND', 'Sieve': 'SIEVE', @@ -78,7 +91,8 @@ 'AttachmentThumbnails': 'ATTACHMENT_THUMBNAILS', 'Templates': 'TEMPLATES', 'AutoLogout': 'AUTOLOGOUT', - 'AdditionalAccounts': 'ADDITIONAL_ACCOUNTS' + 'AdditionalAccounts': 'ADDITIONAL_ACCOUNTS', + 'Identities': 'IDENTITIES' }; /** @@ -95,6 +109,7 @@ 'Settings': 'settings', 'Menu': 'menu', 'PopupComposeOpenPGP': 'compose-open-pgp', + 'PopupMessageOpenPGP': 'message-open-pgp', 'PopupKeyboardShortcutsHelp': 'popup-keyboard-shortcuts-help', 'PopupAsk': 'popup-ask' }; @@ -113,6 +128,21 @@ 'User': 99 }; + /** + * @enum {number} + */ + Enums.ServerFolderType = { + 'USER': 0, + 'INBOX': 1, + 'SENT': 2, + 'DRAFTS': 3, + 'JUNK': 4, + 'TRASH': 5, + 'IMPORTANT': 10, + 'FLAGGED': 11, + 'ALL': 12 + }; + /** * @enum {string} */ @@ -305,7 +335,9 @@ Enums.FilterConditionField = { 'From': 'From', 'Recipient': 'Recipient', - 'Subject': 'Subject' + 'Subject': 'Subject', + 'Header': 'Header', + 'Size': 'Size' }; /** @@ -315,7 +347,9 @@ 'Contains': 'Contains', 'NotContains': 'NotContains', 'EqualTo': 'EqualTo', - 'NotEqualTo': 'NotEqualTo' + 'NotEqualTo': 'NotEqualTo', + 'Over': 'Over', + 'Under': 'Under' }; /** diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js index 3a4bfb5c1..acb582852 100644 --- a/dev/Common/Globals.js +++ b/dev/Common/Globals.js @@ -1,4 +1,6 @@ +/* global RL_COMMUNITY */ + (function () { 'use strict'; @@ -28,6 +30,11 @@ */ Globals.startMicrotime = (new window.Date()).getTime(); + /** + * @type {boolean} + */ + Globals.community = RL_COMMUNITY; + /** * @type {?} */ @@ -203,6 +210,7 @@ }; Globals.leftPanelDisabled = ko.observable(false); + Globals.leftPanelType = ko.observable(''); // popups Globals.popupVisibilityNames = ko.observableArray([]); @@ -249,7 +257,7 @@ sTagName = sTagName.toUpperCase(); return !(sTagName === 'INPUT' || sTagName === 'SELECT' || sTagName === 'TEXTAREA' || - (oElement && sTagName === 'DIV' && 'editorHtmlArea' === oElement.className && oElement.contentEditable) + (oElement && sTagName === 'DIV' && ('editorHtmlArea' === oElement.className || 'true' === '' + oElement.contentEditable)) ); } diff --git a/dev/Common/HtmlEditor.js b/dev/Common/HtmlEditor.js index 8e9f25c69..e607339df 100644 --- a/dev/Common/HtmlEditor.js +++ b/dev/Common/HtmlEditor.js @@ -32,7 +32,6 @@ this.resize = _.throttle(_.bind(this.resize, this), 100); this.__inited = false; - this.__initedData = null; this.init(); } @@ -104,7 +103,7 @@ */ HtmlEditor.prototype.clearSignatureSigns = function (sText) { - return sText.replace(/(\u0002|\u0003|\u200C|\u200D)/g, ''); + return sText.replace(/(\u200C|\u0002)/g, ''); }; /** @@ -197,6 +196,8 @@ { this.modeToggle(true); + sHtml = sHtml.replace(/]*><\/p>/ig, ''); + try { this.editor.setData(sHtml); } catch (e) {} @@ -206,10 +207,6 @@ this.focus(); } } - else - { - this.__initedData = [true, sHtml, bFocus]; - } }; HtmlEditor.prototype.setPlain = function (sPlain, bFocus) @@ -233,10 +230,6 @@ this.focus(); } } - else - { - this.__initedData = [false, sPlain, bFocus]; - } }; HtmlEditor.prototype.init = function () @@ -270,7 +263,7 @@ } oConfig.enterMode = window.CKEDITOR.ENTER_BR; - oConfig.shiftEnterMode = window.CKEDITOR.ENTER_BR; + oConfig.shiftEnterMode = window.CKEDITOR.ENTER_P; oConfig.language = Globals.oHtmlEditorLangsMap[sLanguage] || 'en'; if (window.CKEDITOR.env) @@ -278,19 +271,6 @@ window.CKEDITOR.env.isCompatible = true; } -// oConfig.allowedContent = { -// $1: { -// elements: window.CKEDITOR.dtd, -// attributes: true, -// styles: true, -// classes: true -// } -// }; -// -// oConfig.disallowedContent = 'script; style; iframe; frame; *[on*]'; - - window.CKEDITOR.dtd.$removeEmpty['p'] = 1; - self.editor = window.CKEDITOR.appendTo(self.$element[0], oConfig); self.editor.on('key', function(oEvent) { @@ -318,37 +298,26 @@ self.focusTrigger(); }); - if (self.fOnReady) - { - self.editor.on('instanceReady', function () { + self.editor.on('instanceReady', function () { - if (self.editor.removeMenuItem) - { - self.editor.removeMenuItem('cut'); - self.editor.removeMenuItem('copy'); - self.editor.removeMenuItem('paste'); - } + if (self.editor.removeMenuItem) + { + self.editor.removeMenuItem('cut'); + self.editor.removeMenuItem('copy'); + self.editor.removeMenuItem('paste'); + } - self.editor.setKeystroke(window.CKEDITOR.CTRL + 65 /* A */, 'selectAll'); + self.__resizable = true; + self.__inited = true; + self.resize(); + + if (self.fOnReady) + { self.fOnReady(); - self.__resizable = true; - self.__inited = true; - self.resize(); + } - if (self.__initedData) - { - if (self.__initedData[0]) - { - self.setHtml(self.__initedData[1], self.__initedData[2]); - } - else - { - self.setPlain(self.__initedData[1], self.__initedData[2]); - } - } - }); - } + }); } ; diff --git a/dev/Common/Links.js b/dev/Common/Links.js index da26296b0..62acbac17 100644 --- a/dev/Common/Links.js +++ b/dev/Common/Links.js @@ -19,12 +19,17 @@ this.sServer = './?'; this.sVersion = Settings.settingsGet('Version'); - this.sSpecSuffix = Settings.settingsGet('AuthAccountHash') || '0'; + this.sAuthSuffix = Settings.settingsGet('AuthAccountHash') || '0'; this.sWebPrefix = Settings.settingsGet('WebPath') || ''; this.sVersionPrefix = Settings.settingsGet('WebVersionPath') || 'rainloop/v/' + this.sVersion + '/'; this.sStaticPrefix = this.sVersionPrefix + 'static/'; } + Links.prototype.populateAuthSuffix = function () + { + this.sAuthSuffix = require('Storage/Settings').settingsGet('AuthAccountHash') || '0'; + }; + /** * @return {string} */ @@ -34,11 +39,12 @@ }; /** + * @param {string=} sStartupUrl * @return {string} */ - Links.prototype.root = function () + Links.prototype.root = function (sStartupUrl) { - return this.sBase; + return this.sBase + Utils.pString(sStartupUrl); }; /** @@ -59,47 +65,62 @@ /** * @param {string} sDownload + * @param {string=} sCustomSpecSuffix * @return {string} */ - Links.prototype.attachmentDownload = function (sDownload) + Links.prototype.attachmentDownload = function (sDownload, sCustomSpecSuffix) { - return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/Download/' + this.subQueryPrefix() + '/' + sDownload; + sCustomSpecSuffix = Utils.isUnd(sCustomSpecSuffix) ? this.sAuthSuffix : sCustomSpecSuffix; + return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + sCustomSpecSuffix + '/Download/' + + this.subQueryPrefix() + '/' + sDownload; }; /** * @param {string} sDownload + * @param {string=} sCustomSpecSuffix * @return {string} */ - Links.prototype.attachmentPreview = function (sDownload) + Links.prototype.attachmentPreview = function (sDownload, sCustomSpecSuffix) { - return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/View/' + this.subQueryPrefix() + '/' + sDownload; + sCustomSpecSuffix = Utils.isUnd(sCustomSpecSuffix) ? this.sAuthSuffix : sCustomSpecSuffix; + return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + sCustomSpecSuffix + '/View/' + + this.subQueryPrefix() + '/' + sDownload; }; /** * @param {string} sDownload + * @param {string=} sCustomSpecSuffix * @return {string} */ - Links.prototype.attachmentThumbnailPreview = function (sDownload) + Links.prototype.attachmentThumbnailPreview = function (sDownload, sCustomSpecSuffix) { - return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/ViewThumbnail/' + this.subQueryPrefix() + '/' + sDownload; + sCustomSpecSuffix = Utils.isUnd(sCustomSpecSuffix) ? this.sAuthSuffix : sCustomSpecSuffix; + return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + sCustomSpecSuffix + '/ViewThumbnail/' + + this.subQueryPrefix() + '/' + sDownload; }; /** * @param {string} sDownload + * @param {string=} sCustomSpecSuffix * @return {string} */ - Links.prototype.attachmentPreviewAsPlain = function (sDownload) + Links.prototype.attachmentPreviewAsPlain = function (sDownload, sCustomSpecSuffix) { - return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/ViewAsPlain/' + this.subQueryPrefix() + '/' + sDownload; + sCustomSpecSuffix = Utils.isUnd(sCustomSpecSuffix) ? this.sAuthSuffix : sCustomSpecSuffix; + return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + sCustomSpecSuffix + '/ViewAsPlain/' + + this.subQueryPrefix() + '/' + sDownload; }; /** * @param {string} sDownload + * @param {string=} sCustomSpecSuffix * @return {string} */ - Links.prototype.attachmentFramed = function (sDownload) + Links.prototype.attachmentFramed = function (sDownload, sCustomSpecSuffix) { - return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/FramedView/' + this.subQueryPrefix() + '/' + sDownload; + sCustomSpecSuffix = Utils.isUnd(sCustomSpecSuffix) ? this.sAuthSuffix : sCustomSpecSuffix; + return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + sCustomSpecSuffix + '/FramedView/' + + this.subQueryPrefix() + '/' + sDownload; }; /** @@ -107,7 +128,7 @@ */ Links.prototype.upload = function () { - return this.sServer + '/Upload/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/'; + return this.sServer + '/Upload/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/'; }; /** @@ -115,7 +136,7 @@ */ Links.prototype.uploadContacts = function () { - return this.sServer + '/UploadContacts/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/'; + return this.sServer + '/UploadContacts/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/'; }; /** @@ -123,7 +144,7 @@ */ Links.prototype.uploadBackground = function () { - return this.sServer + '/UploadBackground/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/'; + return this.sServer + '/UploadBackground/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/'; }; /** @@ -131,7 +152,7 @@ */ Links.prototype.append = function () { - return this.sServer + '/Append/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/'; + return this.sServer + '/Append/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/'; }; /** @@ -140,7 +161,7 @@ */ Links.prototype.change = function (sEmail) { - return this.sServer + '/Change/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/' + Utils.encodeURIComponent(sEmail) + '/'; + return this.sServer + '/Change/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' + Utils.encodeURIComponent(sEmail) + '/'; }; /** @@ -149,7 +170,7 @@ */ Links.prototype.ajax = function (sAdd) { - return this.sServer + '/Ajax/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/' + sAdd; + return this.sServer + '/Ajax/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' + sAdd; }; /** @@ -158,7 +179,7 @@ */ Links.prototype.messageViewLink = function (sRequestHash) { - return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/ViewAsPlain/' + this.subQueryPrefix() + '/' + sRequestHash; + return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/ViewAsPlain/' + this.subQueryPrefix() + '/' + sRequestHash; }; /** @@ -167,7 +188,7 @@ */ Links.prototype.messageDownloadLink = function (sRequestHash) { - return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/Download/' + this.subQueryPrefix() + '/' + sRequestHash; + return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/Download/' + this.subQueryPrefix() + '/' + sRequestHash; }; /** @@ -194,7 +215,7 @@ */ Links.prototype.userBackground = function (sHash) { - return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + + return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/UserBackground/' + this.subQueryPrefix() + '/' + sHash; }; @@ -257,23 +278,30 @@ * @param {string} sFolder * @param {number=} iPage = 1 * @param {string=} sSearch = '' + * @param {string=} sThreadUid = '' * @return {string} */ - Links.prototype.mailBox = function (sFolder, iPage, sSearch) + Links.prototype.mailBox = function (sFolder, iPage, sSearch, sThreadUid) { iPage = Utils.isNormal(iPage) ? Utils.pInt(iPage) : 1; sSearch = Utils.pString(sSearch); - var sResult = this.sBase + 'mailbox/'; + var + sResult = this.sBase + 'mailbox/', + iThreadUid = Utils.pInt(sThreadUid) + ; + if ('' !== sFolder) { - sResult += encodeURI(sFolder); + sResult += encodeURI(sFolder) + (0 < iThreadUid ? '~' + iThreadUid : ''); } + if (1 < iPage) { sResult = sResult.replace(/[\/]+$/, ''); sResult += '/p' + iPage; } + if ('' !== sSearch) { sResult = sResult.replace(/[\/]+$/, ''); @@ -305,7 +333,7 @@ */ Links.prototype.exportContactsVcf = function () { - return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/ContactsVcf/'; + return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/ContactsVcf/'; }; /** @@ -313,7 +341,7 @@ */ Links.prototype.exportContactsCsv = function () { - return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/ContactsCsv/'; + return this.sServer + '/Raw/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/ContactsCsv/'; }; /** @@ -362,15 +390,33 @@ */ Links.prototype.openPgpJs = function () { - return this.sStaticPrefix + 'js/min/openpgp.js'; + return this.sStaticPrefix + 'js/min/openpgp.min.js'; }; /** * @return {string} */ - Links.prototype.socialGoogle = function () + Links.prototype.openPgpWorkerJs = function () { - return this.sServer + 'SocialGoogle' + ('' !== this.sSpecSuffix ? '/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/' : ''); + return this.sStaticPrefix + 'js/min/openpgp.worker.min.js'; + }; + + /** + * @return {string} + */ + Links.prototype.openPgpWorkerPath = function () + { + return this.sStaticPrefix + 'js/min/'; + }; + + /** + * @param {boolean} bXAuth = false + * @return {string} + */ + Links.prototype.socialGoogle = function (bXAuth) + { + return this.sServer + 'SocialGoogle' + ('' !== this.sAuthSuffix ? '/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' : '') + + (bXAuth ? '&xauth=1' : ''); }; /** @@ -378,7 +424,7 @@ */ Links.prototype.socialTwitter = function () { - return this.sServer + 'SocialTwitter' + ('' !== this.sSpecSuffix ? '/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/' : ''); + return this.sServer + 'SocialTwitter' + ('' !== this.sAuthSuffix ? '/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' : ''); }; /** @@ -386,7 +432,7 @@ */ Links.prototype.socialFacebook = function () { - return this.sServer + 'SocialFacebook' + ('' !== this.sSpecSuffix ? '/' + this.subQueryPrefix() + '/' + this.sSpecSuffix + '/' : ''); + return this.sServer + 'SocialFacebook' + ('' !== this.sAuthSuffix ? '/' + this.subQueryPrefix() + '/' + this.sAuthSuffix + '/' : ''); }; module.exports = new Links(); diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js index 0918e42b1..623da8d3f 100644 --- a/dev/Common/Selector.js +++ b/dev/Common/Selector.js @@ -633,13 +633,20 @@ var iOffset = 20, + aList = this.list(), oFocused = $(this.sItemFocusedSelector, this.oContentScrollable), oPos = oFocused.position(), iVisibleHeight = this.oContentVisible.height(), iFocusedHeight = oFocused.outerHeight() ; - if (oPos && (oPos.top < 0 || oPos.top + iFocusedHeight > iVisibleHeight)) + if (aList && aList[0] && aList[0].focused()) + { + this.oContentScrollable.scrollTop(0); + + return true; + } + else if (oPos && (oPos.top < 0 || oPos.top + iFocusedHeight > iVisibleHeight)) { if (oPos.top < 0) { @@ -771,10 +778,7 @@ if (bClick) { - this.focusedItem(oItem); - this.selectedItem(oItem); - - this.scrollToFocused(); + this.selectMessageItem(oItem); } } }; @@ -784,6 +788,14 @@ this.oCallbacks[sEventName] = fCallback; }; + Selector.prototype.selectMessageItem = function (oMessageItem) + { + this.focusedItem(oMessageItem); + this.selectedItem(oMessageItem); + + this.scrollToFocused(); + }; + module.exports = Selector; }()); \ No newline at end of file diff --git a/dev/Common/Translator.js b/dev/Common/Translator.js index b9fd187ea..5a5e9d87f 100644 --- a/dev/Common/Translator.js +++ b/dev/Common/Translator.js @@ -10,6 +10,7 @@ ko = require('ko'), Enums = require('Common/Enums'), + Utils = require('Common/Utils'), Globals = require('Common/Globals') ; @@ -24,6 +25,8 @@ this.trigger = ko.observable(false); this.i18n = _.bind(this.i18n, this); + + this.init(); } Translator.prototype.data = {}; @@ -293,29 +296,41 @@ { var self = this, - $html = $('html'), - fEmptyFunction = function () {}, iStart = (new Date()).getTime() ; - $html.addClass('rl-changing-language'); + Globals.$html.addClass('rl-changing-language'); $.ajax({ 'url': require('Common/Links').langLink(sLanguage, bAdmin), 'dataType': 'script', 'cache': true }) - .fail(fFail || fEmptyFunction) + .fail(fFail || Utils.emptyFunction) .done(function () { _.delay(function () { + self.reloadData(); - (fDone || fEmptyFunction)(); - $html.removeClass('rl-changing-language'); + + (fDone || Utils.emptyFunction)(); + + Globals.$html + .removeClass('rl-changing-language') + .removeClass('rl-rtl rl-ltr') + .addClass(-1 < Utils.inArray(sLanguage, ['ar', 'he', 'ur']) ? 'rl-rtl' : 'rl-ltr') +// .attr('dir', -1 < Utils.inArray(sLanguage, ['ar', 'he', 'ur']) ? 'rtl' : 'ltr') + ; + }, 500 < (new Date()).getTime() - iStart ? 1 : 500); }) ; }; + Translator.prototype.init = function () + { + Globals.$html.addClass('rl-' + (Globals.$html.attr('dir') || 'ltr')); + }; + module.exports = new Translator(); }()); diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js index daf84d133..ed59539b0 100644 --- a/dev/Common/Utils.js +++ b/dev/Common/Utils.js @@ -150,6 +150,11 @@ { if (sMailToUrl && 'mailto:' === sMailToUrl.toString().substr(0, 7).toLowerCase()) { + if (!PopupComposeVoreModel) + { + return true; + } + sMailToUrl = sMailToUrl.toString().substr(7); var @@ -534,14 +539,14 @@ oEvent.preventDefault(); return; } - - if (oSender && oSender.tagName && oSender.tagName.match(/INPUT|TEXTAREA/i)) + else if (iKey === Enums.EventKeyCode.A) { - return; - } + if (oSender && ('true' === '' + oSender.contentEditable || + (oSender.tagName && oSender.tagName.match(/INPUT|TEXTAREA/i)))) + { + return; + } - if (iKey === Enums.EventKeyCode.A) - { if (window.getSelection) { window.getSelection().removeAllRanges(); @@ -847,7 +852,11 @@ }, convertPre = function () { - return (arguments && 1 < arguments.length) ? arguments[1].toString().replace(/[\n]/gm, '
') : ''; + return (arguments && 1 < arguments.length) ? + arguments[1].toString() + .replace(/[\n]/gm, '
') + .replace(/[\r]/gm, '') + : ''; }, fixAttibuteValue = function () { @@ -861,16 +870,17 @@ ; sText = sHtml - // specials for signature - .replace(/\u0002\u0002/g, '\u200C\u200C') - .replace(/\u0003\u0003/g, '\u200D\u200D') - - .replace(/]*>([\s\S\r\n]*)<\/pre>/gmi, convertPre) + .replace(/\u0002([\s\S]*)\u0002/gm, '\u200C$1\u200C') + .replace(/]*><\/p>/gi, '') + .replace(/]*>([\s\S\r\n\t]*)<\/pre>/gmi, convertPre) .replace(/[\s]+/gm, ' ') .replace(/((?:href|data)\s?=\s?)("[^"]+?"|'[^']+?')/gmi, fixAttibuteValue) .replace(/]*>/gmi, '\n') .replace(/<\/h[\d]>/gi, '\n') .replace(/<\/p>/gi, '\n\n') + .replace(/]*>/gmi, '\n') + .replace(/<\/ul>/gi, '\n') + .replace(/]*>/gmi, ' * ') .replace(/<\/li>/gi, '\n') .replace(/<\/td>/gi, '\n') .replace(/<\/tr>/gi, '\n') @@ -1012,16 +1022,12 @@ sPlain = aText.join("\n"); sPlain = sPlain - - // specials for signature - .replace(/\u200C\u200C/g, '\u0002\u0002') - .replace(/\u200D\u200D/g, '\u0003\u0003') - // .replace(/~~~\/blockquote~~~\n~~~blockquote~~~/g, '\n') .replace(/&/g, '&') .replace(/>/g, '>').replace(/') .replace(/[\s]*~~~\/blockquote~~~/g, '') + .replace(/\u200C([\s\S]*)\u200C/g, '\u0002$1\u0002') .replace(/\n/g, '
') ; diff --git a/dev/Component/AbstracCheckbox.js b/dev/Component/AbstracCheckbox.js index 7bb6533b5..de4696b92 100644 --- a/dev/Component/AbstracCheckbox.js +++ b/dev/Component/AbstracCheckbox.js @@ -48,11 +48,13 @@ this.inverted = Utils.isUnd(oParams.inverted) ? false : !!oParams.inverted; this.labeled = !Utils.isUnd(oParams.label); + this.labelAnimated = !!oParams.labelAnimated; } _.extend(AbstracCheckbox.prototype, AbstractComponent.prototype); - AbstracCheckbox.prototype.click = function() { + AbstracCheckbox.prototype.click = function() + { if (!this.readOnly && this.enable() && !this.disable()) { this.value(!this.value()); diff --git a/dev/Component/Select.js b/dev/Component/Select.js index a987e7669..046f7603a 100644 --- a/dev/Component/Select.js +++ b/dev/Component/Select.js @@ -7,6 +7,7 @@ _ = require('_'), Utils = require('Common/Utils'), + Translator = require('Common/Translator'), AbstractInput = require('Component/AbstractInput') ; @@ -26,6 +27,12 @@ this.optionsText = oParams.optionsText || null; this.optionsValue = oParams.optionsValue || null; + this.optionsCaption = oParams.optionsCaption || null; + + if (this.optionsCaption) + { + this.optionsCaption = Translator.i18n(this.optionsCaption); + } this.defautOptionsAfterRender = Utils.defautOptionsAfterRender; } diff --git a/dev/Component/SvgIcon.js b/dev/Component/SvgIcon.js new file mode 100644 index 000000000..710754c6f --- /dev/null +++ b/dev/Component/SvgIcon.js @@ -0,0 +1,35 @@ + +(function () { + + 'use strict'; + + var + $ = require('$'), + sUrl = null, + getUtl = function () { + if (!sUrl) + { + sUrl = 'rainloop/v/' + ($('#rlAppVersion').attr('content') || '0.0.0') + '/static/css/svg/icons.svg'; + } + + return sUrl; + } + ; + + module.exports = { + viewModel: { + createViewModel: function(oParams, oComponentInfo) { + var icon = oParams.icon || 'null'; + if (oComponentInfo.element && oComponentInfo.element) + { + $(oComponentInfo.element).replaceWith( +''); + } + } + }, + 'template': '' + }; + +}()); + + diff --git a/dev/External/ko.js b/dev/External/ko.js index b2e1e4712..dc8161007 100644 --- a/dev/External/ko.js +++ b/dev/External/ko.js @@ -7,6 +7,7 @@ window = require('window'), _ = require('_'), $ = require('$'), + JSON = require('JSON'), Opentip = require('Opentip'), fDisposalTooltipHelper = function (oElement) { @@ -24,36 +25,54 @@ 'init': function (oElement, fValueAccessor) { var - fValue = fValueAccessor(), oEditor = null, + fValue = fValueAccessor(), + fUpdateEditorValue = function () { - if (oEditor) + if (fValue && fValue.__editor) { - oEditor.setHtmlOrPlain(fValue()); + fValue.__editor.setHtmlOrPlain(fValue()); } }, + fUpdateKoValue = function () { - if (oEditor && oEditor.__inited) + if (fValue && fValue.__editor) { - fValue(oEditor.getDataWithHtmlMark()); + fValue(fValue.__editor.getDataWithHtmlMark()); } }, + + fOnReady = function () { + fValue.__editor = oEditor; + fUpdateEditorValue(); + }, + HtmlEditor = require('Common/HtmlEditor') ; - if (fValue) + if (ko.isObservable(fValue) && HtmlEditor) { - oEditor = new HtmlEditor(oElement, fUpdateKoValue, fUpdateEditorValue, fUpdateKoValue); - fValue.__editor = oEditor; + oEditor = new HtmlEditor(oElement, fUpdateKoValue, fOnReady, fUpdateKoValue); + fValue.__fetchEditorValue = fUpdateKoValue; - fValue.__updateEditorValue = fUpdateEditorValue; fValue.subscribe(fUpdateEditorValue); - fUpdateEditorValue(); + +// ko.utils.domNodeDisposal.addDisposeCallback(oElement, function () { +// }); } } }; + ko.bindingHandlers.json = { + 'init': function (oElement, fValueAccessor) { + $(oElement).text(JSON.stringify(ko.unwrap(fValueAccessor()))); + }, + 'update': function (oElement, fValueAccessor) { + $(oElement).text(JSON.stringify(ko.unwrap(fValueAccessor()))); + } + }; + ko.bindingHandlers.tooltip = { 'init': function (oElement, fValueAccessor) { @@ -266,8 +285,7 @@ ko.bindingHandlers.csstext = { 'init': function (oElement, fValueAccessor) { - var Utils = require('Common/Utils'); - if (oElement && oElement.styleSheet && !Utils.isUnd(oElement.styleSheet.cssText)) + if (oElement && oElement.styleSheet && undefined !== oElement.styleSheet.cssText) { oElement.styleSheet.cssText = ko.unwrap(fValueAccessor()); } @@ -277,8 +295,7 @@ } }, 'update': function (oElement, fValueAccessor) { - var Utils = require('Common/Utils'); - if (oElement && oElement.styleSheet && !Utils.isUnd(oElement.styleSheet.cssText)) + if (oElement && oElement.styleSheet && undefined !== oElement.styleSheet.cssText) { oElement.styleSheet.cssText = ko.unwrap(fValueAccessor()); } @@ -324,6 +341,36 @@ } }; + ko.bindingHandlers.onSpace = { + 'init': function (oElement, fValueAccessor, fAllBindingsAccessor, oViewModel) { + $(oElement).on('keyup.koOnSpace', function (oEvent) { + if (oEvent && 32 === window.parseInt(oEvent.keyCode, 10)) + { + fValueAccessor().call(oViewModel, oEvent); + } + }); + + ko.utils.domNodeDisposal.addDisposeCallback(oElement, function () { + $(oElement).off('keyup.koOnSpace'); + }); + } + }; + + ko.bindingHandlers.onTab = { + 'init': function (oElement, fValueAccessor, fAllBindingsAccessor, oViewModel) { + $(oElement).on('keydown.koOnTab', function (oEvent) { + if (oEvent && 9 === window.parseInt(oEvent.keyCode, 10)) + { + return fValueAccessor().call(oViewModel, !!oEvent.shiftKey); + } + }); + + ko.utils.domNodeDisposal.addDisposeCallback(oElement, function () { + $(oElement).off('keydown.koOnTab'); + }); + } + }; + ko.bindingHandlers.onEsc = { 'init': function (oElement, fValueAccessor, fAllBindingsAccessor, oViewModel) { $(oElement).on('keypress.koOnEsc', function (oEvent) { @@ -774,7 +821,7 @@ 'parseOnBlur': true, 'allowDragAndDrop': true, 'focusCallback': fFocusCallback, - 'inputDelimiters': [',', ';'], + 'inputDelimiters': [',', ';', "\n"], 'autoCompleteSource': fAutoCompleteSource, // 'elementHook': function (oEl, oItem) { // if (oEl && oItem) @@ -784,6 +831,7 @@ // } // }, 'parseHook': function (aInput) { + return _.map(aInput, function (sInputValue) { var @@ -801,6 +849,53 @@ return [sValue, null]; }); + +// var aResult = []; +// +// _.each(aInput, function (sInputValue) { +// +// var +// aM = null, +// aValues = [], +// sValue = Utils.trim(sInputValue), +// oEmail = null +// ; +// +// if ('' !== sValue) +// { +// aM = sValue.match(/[@]/g); +// if (aM && 0 < aM.length) +// { +// sValue = sValue.replace(/[\r\n]+/g, '; ').replace(/[\s]+/g, ' '); +// aValues = EmailModel.splitHelper(sValue, ';'); +// +// _.each(aValues, function (sV) { +// +// oEmail = new EmailModel(); +// oEmail.mailsoParse(sV); +// +// if (oEmail.email) +// { +// aResult.push([oEmail.toLine(false), oEmail]); +// } +// else +// { +// aResult.push(['', null]); +// } +// }); +// } +// else +// { +// aResult.push([sInputValue, null]); +// } +// } +// else +// { +// aResult.push([sInputValue, null]); +// } +// }); +// +// return aResult; }, 'change': _.bind(function (oEvent) { $oEl.data('EmailsTagsValue', oEvent.target.value); diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js index c8052eda5..01808641c 100644 --- a/dev/Knoin/Knoin.js +++ b/dev/Knoin/Knoin.js @@ -170,8 +170,6 @@ Globals.popupVisibilityNames.push(this.viewModelName); oViewModel.viewModelDom.css('z-index', 3000 + Globals.popupVisibilityNames().length + 10); -// Utils.delegateRun(this, 'onShow'); // moved to showScreenPopup function (for parameters) - if (this.onShowTrigger) { this.onShowTrigger(!this.onShowTrigger()); @@ -257,6 +255,8 @@ if (ViewModelClassToShow.__vm && ViewModelClassToShow.__dom) { + Utils.delegateRun(ViewModelClassToShow.__vm, 'onBeforeShow', aParameters || []); + ViewModelClassToShow.__vm.modalVisibility(true); Utils.delegateRun(ViewModelClassToShow.__vm, 'onShow', aParameters || []); @@ -383,6 +383,8 @@ if (ViewModelClass.__vm && ViewModelClass.__dom && 'Popups' !== ViewModelClass.__vm.viewModelPosition()) { + Utils.delegateRun(ViewModelClass.__vm, 'onBeforeShow'); + ViewModelClass.__dom.show(); ViewModelClass.__vm.viewModelVisibility(true); @@ -425,19 +427,22 @@ _.each(aScreensClasses, function (CScreen) { - var - oScreen = new CScreen(), - sScreenName = oScreen ? oScreen.screenName() : '' - ; - - if (oScreen && '' !== sScreenName) + if (CScreen) { - if ('' === this.sDefaultScreenName) - { - this.sDefaultScreenName = sScreenName; - } + var + oScreen = new CScreen(), + sScreenName = oScreen ? oScreen.screenName() : '' + ; - this.oScreens[sScreenName] = oScreen; + if (oScreen && '' !== sScreenName) + { + if ('' === this.sDefaultScreenName) + { + this.sDefaultScreenName = sScreenName; + } + + this.oScreens[sScreenName] = oScreen; + } } }, this); diff --git a/dev/Model/Attachment.js b/dev/Model/Attachment.js index d4dc6911e..0534494c1 100644 --- a/dev/Model/Attachment.js +++ b/dev/Model/Attachment.js @@ -189,7 +189,8 @@ */ AttachmentModel.prototype.hasPreview = function () { - return this.isImage() || (this.isPdf() && Globals.bAllowPdfPreview) || this.isText() || this.isFramed(); + return this.isImage() || (this.isPdf() && Globals.bAllowPdfPreview) || + this.isText() || this.isFramed(); }; /** @@ -370,12 +371,17 @@ sResult = Enums.FileType.Pdf; break; case -1 < Utils.inArray(sMimeType, [ - 'application/pgp-signature', 'application/pkcs7-signature', 'application/pgp-keys' + 'application/pgp-signature', 'application/pgp-keys' ]) || -1 < Utils.inArray(sExt, [ 'asc', 'pem', 'ppk' ]): sResult = Enums.FileType.Certificate; break; + case -1 < Utils.inArray(sMimeType, ['application/pkcs7-signature']) || + -1 < Utils.inArray(sExt, ['p7s']): + + sResult = Enums.FileType.CertificateBin; + break; case -1 < Utils.inArray(aMimeTypeParts[1], [ 'rtf', 'msword', 'vnd.msword', 'vnd.openxmlformats-officedocument.wordprocessingml.document', 'vnd.openxmlformats-officedocument.wordprocessingml.template', @@ -447,6 +453,7 @@ sClass = 'icon-file-zip'; break; case Enums.FileType.Certificate: + case Enums.FileType.CertificateBin: sClass = 'icon-file-certificate'; break; case Enums.FileType.Sheet: @@ -509,6 +516,7 @@ sClass = 'icon-file-zip'; break; case Enums.FileType.Certificate: + case Enums.FileType.CertificateBin: sClass = 'icon-file-certificate'; break; case Enums.FileType.Sheet: diff --git a/dev/Model/Email.js b/dev/Model/Email.js index 173ed2a80..9304c7d22 100644 --- a/dev/Model/Email.js +++ b/dev/Model/Email.js @@ -36,6 +36,49 @@ return oEmailModel.initByJson(oJsonEmail) ? oEmailModel : null; }; + /** + * @static + * @param {string} sLine + * @param {string=} sDelimiter = ';' + * @return {Array} + */ + EmailModel.splitHelper = function (sLine, sDelimiter) + { + sDelimiter = sDelimiter || ';'; + + sLine = sLine.replace(/[\r\n]+/g, '; ').replace(/[\s]+/g, ' '); + + var + iIndex = 0, + iLen = sLine.length, + bAt = false, + sChar = '', + sResult = '' + ; + + for (; iIndex < iLen; iIndex++) + { + sChar = sLine.charAt(iIndex); + switch (sChar) + { + case '@': + bAt = true; + break; + case ' ': + if (bAt) + { + bAt = false; + sResult += sDelimiter; + } + break; + } + + sResult += sChar; + } + + return sResult.split(sDelimiter); + }; + /** * @type {string} */ diff --git a/dev/Model/Filter.js b/dev/Model/Filter.js index e919427d0..748f0c6c5 100644 --- a/dev/Model/Filter.js +++ b/dev/Model/Filter.js @@ -43,6 +43,9 @@ this.actionValueSecond = ko.observable(''); this.actionValueThird = ko.observable(''); + this.actionValueFourth = ko.observable(''); + this.actionValueFourth.error = ko.observable(false); + this.actionMarkAsRead = ko.observable(false); this.actionKeep = ko.observable(true); @@ -55,6 +58,8 @@ this.actionValue.error(false); this.actionValueSecond(''); this.actionValueThird(''); + this.actionValueFourth(''); + this.actionValueFourth.error(false); }, this); var fGetRealFolderName = function (sFolderFullNameRaw) { @@ -189,6 +194,14 @@ return false; } + if (Enums.FiltersAction.Vacation === this.actionType() && + '' !== this.actionValueFourth() && -1 === this.actionValueFourth().indexOf('@') + ) + { + this.actionValueFourth.error(true); + return false; + } + this.name.error(false); this.actionValue.error(false); @@ -209,6 +222,7 @@ 'ActionValue': this.actionValue(), 'ActionValueSecond': this.actionValueSecond(), 'ActionValueThird': this.actionValueThird(), + 'ActionValueFourth': this.actionValueFourth(), 'ActionType': this.actionType(), 'Stop': this.actionNoStop() ? '0' : '1', @@ -228,6 +242,11 @@ Utils.delegateRunOnDestroy(oConditionToDelete); }; + FilterModel.prototype.setRecipients = function () + { + this.actionValueFourth(require('Stores/User/Account').accountsEmails().join(', ')); + }; + FilterModel.prototype.parse = function (oItem) { var bResult = false; @@ -255,6 +274,7 @@ this.actionValue(Utils.pString(oItem['ActionValue'])); this.actionValueSecond(Utils.pString(oItem['ActionValueSecond'])); this.actionValueThird(Utils.pString(oItem['ActionValueThird'])); + this.actionValueFourth(Utils.pString(oItem['ActionValueFourth'])); this.actionNoStop(!oItem['Stop']); this.actionKeep(!!oItem['Keep']); @@ -288,6 +308,7 @@ oClone.actionValueSecond(this.actionValueSecond()); oClone.actionValueThird(this.actionValueThird()); + oClone.actionValueFourth(this.actionValueFourth()); oClone.actionKeep(this.actionKeep()); oClone.actionNoStop(this.actionNoStop()); diff --git a/dev/Model/FilterCondition.js b/dev/Model/FilterCondition.js index 9192ea059..e33ee9ade 100644 --- a/dev/Model/FilterCondition.js +++ b/dev/Model/FilterCondition.js @@ -25,11 +25,20 @@ this.value = ko.observable(''); this.value.error = ko.observable(false); + this.valueSecond = ko.observable(''); + this.valueSecond.error = ko.observable(false); + this.template = ko.computed(function () { var sTemplate = ''; - switch (this.type()) + switch (this.field()) { + case Enums.FilterConditionField.Size: + sTemplate = 'SettingsFiltersConditionSize'; + break; + case Enums.FilterConditionField.Header: + sTemplate = 'SettingsFiltersConditionMore'; + break; default: sTemplate = 'SettingsFiltersConditionDefault'; break; @@ -39,6 +48,11 @@ }, this); + this.field.subscribe(function () { + this.value(''); + this.valueSecond(''); + }, this); + this.regDisposables([this.template]); } @@ -52,6 +66,12 @@ return false; } + if (Enums.FilterConditionField.Header === this.field() && '' === this.valueSecond()) + { + this.valueSecond.error(true); + return false; + } + return true; }; @@ -62,6 +82,7 @@ this.field(Utils.pString(oItem['Field'])); this.type(Utils.pString(oItem['Type'])); this.value(Utils.pString(oItem['Value'])); + this.valueSecond(Utils.pString(oItem['ValueSecond'])); return true; } @@ -74,7 +95,8 @@ return { 'Field': this.field(), 'Type': this.type(), - 'Value': this.value() + 'Value': this.value(), + 'ValueSecond': this.valueSecond() }; }; @@ -85,6 +107,7 @@ oClone.field(this.field()); oClone.type(this.type()); oClone.value(this.value()); + oClone.valueSecond(this.valueSecond()); return oClone; }; diff --git a/dev/Model/Folder.js b/dev/Model/Folder.js index 668fec202..909645706 100644 --- a/dev/Model/Folder.js +++ b/dev/Model/Folder.js @@ -43,6 +43,7 @@ this.edited = ko.observable(false); this.collapsed = ko.observable(true); this.subScribed = ko.observable(true); + this.checkable = ko.observable(false); this.subFolders = ko.observableArray([]); this.deleteAccess = ko.observable(false); this.actionBlink = ko.observable(false).extend({'falseTimeout': 1000}); @@ -105,6 +106,7 @@ }, this); this.hidden = ko.computed(function () { + var bSystem = this.isSystemFolder(), bSubFolders = this.hasSubScribedSubfolders() @@ -182,6 +184,8 @@ return !this.isSystemFolder() && this.selectable && sInboxFolderName !== this.fullNameRaw; }, this); + this.canBeChecked = this.canBeSubScribed; + // this.visible.subscribe(function () { // Utils.timeOutAction('folder-list-folder-visibility-change', function () { // Globals.$win.trigger('folder-list-folder-visibility-change'); @@ -281,7 +285,7 @@ }); this.hasUnreadMessages = ko.computed(function () { - return 0 < this.messageCountUnread(); + return 0 < this.messageCountUnread() && '' !== this.printableUnreadCount(); }, this); this.hasSubScribedUnreadMessagesSubfolders = ko.computed(function () { @@ -352,6 +356,8 @@ this.existen = !!oJsonFolder.IsExists; this.subScribed(!!oJsonFolder.IsSubscribed); + this.checkable(!!oJsonFolder.Checkable); + this.type(sInboxFolderName === this.fullNameRaw ? Enums.FolderType.Inbox : Enums.FolderType.User); bResult = true; diff --git a/dev/Model/Message.js b/dev/Model/Message.js index 399e51912..32eda9cf1 100644 --- a/dev/Model/Message.js +++ b/dev/Model/Message.js @@ -14,8 +14,6 @@ Globals = require('Common/Globals'), Links = require('Common/Links'), - PgpStore = require('Stores/User/Pgp'), - AttachmentModel = require('Model/Attachment'), MessageHelper = require('Helper/Message'), @@ -82,7 +80,6 @@ }, this); this.body = null; - this.plainRaw = ''; this.isHtml = ko.observable(false); this.hasImages = ko.observable(false); @@ -784,47 +781,55 @@ */ MessageModel.prototype.populateByMessageListItem = function (oMessage) { - this.folderFullNameRaw = oMessage.folderFullNameRaw; - this.uid = oMessage.uid; - this.hash = oMessage.hash; - this.requestHash = oMessage.requestHash; - this.subject(oMessage.subject()); + if (oMessage) + { + this.folderFullNameRaw = oMessage.folderFullNameRaw; + this.uid = oMessage.uid; + this.hash = oMessage.hash; + this.requestHash = oMessage.requestHash; + this.subject(oMessage.subject()); + } + this.subjectPrefix(this.subjectPrefix()); this.subjectSuffix(this.subjectSuffix()); - this.size(oMessage.size()); - this.dateTimeStampInUTC(oMessage.dateTimeStampInUTC()); - this.priority(oMessage.priority()); + if (oMessage) + { - this.proxy = oMessage.proxy; + this.size(oMessage.size()); + this.dateTimeStampInUTC(oMessage.dateTimeStampInUTC()); + this.priority(oMessage.priority()); - this.fromEmailString(oMessage.fromEmailString()); - this.fromClearEmailString(oMessage.fromClearEmailString()); - this.toEmailsString(oMessage.toEmailsString()); - this.toClearEmailsString(oMessage.toClearEmailsString()); + this.proxy = oMessage.proxy; - this.emails = oMessage.emails; + this.fromEmailString(oMessage.fromEmailString()); + this.fromClearEmailString(oMessage.fromClearEmailString()); + this.toEmailsString(oMessage.toEmailsString()); + this.toClearEmailsString(oMessage.toClearEmailsString()); - this.from = oMessage.from; - this.to = oMessage.to; - this.cc = oMessage.cc; - this.bcc = oMessage.bcc; - this.replyTo = oMessage.replyTo; - this.deliveredTo = oMessage.deliveredTo; + this.emails = oMessage.emails; - this.unseen(oMessage.unseen()); - this.flagged(oMessage.flagged()); - this.answered(oMessage.answered()); - this.forwarded(oMessage.forwarded()); - this.isReadReceipt(oMessage.isReadReceipt()); - this.deletedMark(oMessage.deletedMark()); + this.from = oMessage.from; + this.to = oMessage.to; + this.cc = oMessage.cc; + this.bcc = oMessage.bcc; + this.replyTo = oMessage.replyTo; + this.deliveredTo = oMessage.deliveredTo; - this.priority(oMessage.priority()); + this.unseen(oMessage.unseen()); + this.flagged(oMessage.flagged()); + this.answered(oMessage.answered()); + this.forwarded(oMessage.forwarded()); + this.isReadReceipt(oMessage.isReadReceipt()); + this.deletedMark(oMessage.deletedMark()); - this.selected(oMessage.selected()); - this.checked(oMessage.checked()); - this.hasAttachments(oMessage.hasAttachments()); - this.attachmentsSpecData(oMessage.attachmentsSpecData()); + this.priority(oMessage.priority()); + + this.selected(oMessage.selected()); + this.checked(oMessage.checked()); + this.hasAttachments(oMessage.hasAttachments()); + this.attachmentsSpecData(oMessage.attachmentsSpecData()); + } this.body = null; @@ -833,7 +838,10 @@ this.sInReplyTo = ''; this.sReferences = ''; - this.threads(oMessage.threads()); + if (oMessage) + { + this.threads(oMessage.threads()); + } this.computeSenderEmail(); @@ -978,191 +986,21 @@ } }; - MessageModel.prototype.storeDataToDom = function () + MessageModel.prototype.storeDataInDom = function () { if (this.body) { this.body.data('rl-is-html', !!this.isHtml()); this.body.data('rl-has-images', !!this.hasImages()); - - this.body.data('rl-plain-raw', this.plainRaw); - - if (require('Stores/User/Pgp').capaOpenPGP()) - { - this.body.data('rl-plain-pgp-signed', !!this.isPgpSigned()); - this.body.data('rl-plain-pgp-encrypted', !!this.isPgpEncrypted()); - this.body.data('rl-pgp-verify-status', this.pgpSignedVerifyStatus()); - this.body.data('rl-pgp-verify-user', this.pgpSignedVerifyUser()); - } } }; - MessageModel.prototype.storePgpVerifyDataToDom = function () - { - if (this.body && require('Stores/User/Pgp').capaOpenPGP()) - { - this.body.data('rl-pgp-verify-status', this.pgpSignedVerifyStatus()); - this.body.data('rl-pgp-verify-user', this.pgpSignedVerifyUser()); - } - }; - - MessageModel.prototype.fetchDataToDom = function () + MessageModel.prototype.fetchDataFromDom = function () { if (this.body) { this.isHtml(!!this.body.data('rl-is-html')); this.hasImages(!!this.body.data('rl-has-images')); - - this.plainRaw = Utils.pString(this.body.data('rl-plain-raw')); - - if (require('Stores/User/Pgp').capaOpenPGP()) - { - this.isPgpSigned(!!this.body.data('rl-plain-pgp-signed')); - this.isPgpEncrypted(!!this.body.data('rl-plain-pgp-encrypted')); - this.pgpSignedVerifyStatus(this.body.data('rl-pgp-verify-status')); - this.pgpSignedVerifyUser(this.body.data('rl-pgp-verify-user')); - } - else - { - this.isPgpSigned(false); - this.isPgpEncrypted(false); - this.pgpSignedVerifyStatus(Enums.SignedVerifyStatus.None); - this.pgpSignedVerifyUser(''); - } - } - }; - - MessageModel.prototype.verifyPgpSignedClearMessage = function () - { - if (this.isPgpSigned()) - { - var - aRes = [], - mPgpMessage = null, - sFrom = this.from && this.from[0] && this.from[0].email ? this.from[0].email : '', - aPublicKeys = PgpStore.findPublicKeysByEmail(sFrom), - oValidKey = null, - oValidSysKey = null, - sPlain = '' - ; - - this.pgpSignedVerifyStatus(Enums.SignedVerifyStatus.Error); - this.pgpSignedVerifyUser(''); - - try - { - mPgpMessage = PgpStore.openpgp.cleartext.readArmored(this.plainRaw); - if (mPgpMessage && mPgpMessage.getText) - { - this.pgpSignedVerifyStatus( - aPublicKeys.length ? Enums.SignedVerifyStatus.Unverified : Enums.SignedVerifyStatus.UnknownPublicKeys); - - aRes = mPgpMessage.verify(aPublicKeys); - if (aRes && 0 < aRes.length) - { - oValidKey = _.find(aRes, function (oItem) { - return oItem && oItem.keyid && oItem.valid; - }); - - if (oValidKey) - { - oValidSysKey = PgpStore.findPublicKeyByHex(oValidKey.keyid.toHex()); - if (oValidSysKey) - { - sPlain = mPgpMessage.getText(); - - this.pgpSignedVerifyStatus(Enums.SignedVerifyStatus.Success); - this.pgpSignedVerifyUser(oValidSysKey.user); - - sPlain = - Globals.$div.empty().append( - $('
').text(sPlain)
-									).html()
-									;
-
-								Globals.$div.empty();
-
-								this.replacePlaneTextBody(sPlain);
-							}
-						}
-					}
-				}
-			}
-			catch (oExc) {}
-
-			this.storePgpVerifyDataToDom();
-		}
-	};
-
-	MessageModel.prototype.decryptPgpEncryptedMessage = function (sPassword)
-	{
-		if (this.isPgpEncrypted())
-		{
-			var
-				aRes = [],
-				mPgpMessage = null,
-				mPgpMessageDecrypted = null,
-				sFrom = this.from && this.from[0] && this.from[0].email ? this.from[0].email : '',
-				aPublicKey = PgpStore.findPublicKeysByEmail(sFrom),
-				oPrivateKey = PgpStore.findSelfPrivateKey(sPassword),
-				oValidKey = null,
-				oValidSysKey = null,
-				sPlain = ''
-			;
-
-			this.pgpSignedVerifyStatus(Enums.SignedVerifyStatus.Error);
-			this.pgpSignedVerifyUser('');
-
-			if (!oPrivateKey)
-			{
-				this.pgpSignedVerifyStatus(Enums.SignedVerifyStatus.UnknownPrivateKey);
-			}
-
-			try
-			{
-				mPgpMessage = PgpStore.openpgp.message.readArmored(this.plainRaw);
-				if (mPgpMessage && oPrivateKey && mPgpMessage.decrypt)
-				{
-					this.pgpSignedVerifyStatus(Enums.SignedVerifyStatus.Unverified);
-
-					mPgpMessageDecrypted = mPgpMessage.decrypt(oPrivateKey);
-					if (mPgpMessageDecrypted)
-					{
-						aRes = mPgpMessageDecrypted.verify(aPublicKey);
-						if (aRes && 0 < aRes.length)
-						{
-							oValidKey = _.find(aRes, function (oItem) {
-								return oItem && oItem.keyid && oItem.valid;
-							});
-
-							if (oValidKey)
-							{
-								oValidSysKey = PgpStore.findPublicKeyByHex(oValidKey.keyid.toHex());
-								if (oValidSysKey)
-								{
-									this.pgpSignedVerifyStatus(Enums.SignedVerifyStatus.Success);
-									this.pgpSignedVerifyUser(oValidSysKey.user);
-								}
-							}
-						}
-
-						sPlain = mPgpMessageDecrypted.getText();
-
-						sPlain =
-							Globals.$div.empty().append(
-							$('
').text(sPlain)
-							).html()
-							;
-
-						Globals.$div.empty();
-
-						this.replacePlaneTextBody(sPlain);
-					}
-				}
-			}
-			catch (oExc) {}
-
-			this.storePgpVerifyDataToDom();
 		}
 	};
 
diff --git a/dev/Model/OpenPgpKey.js b/dev/Model/OpenPgpKey.js
index 22c46bbbe..896bd056b 100644
--- a/dev/Model/OpenPgpKey.js
+++ b/dev/Model/OpenPgpKey.js
@@ -7,6 +7,8 @@
 		_ = require('_'),
 		ko = require('ko'),
 
+		PgpStore = require('Stores/User/Pgp'),
+
 		AbstractModel = require('Knoin/AbstractModel')
 	;
 
@@ -45,6 +47,22 @@
 	OpenPgpKeyModel.prototype.armor = '';
 	OpenPgpKeyModel.prototype.isPrivate = false;
 
+	OpenPgpKeyModel.prototype.getNativeKeys = function ()
+	{
+		var oKey = null;
+		try
+		{
+			oKey = PgpStore.openpgp.key.readArmored(this.armor);
+			if (oKey && !oKey.err && oKey.keys && oKey.keys[0])
+			{
+				return oKey.keys;
+			}
+		}
+		catch (e) {}
+
+		return null;
+	};
+
 	module.exports = OpenPgpKeyModel;
 
 }());
\ No newline at end of file
diff --git a/dev/Promises/AbstractAjax.js b/dev/Promises/AbstractAjax.js
index 0ef3faf62..20d51b54d 100644
--- a/dev/Promises/AbstractAjax.js
+++ b/dev/Promises/AbstractAjax.js
@@ -10,8 +10,10 @@
 
 		Consts = require('Common/Consts'),
 		Enums = require('Common/Enums'),
+		Globals = require('Common/Globals'),
 		Utils = require('Common/Utils'),
 		Links = require('Common/Links'),
+		Plugins = require('Common/Plugins'),
 
 		Settings = require('Storage/Settings'),
 
@@ -71,6 +73,8 @@
 			oParameters['XToken'] = Settings.settingsGet('Token');
 		}
 
+		Plugins.runHook('ajax-default-request', [sAction, oParameters, sAdditionalGetString]);
+
 		this.setTrigger(fTrigger, true);
 
 		oH = $.ajax({
@@ -83,12 +87,26 @@
 			'global': true
 		}).always(function (oData, sTextStatus) {
 
-			var bCached = false;
+			var bCached = false, oErrorData = null, sType = Enums.StorageResultType.Error;
 			if (oData && oData['Time'])
 			{
 				bCached = Utils.pInt(oData['Time']) > Utils.microtime() - iStart;
 			}
 
+			// backward capability
+			switch (true)
+			{
+				case 'success' === sTextStatus && oData && oData.Result && sAction === oData.Action:
+					sType = Enums.StorageResultType.Success;
+					break;
+				case 'abort' === sTextStatus && (!oData || !oData.__aborted__):
+					sType = Enums.StorageResultType.Abort;
+					break;
+			}
+
+			Plugins.runHook('ajax-default-response', [sAction,
+				Enums.StorageResultType.Success === sType ? oData : null, sType, bCached, oParameters]);
+
 			if ('success' === sTextStatus)
 			{
 				if (oData && oData.Result && sAction === oData.Action)
@@ -98,15 +116,18 @@
 				}
 				else if (oData && oData.Action)
 				{
+					oErrorData = oData;
 					oDeferred.reject(oData.ErrorCode ? oData.ErrorCode : Enums.Notification.AjaxFalse);
 				}
 				else
 				{
+					oErrorData = oData;
 					oDeferred.reject(Enums.Notification.AjaxParse);
 				}
 			}
 			else if ('timeout' === sTextStatus)
 			{
+				oErrorData = oData;
 				oDeferred.reject(Enums.Notification.AjaxTimeout);
 			}
 			else if ('abort' === sTextStatus)
@@ -118,6 +139,7 @@
 			}
 			else
 			{
+				oErrorData = oData;
 				oDeferred.reject(Enums.Notification.AjaxParse);
 			}
 
@@ -128,6 +150,45 @@
 			}
 
 			self.setTrigger(fTrigger, false);
+
+			if (oErrorData)
+			{
+				if (-1 < Utils.inArray(oErrorData.ErrorCode, [
+					Enums.Notification.AuthError, Enums.Notification.AccessError,
+					Enums.Notification.ConnectionError, Enums.Notification.DomainNotAllowed, Enums.Notification.AccountNotAllowed,
+					Enums.Notification.MailServerError,	Enums.Notification.UnknownNotification, Enums.Notification.UnknownError
+				]))
+				{
+					Globals.iAjaxErrorCount++;
+				}
+
+				if (Enums.Notification.InvalidToken === oErrorData.ErrorCode)
+				{
+					Globals.iTokenErrorCount++;
+				}
+
+				if (Consts.Values.TokenErrorLimit < Globals.iTokenErrorCount)
+				{
+					if (Globals.__APP__ && Globals.__APP__.loginAndLogoutReload)
+					{
+						 Globals.__APP__.loginAndLogoutReload(false, true);
+					}
+				}
+
+				if (oErrorData.ClearAuth || oErrorData.Logout || Consts.Values.AjaxErrorLimit < Globals.iAjaxErrorCount)
+				{
+					if (Globals.__APP__ && Globals.__APP__.clearClientSideToken)
+					{
+						Globals.__APP__.clearClientSideToken();
+					}
+
+					if (Globals.__APP__ && !oErrorData.ClearAuth && Globals.__APP__.loginAndLogoutReload)
+					{
+						Globals.__APP__.loginAndLogoutReload(false, true);
+					}
+				}
+			}
+
 		});
 
 		if (oH)
diff --git a/dev/Promises/User/Ajax.js b/dev/Promises/User/Ajax.js
index 6dec2b76f..6cc9de4ba 100644
--- a/dev/Promises/User/Ajax.js
+++ b/dev/Promises/User/Ajax.js
@@ -16,8 +16,6 @@
 //		AppStore = require('Stores/User/App'),
 //		SettingsStore = require('Stores/User/Settings'),
 
-		MessageSimpleModel = require('Model/MessageSimple'),
-
 		PromisesPopulator = require('Promises/User/Populator'),
 		AbstractAjaxPromises = require('Promises/AbstractAjax')
 	;
@@ -29,44 +27,10 @@
 	function UserAjaxUserPromises()
 	{
 		AbstractAjaxPromises.call(this);
-
-		this.messageListSimpleHash = '';
-		this.messageListSimpleCache = null;
 	}
 
 	_.extend(UserAjaxUserPromises.prototype, AbstractAjaxPromises.prototype);
 
-	UserAjaxUserPromises.prototype.messageListSimple = function (sFolder, aUids, fTrigger)
-	{
-		var self = this, sHash = sFolder + '~' + aUids.join('/');
-		if (sHash === this.messageListSimpleHash && this.messageListSimpleCache)
-		{
-			return this.fastResolve(this.messageListSimpleCache);
-		}
-
-		return this.abort('MessageListSimple')
-			.postRequest('MessageListSimple', fTrigger, {
-				'Folder': sFolder,
-				'Uids': aUids
-			}).then(function (oData) {
-
-				self.messageListSimpleHash = sHash;
-				self.messageListSimpleCache = _.compact(_.map(oData.Result, function (aItem) {
-					return MessageSimpleModel.newInstanceFromJson(aItem);
-				}));
-
-				return self.messageListSimpleCache;
-
-			}, function (iError) {
-
-				self.messageListSimpleHash = '';
-				self.messageListSimpleCache = null;
-
-				return self.fastReject(iError);
-			})
-		;
-	};
-
 	UserAjaxUserPromises.prototype.foldersReload = function (fTrigger)
 	{
 		return this.abort('Folders')
@@ -115,7 +79,7 @@
 	UserAjaxUserPromises.prototype.attachmentsActions = function (sAction, aHashes, fTrigger)
 	{
 		return this.postRequest('AttachmentsActions', fTrigger, {
-			'Action': sAction,
+			'Do': sAction,
 			'Hashes': aHashes
 		});
 	};
diff --git a/dev/Promises/User/Populator.js b/dev/Promises/User/Populator.js
index 623396bb0..87a41bcf9 100644
--- a/dev/Promises/User/Populator.js
+++ b/dev/Promises/User/Populator.js
@@ -90,6 +90,15 @@
 
 				if (oCacheFolder)
 				{
+					if (!FolderStore.displaySpecSetting())
+					{
+						oCacheFolder.checkable(true);
+					}
+					else
+					{
+						oCacheFolder.checkable(!!oFolder.Checkable);
+					}
+
 					oCacheFolder.collapsed(!self.isFolderExpanded(oCacheFolder.fullNameHash));
 
 					if (oFolder.Extended)
@@ -131,6 +140,14 @@
 		if (oData && 'Collection/FolderCollection' === oData['@Object'] &&
 			oData['@Collection'] && Utils.isArray(oData['@Collection']))
 		{
+			var
+				iLimit = Utils.pInt(Settings.settingsGet('FolderSpecLimit')),
+				iC = Utils.pInt(oData['CountRec'])
+			;
+
+			iLimit = 100 < iLimit ? 100 : (10 > iLimit ? 10 : iLimit);
+
+			FolderStore.displaySpecSetting(0 >= iC || iLimit < iC);
 			FolderStore.folderList(this.folderResponseParseRec(
 				Utils.isUnd(oData.Namespace) ? '' : oData.Namespace, oData['@Collection']));
 		}
@@ -162,12 +179,11 @@
 				Settings.settingsGet('ArchiveFolder') +
 				Settings.settingsGet('NullFolder'))
 			{
-				// TODO Magic Numbers
-				Settings.settingsSet('SentFolder', oData['SystemFolders'][2] || null);
-				Settings.settingsSet('DraftFolder', oData['SystemFolders'][3] || null);
-				Settings.settingsSet('SpamFolder', oData['SystemFolders'][4] || null);
-				Settings.settingsSet('TrashFolder', oData['SystemFolders'][5] || null);
-				Settings.settingsSet('ArchiveFolder', oData['SystemFolders'][12] || null);
+				Settings.settingsSet('SentFolder', oData['SystemFolders'][Enums.ServerFolderType.SENT] || null);
+				Settings.settingsSet('DraftFolder', oData['SystemFolders'][Enums.ServerFolderType.DRAFTS] || null);
+				Settings.settingsSet('SpamFolder', oData['SystemFolders'][Enums.ServerFolderType.JUNK] || null);
+				Settings.settingsSet('TrashFolder', oData['SystemFolders'][Enums.ServerFolderType.TRASH] || null);
+				Settings.settingsSet('ArchiveFolder', oData['SystemFolders'][Enums.ServerFolderType.ALL] || null);
 
 				bUpdate = true;
 			}
diff --git a/dev/Remote/User/Ajax.js b/dev/Remote/User/Ajax.js
index 20ee13045..b5a145b25 100644
--- a/dev/Remote/User/Ajax.js
+++ b/dev/Remote/User/Ajax.js
@@ -313,39 +313,30 @@
 		});
 	};
 
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sFolderFullNameRaw
-	 * @param {Array} aUids
-	 */
-	RemoteUserAjax.prototype.messageListSimple = function (fCallback, sFolderFullNameRaw, aUids)
-	{
-		return this.defaultRequest(fCallback, 'MessageListSimple', {
-			'Folder': Utils.pString(sFolderFullNameRaw),
-			'Uids': aUids
-		}, Consts.Defaults.DefaultAjaxTimeout, '', ['MessageListSimple']);
-	};
-
 	/**
 	 * @param {?Function} fCallback
 	 * @param {string} sFolderFullNameRaw
 	 * @param {number=} iOffset = 0
 	 * @param {number=} iLimit = 20
 	 * @param {string=} sSearch = ''
+	 * @param {string=} sThreadUid = ''
 	 * @param {boolean=} bSilent = false
 	 */
-	RemoteUserAjax.prototype.messageList = function (fCallback, sFolderFullNameRaw, iOffset, iLimit, sSearch, bSilent)
+	RemoteUserAjax.prototype.messageList = function (fCallback, sFolderFullNameRaw, iOffset, iLimit, sSearch, sThreadUid, bSilent)
 	{
 		sFolderFullNameRaw = Utils.pString(sFolderFullNameRaw);
 
 		var
-			sFolderHash = Cache.getFolderHash(sFolderFullNameRaw)
+			sFolderHash = Cache.getFolderHash(sFolderFullNameRaw),
+			bUseThreads = AppStore.threadsAllowed() && SettingsStore.useThreads(),
+			sInboxUidNext = Cache.getFolderInboxName() === sFolderFullNameRaw ? Cache.getFolderUidNext(sFolderFullNameRaw) : ''
 		;
 
 		bSilent = Utils.isUnd(bSilent) ? false : !!bSilent;
 		iOffset = Utils.isUnd(iOffset) ? 0 : Utils.pInt(iOffset);
 		iLimit = Utils.isUnd(iOffset) ? 20 : Utils.pInt(iLimit);
 		sSearch = Utils.pString(sSearch);
+		sThreadUid = Utils.pString(sThreadUid);
 
 		if ('' !== sFolderHash && ('' === sSearch || -1 === sSearch.indexOf('is:')))
 		{
@@ -358,9 +349,9 @@
 					sSearch,
 					AppStore.projectHash(),
 					sFolderHash,
-					Cache.getFolderInboxName() === sFolderFullNameRaw ? Cache.getFolderUidNext(sFolderFullNameRaw) : '',
-					AppStore.threadsAllowed() && SettingsStore.useThreads() ? '1' : '0',
-					''
+					sInboxUidNext,
+					bUseThreads ? '1' : '0',
+					bUseThreads ? sThreadUid : ''
 				].join(String.fromCharCode(0))), bSilent ? [] : ['MessageList']);
 		}
 		else
@@ -370,9 +361,11 @@
 				'Offset': iOffset,
 				'Limit': iLimit,
 				'Search': sSearch,
-				'UidNext': Cache.getFolderInboxName() === sFolderFullNameRaw ? Cache.getFolderUidNext(sFolderFullNameRaw) : '',
-				'UseThreads': AppStore.threadsAllowed() && SettingsStore.useThreads() ? '1' : '0'
-			}, '' === sSearch ? Consts.Defaults.DefaultAjaxTimeout : Consts.Defaults.SearchAjaxTimeout, '', bSilent ? [] : ['MessageList']);
+				'UidNext': sInboxUidNext,
+				'UseThreads': bUseThreads ? '1' : '0',
+				'ThreadUid': bUseThreads ? sThreadUid : ''
+			}, '' === sSearch ? Consts.Defaults.DefaultAjaxTimeout : Consts.Defaults.SearchAjaxTimeout,
+				'', bSilent ? [] : ['MessageList']);
 		}
 	};
 
@@ -414,35 +407,6 @@
 		return false;
 	};
 
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sFolderFullNameRaw
-	 * @param {number} iUid
-	 * @return {boolean}
-	 */
-	RemoteUserAjax.prototype.messageThreadsFromCache = function (fCallback, sFolderFullNameRaw, iUid)
-	{
-		sFolderFullNameRaw = Utils.pString(sFolderFullNameRaw);
-		iUid = Utils.pInt(iUid);
-
-		if (Cache.getFolderFromCacheList(sFolderFullNameRaw) && 0 < iUid)
-		{
-			var sFolderHash = Cache.getFolderHash(sFolderFullNameRaw);
-			if (sFolderHash)
-			{
-				this.defaultRequest(fCallback, 'MessageThreadsFromCache', {
-					'Folder': sFolderFullNameRaw,
-					'FolderHash': sFolderHash,
-					'Uid': iUid
-				});
-
-				return true;
-			}
-		}
-
-		return false;
-	};
-
 	/**
 	 * @param {?Function} fCallback
 	 * @param {Array} aExternals
@@ -744,19 +708,34 @@
 		});
 	};
 
+	/**
+	 * @param {?Function} fCallback
+	 * @param {string} sFolderFullNameRaw
+	 * @param {boolean} bCheckable
+	 */
+	RemoteUserAjax.prototype.folderSetCheckable = function (fCallback, sFolderFullNameRaw, bCheckable)
+	{
+		this.defaultRequest(fCallback, 'FolderCheckable', {
+			'Folder': sFolderFullNameRaw,
+			'Checkable': bCheckable ? '1' : '0'
+		});
+	};
+
 	/**
 	 * @param {?Function} fCallback
 	 * @param {string} sFolder
 	 * @param {string} sToFolder
 	 * @param {Array} aUids
 	 * @param {string=} sLearning
+	 * @param {boolean=} bMarkAsRead
 	 */
-	RemoteUserAjax.prototype.messagesMove = function (fCallback, sFolder, sToFolder, aUids, sLearning)
+	RemoteUserAjax.prototype.messagesMove = function (fCallback, sFolder, sToFolder, aUids, sLearning, bMarkAsRead)
 	{
 		this.defaultRequest(fCallback, 'MessageMove', {
 			'FromFolder': sFolder,
 			'ToFolder': sToFolder,
 			'Uids': aUids.join(','),
+			'MarkAsRead': bMarkAsRead ? '1' : '0',
 			'Learning': sLearning || ''
 		}, null, '', ['MessageList']);
 	};
diff --git a/dev/Screen/AbstractSettings.js b/dev/Screen/AbstractSettings.js
index 0727236f4..27d179cd2 100644
--- a/dev/Screen/AbstractSettings.js
+++ b/dev/Screen/AbstractSettings.js
@@ -131,6 +131,7 @@
 					// show
 					if (self.oCurrentSubScreen)
 					{
+						Utils.delegateRun(self.oCurrentSubScreen, 'onBeforeShow');
 						self.oCurrentSubScreen.viewModelDom.show();
 						Utils.delegateRun(self.oCurrentSubScreen, 'onShow');
 						Utils.delegateRun(self.oCurrentSubScreen, 'onShowWithDelay', [], 200);
diff --git a/dev/Screen/Admin/Settings.js b/dev/Screen/Admin/Settings.js
index 71267ca4c..bac2bedd5 100644
--- a/dev/Screen/Admin/Settings.js
+++ b/dev/Screen/Admin/Settings.js
@@ -38,8 +38,16 @@
 		kn.addSettingsViewModel(require('Settings/Admin/Login'),
 			'AdminSettingsLogin', 'TABS_LABELS/LABEL_LOGIN_NAME', 'login');
 
-		kn.addSettingsViewModel(require('Settings/Admin/Branding'),
-			'AdminSettingsBranding', 'TABS_LABELS/LABEL_BRANDING_NAME', 'branding');
+		if (RL_COMMUNITY)
+		{
+			kn.addSettingsViewModel(require('Settings/Admin/Branding'),
+				'AdminSettingsBranding', 'TABS_LABELS/LABEL_BRANDING_NAME', 'branding');
+		}
+		else
+		{
+			kn.addSettingsViewModel(require('Settings/Admin/Prem/Branding'),
+				'AdminSettingsBranding', 'TABS_LABELS/LABEL_BRANDING_NAME', 'branding');
+		}
 
 		kn.addSettingsViewModel(require('Settings/Admin/Contacts'),
 			'AdminSettingsContacts', 'TABS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
@@ -59,8 +67,11 @@
 		kn.addSettingsViewModel(require('Settings/Admin/Packages'),
 			'AdminSettingsPackages', 'TABS_LABELS/LABEL_PACKAGES_NAME', 'packages');
 
-		kn.addSettingsViewModel(require('Settings/Admin/Licensing'),
-			'AdminSettingsLicensing', 'TABS_LABELS/LABEL_LICENSING_NAME', 'licensing');
+		if (!RL_COMMUNITY)
+		{
+			kn.addSettingsViewModel(require('Settings/Admin/Prem/Licensing'),
+				'AdminSettingsLicensing', 'TABS_LABELS/LABEL_LICENSING_NAME', 'licensing');
+		}
 
 		kn.addSettingsViewModel(require('Settings/Admin/About'),
 			'AdminSettingsAbout', 'TABS_LABELS/LABEL_ABOUT_NAME', 'about');
diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js
index 64bb526cf..07a6da8c8 100644
--- a/dev/Screen/User/MailBox.js
+++ b/dev/Screen/User/MailBox.js
@@ -20,6 +20,8 @@
 		FolderStore = require('Stores/User/Folder'),
 		MessageStore = require('Stores/User/Message'),
 
+		Settings = require('Storage/Settings'),
+
 		AbstractScreen = require('Knoin/AbstractScreen')
 	;
 
@@ -53,6 +55,11 @@
 			nFoldersInboxUnreadCount = FolderStore.foldersInboxUnreadCount()
 		;
 
+		if (Settings.settingsGet('Filtered'))
+		{
+			nFoldersInboxUnreadCount = 0;
+		}
+
 		require('App/User').setWindowTitle(('' === sEmail ? '' : '' +
 			(0 < nFoldersInboxUnreadCount ? '(' + nFoldersInboxUnreadCount + ') ' : ' ') +
 				sEmail + ' - ') + Translator.i18n('TITLES/MAILBOX'));
@@ -64,26 +71,43 @@
 
 		AppStore.focusedState(Enums.Focused.None);
 		AppStore.focusedState(Enums.Focused.MessageList);
+
+		if (!Settings.capa(Enums.Capa.Folders))
+		{
+			Globals.leftPanelType(
+				Settings.capa(Enums.Capa.Composer) || Settings.capa(Enums.Capa.Contacts) ? 'short' : 'none');
+		}
+		else
+		{
+			Globals.leftPanelType('');
+		}
 	};
 
 	/**
 	 * @param {string} sFolderHash
 	 * @param {number} iPage
 	 * @param {string} sSearch
-	 * @param {boolean=} bPreview = false
 	 */
 	MailBoxUserScreen.prototype.onRoute = function (sFolderHash, iPage, sSearch)
 	{
 		var
-			sFolderFullNameRaw = Cache.getFolderFullNameRaw(sFolderHash),
-			oFolder = Cache.getFolderFromCacheList(sFolderFullNameRaw)
+			sThreadUid = sFolderHash.replace(/^(.+)~([\d]+)$/, '$2'),
+			oFolder = Cache.getFolderFromCacheList(Cache.getFolderFullNameRaw(
+				sFolderHash.replace(/~([\d]+)$/, '')))
 		;
 
 		if (oFolder)
 		{
+			if (sFolderHash === sThreadUid)
+			{
+				sThreadUid = '';
+			}
+
 			FolderStore.currentFolder(oFolder);
+
 			MessageStore.messageListPage(iPage);
 			MessageStore.messageListSearch(sSearch);
+			MessageStore.messageListThreadUid(sThreadUid);
 
 			require('App/User').reloadMessageList();
 		}
@@ -163,9 +187,9 @@
 		;
 
 		return [
-			[/^([a-zA-Z0-9]+)\/p([1-9][0-9]*)\/(.+)\/?$/, {'normalize_': fNormS}],
-			[/^([a-zA-Z0-9]+)\/p([1-9][0-9]*)$/, {'normalize_': fNormS}],
-			[/^([a-zA-Z0-9]+)\/(.+)\/?$/, {'normalize_': fNormD}],
+			[/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)\/(.+)\/?$/, {'normalize_': fNormS}],
+			[/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)$/, {'normalize_': fNormS}],
+			[/^([a-zA-Z0-9~]+)\/(.+)\/?$/, {'normalize_': fNormD}],
 			[/^([^\/]*)$/,  {'normalize_': fNormS}]
 		];
 	};
diff --git a/dev/Screen/User/Settings.js b/dev/Screen/User/Settings.js
index cb0ee5722..8ac11868f 100644
--- a/dev/Screen/User/Settings.js
+++ b/dev/Screen/User/Settings.js
@@ -47,6 +47,16 @@
 	 */
 	SettingsUserScreen.prototype.setupSettings = function (fCallback)
 	{
+		if (!Settings.capa(Enums.Capa.Settings))
+		{
+			if (fCallback)
+			{
+				fCallback();
+			}
+
+			return false;
+		}
+
 		kn.addSettingsViewModel(require('Settings/User/General'),
 			'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
 
@@ -56,9 +66,12 @@
 				'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
 		}
 
-		kn.addSettingsViewModel(require('Settings/User/Accounts'), 'SettingsAccounts',
-			Settings.capa(Enums.Capa.AdditionalAccounts) ?
-				'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME' : 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'accounts');
+		if (Settings.capa(Enums.Capa.AdditionalAccounts) || Settings.capa(Enums.Capa.Identities))
+		{
+			kn.addSettingsViewModel(require('Settings/User/Accounts'), 'SettingsAccounts',
+				Settings.capa(Enums.Capa.AdditionalAccounts) ?
+					'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME' : 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'accounts');
+		}
 
 		if (Settings.capa(Enums.Capa.Sieve))
 		{
@@ -72,10 +85,10 @@
 				'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
 		}
 
-		if (AccountStore.isRootAccount() &&
+		if (AccountStore.isRootAccount() && (
 			(Settings.settingsGet('AllowGoogleSocial') && Settings.settingsGet('AllowGoogleSocialAuth')) ||
 			Settings.settingsGet('AllowFacebookSocial') ||
-			Settings.settingsGet('AllowTwitterSocial'))
+			Settings.settingsGet('AllowTwitterSocial')))
 		{
 			kn.addSettingsViewModel(require('Settings/User/Social'),
 				'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
@@ -93,8 +106,11 @@
 				'SettingsTemplates', 'SETTINGS_LABELS/LABEL_TEMPLATES_NAME', 'templates');
 		}
 
-		kn.addSettingsViewModel(require('Settings/User/Folders'),
-			'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
+		if (Settings.capa(Enums.Capa.Folders))
+		{
+			kn.addSettingsViewModel(require('Settings/User/Folders'),
+				'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
+		}
 
 		if (Settings.capa(Enums.Capa.Themes))
 		{
@@ -114,12 +130,15 @@
 		{
 			fCallback();
 		}
+
+		return true;
 	};
 
 	SettingsUserScreen.prototype.onShow = function ()
 	{
 		this.setSettingsTitle();
 		Globals.keyScope(Enums.KeyState.Settings);
+		Globals.leftPanelType('');
 	};
 
 	SettingsUserScreen.prototype.setSettingsTitle = function ()
diff --git a/dev/Settings/.gitignore b/dev/Settings/.gitignore
new file mode 100644
index 000000000..d686bd062
--- /dev/null
+++ b/dev/Settings/.gitignore
@@ -0,0 +1,2 @@
+/Admin/Prem/**
+/Admin/_Prem/**
\ No newline at end of file
diff --git a/dev/Settings/Admin/About.js b/dev/Settings/Admin/About.js
index 0c8fb7a3e..2f65e6280 100644
--- a/dev/Settings/Admin/About.js
+++ b/dev/Settings/Admin/About.js
@@ -9,7 +9,8 @@
 		Translator = require('Common/Translator'),
 
 		Settings = require('Storage/Settings'),
-		CoreStore = require('Stores/Admin/Core')
+		CoreStore = require('Stores/Admin/Core'),
+		AppStore = require('Stores/Admin/App')
 	;
 
 	/**
@@ -34,7 +35,10 @@
 		this.coreRemoteRelease = CoreStore.coreRemoteRelease;
 		this.coreVersionCompare = CoreStore.coreVersionCompare;
 
+		this.community = RL_COMMUNITY || AppStore.community();
+
 		this.coreRemoteVersionHtmlDesc = ko.computed(function () {
+			Translator.trigger();
 			return Translator.i18n('TAB_ABOUT/HTML_NEW_VERSION', {'VERSION': this.coreRemoteVersion()});
 		}, this);
 
@@ -77,7 +81,7 @@
 
 	AboutAdminSettings.prototype.onBuild = function ()
 	{
-		if (this.access())
+		if (this.access() && !this.community)
 		{
 			require('App/Admin').reloadCoreData();
 		}
@@ -85,7 +89,7 @@
 
 	AboutAdminSettings.prototype.updateCoreData = function ()
 	{
-		if (!this.coreUpdating())
+		if (!this.coreUpdating() && !this.community)
 		{
 			require('App/Admin').updateCoreData();
 		}
diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js
index 748a68d79..0ce884e59 100644
--- a/dev/Settings/Admin/Branding.js
+++ b/dev/Settings/Admin/Branding.js
@@ -39,6 +39,15 @@
 		this.userLogo = ko.observable(Settings.settingsGet('UserLogo') || '');
 		this.userLogo.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
 
+		this.userLogoMessage = ko.observable(Settings.settingsGet('UserLogoMessage') || '');
+		this.userLogoMessage.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
+
+		this.userIframeMessage = ko.observable(Settings.settingsGet('UserIframeMessage') || '');
+		this.userIframeMessage.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
+
+		this.userLogoTitle = ko.observable(Settings.settingsGet('UserLogoTitle') || '');
+		this.userLogoTitle.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
+
 		this.loginDescription = ko.observable(Settings.settingsGet('LoginDescription'));
 		this.loginDescription.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
 
@@ -64,6 +73,8 @@
 		});
 
 		this.loginPowered = ko.observable(!!Settings.settingsGet('LoginPowered'));
+
+		this.community = RL_COMMUNITY || AppStore.community();
 	}
 
 	BrandingAdminSettings.prototype.onBuild = function ()
@@ -73,100 +84,26 @@
 			Remote = require('Remote/Admin/Ajax')
 		;
 
-		if (this.capa())
-		{
-			_.delay(function () {
+		_.delay(function () {
 
-				var
-					f3 = Utils.settingsSaveHelperSimpleFunction(self.loginLogo.trigger, self),
-					f4 = Utils.settingsSaveHelperSimpleFunction(self.loginDescription.trigger, self),
-					f5 = Utils.settingsSaveHelperSimpleFunction(self.loginCss.trigger, self),
-					f6 = Utils.settingsSaveHelperSimpleFunction(self.userLogo.trigger, self),
-					f7 = Utils.settingsSaveHelperSimpleFunction(self.loginBackground.trigger, self),
-					f8 = Utils.settingsSaveHelperSimpleFunction(self.userCss.trigger, self),
-					f9 = Utils.settingsSaveHelperSimpleFunction(self.welcomePageUrl.trigger, self),
-					f10 = Utils.settingsSaveHelperSimpleFunction(self.welcomePageDisplay.trigger, self)
-				;
+			var
+				f1 = Utils.settingsSaveHelperSimpleFunction(self.title.trigger, self),
+				f2 = Utils.settingsSaveHelperSimpleFunction(self.loadingDesc.trigger, self)
+			;
 
-				self.loginLogo.subscribe(function (sValue) {
-					Remote.saveAdminConfig(f3, {
-						'LoginLogo': Utils.trim(sValue)
-					});
+			self.title.subscribe(function (sValue) {
+				Remote.saveAdminConfig(f1, {
+					'Title': Utils.trim(sValue)
 				});
+			});
 
-				self.loginBackground.subscribe(function (sValue) {
-					Remote.saveAdminConfig(f7, {
-						'LoginBackground': Utils.trim(sValue)
-					});
+			self.loadingDesc.subscribe(function (sValue) {
+				Remote.saveAdminConfig(f2, {
+					'LoadingDescription': Utils.trim(sValue)
 				});
+			});
 
-				self.userLogo.subscribe(function (sValue) {
-					Remote.saveAdminConfig(f6, {
-						'UserLogo': Utils.trim(sValue)
-					});
-				});
-
-				self.loginDescription.subscribe(function (sValue) {
-					Remote.saveAdminConfig(f4, {
-						'LoginDescription': Utils.trim(sValue)
-					});
-				});
-
-				self.loginCss.subscribe(function (sValue) {
-					Remote.saveAdminConfig(f5, {
-						'LoginCss': Utils.trim(sValue)
-					});
-				});
-
-				self.userCss.subscribe(function (sValue) {
-					Remote.saveAdminConfig(f8, {
-						'UserCss': Utils.trim(sValue)
-					});
-				});
-
-				self.welcomePageUrl.subscribe(function (sValue) {
-					Remote.saveAdminConfig(f9, {
-						'WelcomePageUrl': Utils.trim(sValue)
-					});
-				});
-
-				self.welcomePageDisplay.subscribe(function (sValue) {
-					Remote.saveAdminConfig(f10, {
-						'WelcomePageDisplay': Utils.trim(sValue)
-					});
-				});
-
-				self.loginPowered.subscribe(function (bValue) {
-					Remote.saveAdminConfig(null, {
-						'LoginPowered': bValue ? '1' : '0'
-					});
-				});
-
-			}, 50);
-		}
-		else
-		{
-			_.delay(function () {
-
-				var
-					f1 = Utils.settingsSaveHelperSimpleFunction(self.title.trigger, self),
-					f2 = Utils.settingsSaveHelperSimpleFunction(self.loadingDesc.trigger, self)
-				;
-
-				self.title.subscribe(function (sValue) {
-					Remote.saveAdminConfig(f1, {
-						'Title': Utils.trim(sValue)
-					});
-				});
-
-				self.loadingDesc.subscribe(function (sValue) {
-					Remote.saveAdminConfig(f2, {
-						'LoadingDescription': Utils.trim(sValue)
-					});
-				});
-
-			}, 50);
-		}
+		}, 50);
 	};
 
 	module.exports = BrandingAdminSettings;
diff --git a/dev/Settings/Admin/General.js b/dev/Settings/Admin/General.js
index b56e2959c..ca000b854 100644
--- a/dev/Settings/Admin/General.js
+++ b/dev/Settings/Admin/General.js
@@ -37,6 +37,7 @@
 		this.capaUserBackground = CapaAdminStore.userBackground;
 		this.capaGravatar = CapaAdminStore.gravatar;
 		this.capaAdditionalAccounts = CapaAdminStore.additionalAccounts;
+		this.capaIdentities = CapaAdminStore.identities;
 		this.capaAttachmentThumbnails = CapaAdminStore.attachmentThumbnails;
 		this.capaTemplates = CapaAdminStore.templates;
 
@@ -136,6 +137,12 @@
 				});
 			});
 
+			self.capaIdentities.subscribe(function (bValue) {
+				Remote.saveAdminConfig(null, {
+					'CapaIdentities': bValue ? '1' : '0'
+				});
+			});
+
 			self.capaTemplates.subscribe(function (bValue) {
 				Remote.saveAdminConfig(null, {
 					'CapaTemplates': bValue ? '1' : '0'
diff --git a/dev/Settings/Admin/Licensing.js b/dev/Settings/Admin/Licensing.js
deleted file mode 100644
index 15bd709f5..000000000
--- a/dev/Settings/Admin/Licensing.js
+++ /dev/null
@@ -1,84 +0,0 @@
-
-(function () {
-
-	'use strict';
-
-	var
-		ko = require('ko'),
-
-		Settings = require('Storage/Settings'),
-		LicenseStore = require('Stores/Admin/License')
-	;
-
-	/**
-	 * @constructor
-	 */
-	function LicensingAdminSettings()
-	{
-		this.licensing = LicenseStore.licensing;
-		this.licensingProcess = LicenseStore.licensingProcess;
-		this.licenseValid = LicenseStore.licenseValid;
-		this.licenseExpired = LicenseStore.licenseExpired;
-		this.licenseError = LicenseStore.licenseError;
-		this.licenseTrigger = LicenseStore.licenseTrigger;
-
-		this.adminDomain = ko.observable('');
-		this.subscriptionEnabled = ko.observable(!!Settings.settingsGet('SubscriptionEnabled'));
-
-		this.licenseTrigger.subscribe(function () {
-			if (this.subscriptionEnabled())
-			{
-				require('App/Admin').reloadLicensing(true);
-			}
-		}, this);
-	}
-
-	LicensingAdminSettings.prototype.onBuild = function ()
-	{
-		if (this.subscriptionEnabled())
-		{
-			require('App/Admin').reloadLicensing(false);
-		}
-	};
-
-	LicensingAdminSettings.prototype.onShow = function ()
-	{
-		this.adminDomain(Settings.settingsGet('AdminDomain'));
-	};
-
-	LicensingAdminSettings.prototype.showActivationForm = function ()
-	{
-		require('Knoin/Knoin').showScreenPopup(require('View/Popup/Activate'));
-	};
-
-	LicensingAdminSettings.prototype.showTrialForm = function ()
-	{
-		require('Knoin/Knoin').showScreenPopup(require('View/Popup/Activate'), [true]);
-	};
-
-	/**
-	 * @return {boolean}
-	 */
-	LicensingAdminSettings.prototype.licenseIsUnlim = function ()
-	{
-		return 1898625600 === this.licenseExpired() || 1898625700 === this.licenseExpired();
-	};
-
-	/**
-	 * @return {string}
-	 */
-	LicensingAdminSettings.prototype.licenseExpiredMomentValue = function ()
-	{
-		var
-			moment = require('moment'),
-			iTime = this.licenseExpired(),
-			oM = moment.unix(iTime)
-		;
-
-		return this.licenseIsUnlim() ? 'Never' :
-			(iTime && (oM.format('LL') + ' (' + oM.from(moment()) + ')'));
-	};
-
-	module.exports = LicensingAdminSettings;
-
-}());
\ No newline at end of file
diff --git a/dev/Settings/Admin/Plugins.js b/dev/Settings/Admin/Plugins.js
index f15c7637c..c955eff04 100644
--- a/dev/Settings/Admin/Plugins.js
+++ b/dev/Settings/Admin/Plugins.js
@@ -12,7 +12,10 @@
 		Translator = require('Common/Translator'),
 
 		Settings = require('Storage/Settings'),
+
+		AppStore = require('Stores/Admin/App'),
 		PluginStore = require('Stores/Admin/Plugin'),
+		
 		Remote = require('Remote/Admin/Ajax')
 	;
 
@@ -26,6 +29,8 @@
 		this.plugins = PluginStore.plugins;
 		this.pluginsError = PluginStore.plugins.error;
 
+		this.community = RL_COMMUNITY || AppStore.community();
+
 		this.visibility = ko.computed(function () {
 			return PluginStore.plugins.loading() ? 'visible' : 'hidden';
 		}, this);
diff --git a/dev/Settings/Admin/Social.js b/dev/Settings/Admin/Social.js
index ca2d2ad84..8a6890cc5 100644
--- a/dev/Settings/Admin/Social.js
+++ b/dev/Settings/Admin/Social.js
@@ -20,6 +20,7 @@
 
 		this.googleEnable = SocialStore.google.enabled;
 		this.googleEnableAuth = SocialStore.google.capa.auth;
+		this.googleEnableAuthFast = SocialStore.google.capa.authFast;
 		this.googleEnableDrive = SocialStore.google.capa.drive;
 		this.googleEnablePreview = SocialStore.google.capa.preview;
 
diff --git a/dev/Settings/User/Accounts.js b/dev/Settings/User/Accounts.js
index 3b79644cd..8beb9e9f6 100644
--- a/dev/Settings/User/Accounts.js
+++ b/dev/Settings/User/Accounts.js
@@ -24,7 +24,7 @@
 	function AccountsUserSettings()
 	{
 		this.allowAdditionalAccount = Settings.capa(Enums.Capa.AdditionalAccounts);
-		this.allowIdentities = true;
+		this.allowIdentities = Settings.capa(Enums.Capa.Identities);
 
 		this.accounts = AccountStore.accounts;
 		this.identities = IdentityStore.identities;
@@ -33,10 +33,12 @@
 		this.identityForDeletion = ko.observable(null).deleteAccessHelper();
 	}
 
-	AccountsUserSettings.prototype.scrollableOptions = function ()
+	AccountsUserSettings.prototype.scrollableOptions = function (sWrapper)
 	{
 		return {
-			handle: '.drag-handle'
+			handle: '.drag-handle',
+			containment: sWrapper || 'parent',
+			axis: 'y'
 		};
 	};
 
diff --git a/dev/Settings/User/ChangePassword.js b/dev/Settings/User/ChangePassword.js
index 8a53619c4..b6fb723e6 100644
--- a/dev/Settings/User/ChangePassword.js
+++ b/dev/Settings/User/ChangePassword.js
@@ -103,6 +103,8 @@
 
 			this.passwordUpdateSuccess(true);
 			this.currentPassword.error(false);
+
+			require('App/User').setClientSideToken(oData.Result);
 		}
 		else
 		{
diff --git a/dev/Settings/User/Filters.js b/dev/Settings/User/Filters.js
index f5f133299..9ed24f23a 100644
--- a/dev/Settings/User/Filters.js
+++ b/dev/Settings/User/Filters.js
@@ -110,10 +110,12 @@
 		}, this);
 	}
 
-	FiltersUserSettings.prototype.scrollableOptions = function ()
+	FiltersUserSettings.prototype.scrollableOptions = function (sWrapper)
 	{
 		return {
-			handle: '.drag-handle'
+			handle: '.drag-handle',
+			containment: sWrapper || 'parent',
+			axis: 'y'
 		};
 	};
 
diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index c5812c9ed..9d826f69b 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -26,8 +26,11 @@
 	 */
 	function FoldersUserSettings()
 	{
+		this.displaySpecSetting = FolderStore.displaySpecSetting;
 		this.folderList = FolderStore.folderList;
 
+		this.folderListHelp = ko.observable('').extend({'throttle': 100});
+
 		this.loading = ko.computed(function () {
 
 			var
@@ -95,6 +98,25 @@
 		FolderStore.folderList.error('');
 	};
 
+	FoldersUserSettings.prototype.onBuild = function (oDom)
+	{
+		var self = this;
+		oDom
+			.on('mouseover', '.delete-folder-parent', function () {
+				self.folderListHelp(Translator.i18n('SETTINGS_FOLDERS/HELP_DELETE_FOLDER'));
+			})
+			.on('mouseover', '.subscribe-folder-parent', function () {
+				self.folderListHelp(Translator.i18n('SETTINGS_FOLDERS/HELP_SHOW_HIDE_FOLDER'));
+			})
+			.on('mouseover', '.check-folder-parent', function () {
+				self.folderListHelp(Translator.i18n('SETTINGS_FOLDERS/HELP_CHECK_FOR_NEW_MESSAGES'));
+			})
+			.on('mouseout', '.subscribe-folder-parent, .check-folder-parent, .delete-folder-parent', function () {
+				self.folderListHelp('');
+			})
+		;
+	};
+
 	FoldersUserSettings.prototype.createFolder = function ()
 	{
 		require('Knoin/Knoin').showScreenPopup(require('View/Popup/FolderCreate'));
@@ -160,6 +182,20 @@
 		oFolder.subScribed(false);
 	};
 
+	FoldersUserSettings.prototype.checkableTrueFolder = function (oFolder)
+	{
+		Remote.folderSetCheckable(Utils.emptyFunction, oFolder.fullNameRaw, true);
+
+		oFolder.checkable(true);
+	};
+
+	FoldersUserSettings.prototype.checkableFalseFolder = function (oFolder)
+	{
+		Remote.folderSetCheckable(Utils.emptyFunction, oFolder.fullNameRaw, false);
+
+		oFolder.checkable(false);
+	};
+
 	module.exports = FoldersUserSettings;
 
 }());
\ No newline at end of file
diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js
index 5d103bdad..7d4dc9d46 100644
--- a/dev/Settings/User/General.js
+++ b/dev/Settings/User/General.js
@@ -16,6 +16,7 @@
 		AppStore = require('Stores/User/App'),
 		LanguageStore = require('Stores/Language'),
 		SettingsStore = require('Stores/User/Settings'),
+		IdentityStore = require('Stores/User/Identity'),
 		NotificationStore = require('Stores/User/Notification'),
 		MessageStore = require('Stores/User/Message'),
 
@@ -62,6 +63,20 @@
 
 		this.isAnimationSupported = Globals.bAnimationSupported;
 
+		this.identities = IdentityStore.identities;
+
+		this.identityMain = ko.computed(function () {
+			var aList = this.identities();
+			return Utils.isArray(aList) ? _.find(aList, function (oItem) {
+				return oItem && '' === oItem.id() ? true : false;
+			}) : null;
+		}, this);
+
+		this.identityMainDesc = ko.computed(function () {
+			var oIdentity = this.identityMain();
+			return oIdentity ? oIdentity.formattedName() : '---';
+		}, this);
+
 		this.editorDefaultTypes = ko.computed(function () {
 			Translator.trigger();
 			return [
@@ -82,6 +97,15 @@
 		}, this);
 	}
 
+	GeneralUserSettings.prototype.editMainIdentity = function ()
+	{
+		var oIdentity = this.identityMain();
+		if (oIdentity)
+		{
+			require('Knoin/Knoin').showScreenPopup(require('View/Popup/Identity'), [oIdentity]);
+		}
+	};
+
 	GeneralUserSettings.prototype.testSoundNotification = function ()
 	{
 		NotificationStore.playSoundNotification(true);
diff --git a/dev/Settings/User/OpenPgp.js b/dev/Settings/User/OpenPgp.js
index e5c6ef6b9..c302d76ef 100644
--- a/dev/Settings/User/OpenPgp.js
+++ b/dev/Settings/User/OpenPgp.js
@@ -6,6 +6,7 @@
 	var
 		_ = require('_'),
 		ko = require('ko'),
+		window = require('window'),
 
 		Utils = require('Common/Utils'),
 
@@ -24,6 +25,8 @@
 		this.openpgpkeysPrivate = PgpStore.openpgpkeysPrivate;
 
 		this.openPgpKeyForDeletion = ko.observable(null).deleteAccessHelper();
+
+		this.isHttps = window.document && window.document.location ? 'https:' === window.document.location.protocol : false;
 	}
 
 	OpenPgpUserSettings.prototype.addOpenPgpKey = function ()
diff --git a/dev/Settings/User/Social.js b/dev/Settings/User/Social.js
index b5521a546..82bbe5d2f 100644
--- a/dev/Settings/User/Social.js
+++ b/dev/Settings/User/Social.js
@@ -15,6 +15,7 @@
 
 		this.googleEnable = SocialStore.google.enabled;
 		this.googleEnableAuth = SocialStore.google.capa.auth;
+		this.googleEnableAuthFast = SocialStore.google.capa.authFast;
 		this.googleEnableDrive = SocialStore.google.capa.drive;
 		this.googleEnablePreview = SocialStore.google.capa.preview;
 
diff --git a/dev/Settings/User/Templates.js b/dev/Settings/User/Templates.js
index db6991f7c..42f8baabb 100644
--- a/dev/Settings/User/Templates.js
+++ b/dev/Settings/User/Templates.js
@@ -31,10 +31,12 @@
 		this.templateForDeletion = ko.observable(null).deleteAccessHelper();
 	}
 
-	TemplatesUserSettings.prototype.scrollableOptions = function ()
+	TemplatesUserSettings.prototype.scrollableOptions = function (sWrapper)
 	{
 		return {
-			handle: '.drag-handle'
+			handle: '.drag-handle',
+			containment: sWrapper || 'parent',
+			axis: 'y'
 		};
 	};
 
diff --git a/dev/Storage/Settings.js b/dev/Storage/Settings.js
index ef12c2a8f..3fecebfc2 100644
--- a/dev/Storage/Settings.js
+++ b/dev/Storage/Settings.js
@@ -16,7 +16,6 @@
 	{
 		this.oSettings = window['rainloopAppData'] || {};
 		this.oSettings = Utils.isNormal(this.oSettings) ? this.oSettings : {};
-//		window.console.log(this.oSettings);
 	}
 
 	SettingsStorage.prototype.oSettings = null;
diff --git a/dev/Stores/Admin/Capa.js b/dev/Stores/Admin/Capa.js
index a2dfcf963..e7223103b 100644
--- a/dev/Stores/Admin/Capa.js
+++ b/dev/Stores/Admin/Capa.js
@@ -17,6 +17,7 @@
 	function CapaAdminStore()
 	{
 		this.additionalAccounts = ko.observable(false);
+		this.identities = ko.observable(false);
 		this.gravatar = ko.observable(false);
 		this.attachmentThumbnails = ko.observable(false);
 		this.sieve = ko.observable(false);
@@ -32,6 +33,7 @@
 	CapaAdminStore.prototype.populate = function()
 	{
 		this.additionalAccounts(Settings.capa(Enums.Capa.AdditionalAccounts));
+		this.identities(Settings.capa(Enums.Capa.Identities));
 		this.gravatar(Settings.capa(Enums.Capa.Gravatar));
 		this.attachmentThumbnails(Settings.capa(Enums.Capa.AttachmentThumbnails));
 		this.sieve(Settings.capa(Enums.Capa.Sieve));
diff --git a/dev/Stores/App.js b/dev/Stores/App.js
index 45b560689..28e70b1f8 100644
--- a/dev/Stores/App.js
+++ b/dev/Stores/App.js
@@ -29,6 +29,7 @@
 		this.interfaceAnimation.valueHasMutated();
 
 		this.prem = ko.observable(false);
+		this.community = ko.observable(true);
 	}
 
 	AppStore.prototype.populate = function()
@@ -39,6 +40,7 @@
 		this.interfaceAnimation(!!Settings.settingsGet('InterfaceAnimation'));
 
 		this.prem(!!Settings.settingsGet('PremType'));
+		this.community(!!Settings.settingsGet('Community'));
 	};
 
 	module.exports = AppStore;
diff --git a/dev/Stores/Language.js b/dev/Stores/Language.js
index 2659f42a0..4b3b1aa9b 100644
--- a/dev/Stores/Language.js
+++ b/dev/Stores/Language.js
@@ -22,14 +22,11 @@
 		this.language = ko.observable('')
 			.extend({'limitedList': this.languages});
 
-		this.userLanguage = ko.observable('')
-			.extend({'limitedList': this.languages});
-
 		this.languageAdmin = ko.observable('')
 			.extend({'limitedList': this.languagesAdmin});
 
-		this.userLanguageAdmin = ko.observable('')
-			.extend({'limitedList': this.languagesAdmin});
+		this.userLanguage = ko.observable('');
+		this.userLanguageAdmin = ko.observable('');
 	}
 
 	LanguageStore.prototype.populate = function ()
diff --git a/dev/Stores/Social.js b/dev/Stores/Social.js
index 0e870ce5b..ffeb0f6f9 100644
--- a/dev/Stores/Social.js
+++ b/dev/Stores/Social.js
@@ -33,6 +33,7 @@
 
 		this.google.capa = {};
 		this.google.capa.auth = ko.observable(false);
+		this.google.capa.authFast = ko.observable(false);
 		this.google.capa.drive = ko.observable(false);
 		this.google.capa.preview = ko.observable(false);
 
@@ -88,6 +89,7 @@
 		this.google.apiKey(Settings.settingsGet('GoogleApiKey'));
 
 		this.google.capa.auth(!!Settings.settingsGet('AllowGoogleSocialAuth'));
+		this.google.capa.authFast(!!Settings.settingsGet('AllowGoogleSocialAuthFast'));
 		this.google.capa.drive(!!Settings.settingsGet('AllowGoogleSocialDrive'));
 		this.google.capa.preview(!!Settings.settingsGet('AllowGoogleSocialPreview'));
 
diff --git a/dev/Stores/User/App.js b/dev/Stores/User/App.js
index e42fb074d..8e8a73695 100644
--- a/dev/Stores/User/App.js
+++ b/dev/Stores/User/App.js
@@ -8,6 +8,7 @@
 
 		Enums = require('Common/Enums'),
 		Globals = require('Common/Globals'),
+		Utils = require('Common/Utils'),
 
 		Settings = require('Storage/Settings'),
 
@@ -52,6 +53,8 @@
 
 		this.contactsIsAllowed = ko.observable(false);
 
+		this.attachmentsActions = ko.observableArray([]);
+
 		this.devEmail = '';
 		this.devPassword = '';
 	}
@@ -67,6 +70,9 @@
 
 		this.contactsIsAllowed(!!Settings.settingsGet('ContactsIsAllowed'));
 
+		var mAttachmentsActions = Settings.settingsGet('AttachmentsActions');
+		this.attachmentsActions(Utils.isNonEmptyArray(mAttachmentsActions) ? mAttachmentsActions : []);
+
 		this.devEmail = Settings.settingsGet('DevEmail');
 		this.devPassword = Settings.settingsGet('DevPassword');
 	};
diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js
index 8b04773fe..57081f7b1 100644
--- a/dev/Stores/User/Folder.js
+++ b/dev/Stores/User/Folder.js
@@ -19,6 +19,8 @@
 	 */
 	function FolderUserStore()
 	{
+		this.displaySpecSetting = ko.observable(true);
+
 		this.sentFolder = ko.observable('');
 		this.draftFolder = ko.observable('');
 		this.spamFolder = ko.observable('');
@@ -181,13 +183,10 @@
 	};
 
 	/**
-	 * @param {boolean=} bBoot = false
 	 * @return {Array}
 	 */
-	FolderUserStore.prototype.getNextFolderNames = function (bBoot)
+	FolderUserStore.prototype.getNextFolderNames = function ()
 	{
-		bBoot = Utils.isUnd(bBoot) ? false : !!bBoot;
-
 		var
 			aResult = [],
 			iLimit = 5,
@@ -200,7 +199,8 @@
 					if (oFolder && sInboxFolderName !== oFolder.fullNameRaw &&
 						oFolder.selectable && oFolder.existen &&
 						iTimeout > oFolder.interval &&
-						(!bBoot || oFolder.subScribed()))
+						(oFolder.isSystemFolder() || (oFolder.subScribed() && oFolder.checkable()))
+					)
 					{
 						aTimeouts.push([oFolder.interval, oFolder.fullNameRaw]);
 					}
@@ -236,7 +236,9 @@
 			return iLimit <= aResult.length;
 		});
 
-		return _.uniq(aResult);
+		aResult = _.uniq(aResult);
+
+		return aResult;
 	};
 
 	module.exports = new FolderUserStore();
diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index 55c503324..53b019820 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -22,6 +22,7 @@
 
 		AppStore = require('Stores/User/App'),
 		FolderStore = require('Stores/User/Folder'),
+		PgpStore = require('Stores/User/Pgp'),
 		SettingsStore = require('Stores/User/Settings'),
 
 		Remote = require('Remote/User/Ajax'),
@@ -41,11 +42,14 @@
 
 		this.messageListCount = ko.observable(0);
 		this.messageListSearch = ko.observable('');
+		this.messageListThreadUid = ko.observable('');
 		this.messageListPage = ko.observable(1);
+		this.messageListPageBeforeThread = ko.observable(1);
 		this.messageListError = ko.observable('');
 
 		this.messageListEndFolder = ko.observable('');
 		this.messageListEndSearch = ko.observable('');
+		this.messageListEndThreadUid = ko.observable('');
 		this.messageListEndPage = ko.observable(1);
 
 		this.messageListLoading = ko.observable(false);
@@ -63,17 +67,12 @@
 
 		this.message.viewTrigger = ko.observable(false);
 
-		this.messageThreadList = ko.observableArray([]);
-
-		this.messageLastThreadUidsData = ko.observable(null);
-
 		this.messageError = ko.observable('');
 
 		this.messageCurrentLoading = ko.observable(false);
-		this.messageThreadLoading = ko.observable(false);
 
 		this.messageLoading = ko.computed(function () {
-			return !!(this.messageCurrentLoading() || this.messageThreadLoading());
+			return this.messageCurrentLoading();
 		}, this);
 
 		this.messageLoadingThrottle = ko.observable(false).extend({'throttle': 50});
@@ -93,8 +92,12 @@
 
 	MessageUserStore.prototype.computers = function ()
 	{
+		var self = this;
+
 		this.messageListEndHash = ko.computed(function () {
-			return this.messageListEndFolder() + '|' + this.messageListEndSearch() + '|' + this.messageListEndPage();
+			return this.messageListEndFolder() + '|' + this.messageListEndSearch() +
+				'|' + this.messageListEndThreadUid() +
+				'|' + this.messageListEndPage();
 		}, this);
 
 		this.messageListPageCount = ko.computed(function () {
@@ -107,7 +110,8 @@
 			'read': this.messageListSearch,
 			'write': function (sValue) {
 				kn.setHash(Links.mailBox(
-					FolderStore.currentFolderFullNameHash(), 1, Utils.trim(sValue.toString())
+					FolderStore.currentFolderFullNameHash(), 1,
+					Utils.trim(sValue.toString()), self.messageListThreadUid()
 				));
 			},
 			'owner': this
@@ -222,16 +226,16 @@
 	{
 		var
 			iCount = 0,
-			oMessagesBodiesDom = null,
+			oMessagesDom = null,
 			iEnd = Globals.iMessageBodyCacheCount - Consts.Values.MessageBodyCacheLimit
 		;
 
 		if (0 < iEnd)
 		{
-			oMessagesBodiesDom = this.messagesBodiesDom();
-			if (oMessagesBodiesDom)
+			oMessagesDom = this.messagesBodiesDom();
+			if (oMessagesDom)
 			{
-				oMessagesBodiesDom.find('.rl-cache-class').each(function () {
+				oMessagesDom.find('.rl-cache-class').each(function () {
 					var oItem = $(this);
 					if (iEnd > oItem.data('rl-cache-count'))
 					{
@@ -243,7 +247,7 @@
 				if (0 < iCount)
 				{
 					_.delay(function () {
-						oMessagesBodiesDom.find('.rl-cache-purge').remove();
+						oMessagesDom.find('.rl-cache-purge').remove();
 					}, 300);
 				}
 			}
@@ -275,7 +279,8 @@
 						require('Stores/User/Account').email(),
 						Translator.i18n('MESSAGE_LIST/NEW_MESSAGE_NOTIFICATION', {
 							'COUNT': iLen
-						})
+						}),
+						{'Folder': '', 'Uid': ''}
 					);
 				}
 				else
@@ -286,7 +291,11 @@
 							Links.notificationMailIcon(),
 							MessageHelper.emailArrayToString(
 								MessageHelper.emailArrayFromJson(aNewMessages[iIndex].From), false),
-							aNewMessages[iIndex].Subject
+							aNewMessages[iIndex].Subject,
+							{
+								'Folder': aNewMessages[iIndex].Folder,
+								'Uid': aNewMessages[iIndex].Uid
+							}
 						);
 					}
 				}
@@ -298,10 +307,10 @@
 
 	MessageUserStore.prototype.hideMessageBodies = function ()
 	{
-		var oMessagesBodiesDom = this.messagesBodiesDom();
-		if (oMessagesBodiesDom)
+		var oMessagesDom = this.messagesBodiesDom();
+		if (oMessagesDom)
 		{
-			oMessagesBodiesDom.find('.b-text-part').hide();
+			oMessagesDom.find('.b-text-part').hide();
 		}
 	};
 
@@ -324,6 +333,9 @@
 		var
 			self = this,
 			iUnseenCount = 0,
+			oMessage = null,
+			sTrashFolder = FolderStore.trashFolder(),
+			sSpamFolder = FolderStore.spamFolder(),
 			aMessageList = this.messageList(),
 			oFromFolder = Cache.getFolderFromCacheList(sFromFolderFullNameRaw),
 			oToFolder = '' === sToFolderFullNameRaw ? null : Cache.getFolderFromCacheList(sToFolderFullNameRaw || ''),
@@ -355,6 +367,11 @@
 
 		if (oToFolder)
 		{
+			if (sTrashFolder === oToFolder.fullNameRaw || sSpamFolder === oToFolder.fullNameRaw)
+			{
+				iUnseenCount = 0;
+			}
+
 			oToFolder.messageCountAll(oToFolder.messageCountAll() + aUidForRemove.length);
 			if (0 < iUnseenCount)
 			{
@@ -403,6 +420,56 @@
 		{
 			Cache.setFolderHash(sToFolderFullNameRaw, '');
 		}
+
+		if ('' !== this.messageListThreadUid())
+		{
+			aMessageList = this.messageList();
+
+			if (aMessageList && 0 < aMessageList.length && !!_.find(aMessageList, function (oMessage) {
+				return !!(oMessage && oMessage.deleted() && oMessage.uid === self.messageListThreadUid());
+			}))
+			{
+				oMessage = _.find(aMessageList, function (oMessage) {
+					return oMessage && !oMessage.deleted();
+				});
+
+				if (oMessage && this.messageListThreadUid() !== Utils.pString(oMessage.uid))
+				{
+					this.messageListThreadUid(Utils.pString(oMessage.uid));
+
+					kn.setHash(Links.mailBox(
+						FolderStore.currentFolderFullNameHash(),
+						this.messageListPage(),
+						this.messageListSearch(),
+						this.messageListThreadUid()
+					), true, true);
+				}
+				else if (!oMessage)
+				{
+					if (1 < this.messageListPage())
+					{
+						this.messageListPage(this.messageListPage() - 1);
+
+						kn.setHash(Links.mailBox(
+							FolderStore.currentFolderFullNameHash(),
+							this.messageListPage(),
+							this.messageListSearch(),
+							this.messageListThreadUid()
+						), true, true);
+					}
+					else
+					{
+						this.messageListThreadUid('');
+
+						kn.setHash(Links.mailBox(
+							FolderStore.currentFolderFullNameHash(),
+							this.messageListPageBeforeThread(),
+							this.messageListSearch()
+						), true, true);
+					}
+				}
+			}
+		}
 	};
 
 	MessageUserStore.prototype.addBlockquoteSwitcherCallback = function ()
@@ -441,20 +508,35 @@
 		}
 	};
 
+	/**
+	 * @param {Object} oMessageTextBody
+	 */
+	MessageUserStore.prototype.initOpenPgpControls = function (oMessageTextBody)
+	{
+		if (oMessageTextBody && oMessageTextBody.find)
+		{
+			oMessageTextBody.find('.b-plain-openpgp:not(.inited)').each(function () {
+				PgpStore.initMessageBodyControls($(this));
+			});
+		}
+	};
+
 	MessageUserStore.prototype.setMessage = function (oData, bCached)
 	{
 		var
 			bNew = false,
 			bIsHtml = false,
+			sTag = 'div',
 			bHasExternals = false,
 			bHasInternals = false,
 			oBody = null,
 			oTextBody = null,
 			sId = '',
+			sPlain = '',
 			sResultHtml = '',
 			bPgpSigned = false,
 			bPgpEncrypted = false,
-			oMessagesBodiesDom = this.messagesBodiesDom(),
+			oMessagesDom = this.messagesBodiesDom(),
 			oSelectedMessage = this.selectorMessageSelected(),
 			oMessage = this.message(),
 			aThreads = []
@@ -492,19 +574,17 @@
 					oMessage.initFlagsByJson(oData.Result);
 				}
 
-				oMessagesBodiesDom = oMessagesBodiesDom && oMessagesBodiesDom[0] ? oMessagesBodiesDom : null;
-				if (oMessagesBodiesDom)
+				oMessagesDom = oMessagesDom && oMessagesDom[0] ? oMessagesDom : null;
+				if (oMessagesDom)
 				{
 					sId = 'rl-mgs-' + oMessage.hash.replace(/[^a-zA-Z0-9]/g, '');
-					oTextBody = oMessagesBodiesDom.find('#' + sId);
+					oTextBody = oMessagesDom.find('#' + sId);
+
 					if (!oTextBody || !oTextBody[0])
 					{
 						bHasExternals = !!oData.Result.HasExternals;
 						bHasInternals = !!oData.Result.HasInternals;
 
-						oBody = $('
').hide().addClass('rl-cache-class');
-						oBody.data('rl-cache-count', ++Globals.iMessageBodyCacheCount);
-
 						if (Utils.isNormal(oData.Result.Html) && '' !== oData.Result.Html)
 						{
 							bIsHtml = true;
@@ -517,13 +597,13 @@
 
 							if ((oMessage.isPgpSigned() || oMessage.isPgpEncrypted()) && require('Stores/User/Pgp').capaOpenPGP())
 							{
-								oMessage.plainRaw = Utils.pString(oData.Result.Plain);
+								sPlain = Utils.pString(oData.Result.Plain);
 
-								bPgpEncrypted = /---BEGIN PGP MESSAGE---/.test(oMessage.plainRaw);
+								bPgpEncrypted = /---BEGIN PGP MESSAGE---/.test(sPlain);
 								if (!bPgpEncrypted)
 								{
-									bPgpSigned = /-----BEGIN PGP SIGNED MESSAGE-----/.test(oMessage.plainRaw) &&
-										/-----BEGIN PGP SIGNATURE-----/.test(oMessage.plainRaw);
+									bPgpSigned = /-----BEGIN PGP SIGNED MESSAGE-----/.test(sPlain) &&
+										/-----BEGIN PGP SIGNATURE-----/.test(sPlain);
 								}
 
 								Globals.$div.empty();
@@ -531,7 +611,7 @@
 								{
 									sResultHtml =
 										Globals.$div.append(
-											$('
').text(oMessage.plainRaw)
+											$('
').text(sPlain)
 										).html()
 									;
 								}
@@ -539,22 +619,36 @@
 								{
 									sResultHtml =
 										Globals.$div.append(
-											$('
').text(oMessage.plainRaw)
+											$('
').text(sPlain)
 										).html()
 									;
 								}
+								else
+								{
+									sResultHtml = '
' + sResultHtml + '
';
+								}
+
+								sPlain = '';
 
 								Globals.$div.empty();
 
 								oMessage.isPgpSigned(bPgpSigned);
 								oMessage.isPgpEncrypted(bPgpEncrypted);
 							}
+							else
+							{
+								sResultHtml = '
' + sResultHtml + '
';
+							}
 						}
 						else
 						{
 							bIsHtml = false;
+							sResultHtml = '
' + sResultHtml + '
';
 						}
 
+						oBody = $('
').hide().addClass('rl-cache-class');
+						oBody.data('rl-cache-count', ++Globals.iMessageBodyCacheCount);
+
 						oBody
 							.html(Utils.findEmailAndLinks(sResultHtml))
 							.addClass('b-text-part ' + (bIsHtml ? 'html' : 'plain'))
@@ -562,16 +656,14 @@
 
 						oMessage.isHtml(!!bIsHtml);
 						oMessage.hasImages(!!bHasExternals);
-						oMessage.pgpSignedVerifyStatus(Enums.SignedVerifyStatus.None);
-						oMessage.pgpSignedVerifyUser('');
 
 						oMessage.body = oBody;
 						if (oMessage.body)
 						{
-							oMessagesBodiesDom.append(oMessage.body);
+							oMessagesDom.append(oMessage.body);
 						}
 
-						oMessage.storeDataToDom();
+						oMessage.storeDataInDom();
 
 						if (bHasInternals)
 						{
@@ -591,7 +683,7 @@
 						if (oMessage.body)
 						{
 							oMessage.body.data('rl-cache-count', ++Globals.iMessageBodyCacheCount);
-							oMessage.fetchDataToDom();
+							oMessage.fetchDataFromDom();
 						}
 					}
 
@@ -601,6 +693,8 @@
 
 					if (oBody)
 					{
+						this.initOpenPgpControls(oBody);
+
 						this.initBlockquoteSwitcher(oBody);
 					}
 
@@ -665,11 +759,19 @@
 		}
 	};
 
-	MessageUserStore.prototype.selectThreadMessage = function (sFolder, sUid)
+	MessageUserStore.prototype.selectMessageByFolderAndUid = function (sFolder, sUid)
 	{
-		if (Remote.message(this.onMessageResponse, sFolder, sUid))
+		if (sFolder && sUid)
 		{
-			this.messageThreadLoading(true);
+			this.message(this.staticMessage.populateByMessageListItem(null));
+			this.message().folderFullNameRaw = sFolder;
+			this.message().uid = sUid;
+
+			this.populateMessageBody(this.message());
+		}
+		else
+		{
+			this.message(null);
 		}
 	};
 
@@ -694,7 +796,6 @@
 		this.hideMessageBodies();
 
 		this.messageCurrentLoading(false);
-		this.messageThreadLoading(false);
 
 		if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
 		{
@@ -731,7 +832,6 @@
 			oData.Result['@Collection'] && Utils.isArray(oData.Result['@Collection']))
 		{
 			var
-				self = this,
 				iIndex = 0,
 				iLen = 0,
 				iCount = 0,
@@ -813,9 +913,11 @@
 			this.messageListCount(iCount);
 			this.messageListSearch(Utils.isNormal(oData.Result.Search) ? oData.Result.Search : '');
 			this.messageListPage(window.Math.ceil((iOffset / SettingsStore.messagesPerPage()) + 1));
+			this.messageListThreadUid(Utils.isNormal(oData.Result.ThreadUid) ? Utils.pString(oData.Result.ThreadUid) : '');
 
 			this.messageListEndFolder(Utils.isNormal(oData.Result.Folder) ? oData.Result.Folder : '');
-			this.messageListEndSearch(Utils.isNormal(oData.Result.Search) ? oData.Result.Search : '');
+			this.messageListEndSearch(this.messageListSearch());
+			this.messageListEndThreadUid(this.messageListThreadUid());
 			this.messageListEndPage(this.messageListPage());
 
 			this.messageListDisableAutoSelect(true);
@@ -825,26 +927,6 @@
 
 			Cache.clearNewMessageCache();
 
-			if (AppStore.threadsAllowed() && SettingsStore.useThreads())
-			{
-				oMessage = this.message();
-				if (oMessage)
-				{
-					Remote.messageThreadsFromCache(function (sResult, oData) {
-
-						if (Enums.StorageResultType.Success === sResult && oData &&  oData.Result && oData.Result.ThreadUids)
-						{
-							self.messageLastThreadUidsData({
-								'Folder': oData.Result.Folder,
-								'Uid': oData.Result.Uid,
-								'Uids': oData.Result.ThreadUids
-							});
-						}
-
-					}, oMessage.folderFullNameRaw, oMessage.uid);
-				}
-			}
-
 			if (oFolder && (bCached || bUnreadCountChange || SettingsStore.useThreads()))
 			{
 				require('App/User').folderInformation(oFolder.fullNameRaw, aList);
diff --git a/dev/Stores/User/Notification.js b/dev/Stores/User/Notification.js
index e17e10821..fb8412e92 100644
--- a/dev/Stores/User/Notification.js
+++ b/dev/Stores/User/Notification.js
@@ -8,6 +8,7 @@
 		ko = require('ko'),
 
 		Enums = require('Common/Enums'),
+		Events = require('Common/Events'),
 		Audio = require('Common/Audio'),
 
 		Settings = require('Storage/Settings')
@@ -161,7 +162,7 @@
 		}
 	};
 
-	NotificationUserStore.prototype.displayDesktopNotification = function (sImageSrc, sTitle, sText)
+	NotificationUserStore.prototype.displayDesktopNotification = function (sImageSrc, sTitle, sText, oMessageData)
 	{
 		if (this.enableDesktopNotification())
 		{
@@ -180,6 +181,19 @@
 					oNotification.show();
 				}
 
+				if (oMessageData)
+				{
+					oNotification.onclick = function () {
+
+						window.focus();
+
+						if (oMessageData.Folder && oMessageData.Uid)
+						{
+							Events.pub('mailbox.message.show', [oMessageData.Folder, oMessageData.Uid]);
+						}
+					};
+				}
+
 				window.setTimeout((function (oLocalNotifications) {
 					return function () {
 						if (oLocalNotifications.cancel)
diff --git a/dev/Stores/User/Pgp.js b/dev/Stores/User/Pgp.js
index a6e62e6e0..c6ae88594 100644
--- a/dev/Stores/User/Pgp.js
+++ b/dev/Stores/User/Pgp.js
@@ -5,6 +5,10 @@
 	var
 		_ = require('_'),
 		ko = require('ko'),
+		$ = require('$'),
+		kn = require('Knoin/Knoin'),
+
+		Translator = require('Common/Translator'),
 
 		Utils = require('Common/Utils')
 	;
@@ -41,32 +45,63 @@
 	PgpUserStore.prototype.findPublicKeyByHex = function (sHash)
 	{
 		return _.find(this.openpgpkeysPublic(), function (oItem) {
-			return oItem && sHash === oItem.id;
+			return sHash && oItem && sHash === oItem.id;
+		});
+	};
+
+	PgpUserStore.prototype.findPrivateKeyByHex = function (sHash)
+	{
+		return _.find(this.openpgpkeysPrivate(), function (oItem) {
+			return sHash && oItem && sHash === oItem.id;
 		});
 	};
 
 	PgpUserStore.prototype.findPublicKeysByEmail = function (sEmail)
+	{
+		return _.compact(_.flatten(_.map(this.openpgpkeysPublic(), function (oItem) {
+			var oKey = oItem && sEmail === oItem.email ? oItem : null;
+			return oKey ? oKey.getNativeKeys() : [null];
+		}), true));
+	};
+
+	PgpUserStore.prototype.findPublicKeysBySigningKeyIds = function (aSigningKeyIds)
 	{
 		var self = this;
-		return _.compact(_.map(this.openpgpkeysPublic(), function (oItem) {
+		return _.compact(_.flatten(_.map(aSigningKeyIds, function (oId) {
+			var oKey = oId && oId.toHex ? self.findPublicKeyByHex(oId.toHex()) : null;
+			return oKey ? oKey.getNativeKeys() : [null];
+		}), true));
+	};
 
-			var oKey = null;
-			if (oItem && sEmail === oItem.email)
-			{
-				try
-				{
-					oKey = self.openpgp.key.readArmored(oItem.armor);
-					if (oKey && !oKey.err && oKey.keys && oKey.keys[0])
-					{
-						return oKey.keys[0];
-					}
-				}
-				catch (e) {}
-			}
+	PgpUserStore.prototype.findPrivateKeysByEncryptionKeyIds = function (aEncryptionKeyIds, bReturnWrapKeys)
+	{
+		var self = this;
+		return _.compact(_.flatten(_.map(aEncryptionKeyIds, function (oId) {
+			var oKey = oId && oId.toHex ? self.findPrivateKeyByHex(oId.toHex()) : null;
+			return oKey ? (bReturnWrapKeys ? [oKey] : oKey.getNativeKeys()) : [null];
+		}), true));
+	};
 
-			return null;
+	/**
+	 * @param {string} sEmail
+	 * @return {?}
+	 */
+	PgpUserStore.prototype.findPublicKeyByEmailNotNative = function (sEmail)
+	{
+		return _.find(this.openpgpkeysPublic(), function (oItem) {
+			return oItem && sEmail === oItem.email;
+		}) || null;
+	};
 
-		}));
+	/**
+	 * @param {string} sEmail
+	 * @return {?}
+	 */
+	PgpUserStore.prototype.findPrivateKeyByEmailNotNative = function (sEmail)
+	{
+		return _.find(this.openpgpkeysPrivate(), function (oItem) {
+			return oItem && sEmail === oItem.email;
+		}) || null;
 	};
 
 	/**
@@ -77,6 +112,7 @@
 	PgpUserStore.prototype.findPrivateKeyByEmail = function (sEmail, sPassword)
 	{
 		var
+			oPrivateKeys = [],
 			oPrivateKey = null,
 			oKey = _.find(this.openpgpkeysPrivate(), function (oItem) {
 				return oItem && sEmail === oItem.email;
@@ -85,18 +121,15 @@
 
 		if (oKey)
 		{
+			oPrivateKeys = oKey.getNativeKeys();
+			oPrivateKey = oPrivateKeys[0] || null;
+
 			try
 			{
-				oPrivateKey = this.openpgp.key.readArmored(oKey.armor);
-				if (oPrivateKey && !oPrivateKey.err && oPrivateKey.keys && oPrivateKey.keys[0])
+				if (oPrivateKey)
 				{
-					oPrivateKey = oPrivateKey.keys[0];
 					oPrivateKey.decrypt(Utils.pString(sPassword));
 				}
-				else
-				{
-					oPrivateKey = null;
-				}
 			}
 			catch (e)
 			{
@@ -116,6 +149,259 @@
 		return this.findPrivateKeyByEmail(require('Stores/User/Account').email(), sPassword);
 	};
 
+	PgpUserStore.prototype.decryptMessage = function (oMessage, fCallback)
+	{
+		var self = this, aPrivateKeys = [], aEncryptionKeyIds = [];
+		if (oMessage && oMessage.getSigningKeyIds)
+		{
+			aEncryptionKeyIds = oMessage.getEncryptionKeyIds();
+			if (aEncryptionKeyIds)
+			{
+				aPrivateKeys = this.findPrivateKeysByEncryptionKeyIds(aEncryptionKeyIds, true);
+				if (aPrivateKeys && 0 < aPrivateKeys.length)
+				{
+					kn.showScreenPopup(require('View/Popup/MessageOpenPgp'), [function (oDecriptedKey) {
+
+						if (oDecriptedKey)
+						{
+							var oPrivateKey = null, oDecryptedMessage = null;
+							try
+							{
+								oDecryptedMessage = oMessage.decrypt(oDecriptedKey);
+							}
+							catch (e)
+							{
+								oDecryptedMessage = null;
+							}
+
+							if (oDecryptedMessage)
+							{
+								oPrivateKey = self.findPrivateKeyByHex(oDecriptedKey.primaryKey.keyid.toHex());
+								if (oPrivateKey)
+								{
+									self.verifyMessage(oDecryptedMessage, function (oValidKey, aSigningKeyIds) {
+										fCallback(oPrivateKey, oDecryptedMessage, oValidKey || null, aSigningKeyIds || null);
+									});
+								}
+								else
+								{
+									fCallback(oPrivateKey, oDecryptedMessage);
+								}
+							}
+							else
+							{
+								fCallback(oPrivateKey, oDecryptedMessage);
+							}
+						}
+						else
+						{
+							fCallback(null, null);
+						}
+
+					}, aPrivateKeys]);
+
+					return false;
+				}
+			}
+		}
+
+		fCallback(null, null);
+
+		return false;
+	};
+
+	PgpUserStore.prototype.verifyMessage = function (oMessage, fCallback)
+	{
+		var oValid = null, aResult = [], aPublicKeys = [], aSigningKeyIds = [];
+		if (oMessage && oMessage.getSigningKeyIds)
+		{
+			aSigningKeyIds = oMessage.getSigningKeyIds();
+			if (aSigningKeyIds && 0 < aSigningKeyIds.length)
+			{
+				aPublicKeys = this.findPublicKeysBySigningKeyIds(aSigningKeyIds);
+				if (aPublicKeys && 0 < aPublicKeys.length)
+				{
+					try
+					{
+						aResult = oMessage.verify(aPublicKeys);
+						oValid = _.find(_.isArray(aResult) ? aResult : [], function (oItem) {
+							return oItem && oItem.valid && oItem.keyid;
+						});
+
+						if (oValid && oValid.keyid && oValid.keyid && oValid.keyid.toHex)
+						{
+							fCallback(this.findPublicKeyByHex(oValid.keyid.toHex()));
+							return true;
+						}
+					}
+					catch (e) {}
+				}
+
+				fCallback(null, aSigningKeyIds);
+				return false;
+			}
+		}
+
+		fCallback(null);
+		return false;
+	};
+
+	/**
+	 * @param {*} mDom
+	 */
+	PgpUserStore.prototype.controlsHelper = function (mDom, oVerControl, bSuccess, sTitle, sText)
+	{
+		if (bSuccess)
+		{
+			mDom.removeClass('error').addClass('success').attr('title', sTitle);
+			oVerControl.removeClass('error').addClass('success').attr('title', sTitle);
+		}
+		else
+		{
+			mDom.removeClass('success').addClass('error').attr('title', sTitle);
+			oVerControl.removeClass('success').addClass('error').attr('title', sTitle);
+		}
+
+		if (undefined !== sText)
+		{
+			mDom.text(Utils.trim(sText.replace(/(\u200C|\u0002)/g, '')));
+		}
+	};
+
+	/**
+	 * @param {*} mDom
+	 */
+	PgpUserStore.prototype.initMessageBodyControls = function (mDom)
+	{
+		if (mDom && !mDom.hasClass('inited'))
+		{
+			mDom.addClass('inited');
+
+			var
+				self = this,
+				bEncrypted = mDom.hasClass('encrypted'),
+				bSigned = mDom.hasClass('signed'),
+				oVerControl = null,
+				sData = ''
+			;
+
+			if (bEncrypted || bSigned)
+			{
+				sData = mDom.text();
+				mDom.data('openpgp-original', sData);
+
+				if (bEncrypted)
+				{
+					oVerControl = $('
')
+						.attr('title', Translator.i18n('MESSAGE/PGP_ENCRYPTED_MESSAGE_DESC'));
+
+					oVerControl.on('click', function () {
+						if ($(this).hasClass('success'))
+						{
+							return false;
+						}
+
+						var oMessage = self.openpgp.message.readArmored(sData);
+						if (oMessage && oMessage.getText && oMessage.verify && oMessage.decrypt)
+						{
+							self.decryptMessage(oMessage, function (oValidPrivateKey, oDecriptedMessage, oValidPublicKey, aSigningKeyIds) {
+
+								if (oDecriptedMessage)
+								{
+									if (oValidPublicKey)
+									{
+										self.controlsHelper(mDom, oVerControl, true, Translator.i18n('PGP_NOTIFICATIONS/GOOD_SIGNATURE', {
+											'USER': oValidPublicKey.user + ' (' + oValidPublicKey.id + ')'
+										}), oDecriptedMessage.getText());
+									}
+									else if (oValidPrivateKey)
+									{
+										var
+											aKeyIds = Utils.isNonEmptyArray(aSigningKeyIds) ? aSigningKeyIds : null,
+											sAdditional = aKeyIds ? _.compact(_.map(aKeyIds, function (oItem) {
+												return oItem && oItem.toHex ? oItem.toHex() : null;
+											})).join(', ') : ''
+										;
+
+										self.controlsHelper(mDom, oVerControl, false,
+											Translator.i18n('PGP_NOTIFICATIONS/UNVERIFIRED_SIGNATURE') +
+												(sAdditional ? ' (' + sAdditional + ')' : ''),
+												oDecriptedMessage.getText());
+									}
+									else
+									{
+										self.controlsHelper(mDom, oVerControl, false,
+											Translator.i18n('PGP_NOTIFICATIONS/DECRYPTION_ERROR'));
+									}
+								}
+								else
+								{
+									self.controlsHelper(mDom, oVerControl, false,
+										Translator.i18n('PGP_NOTIFICATIONS/DECRYPTION_ERROR'));
+								}
+							});
+
+							return false;
+						}
+
+						self.controlsHelper(mDom, oVerControl, false, Translator.i18n('PGP_NOTIFICATIONS/DECRYPTION_ERROR'));
+						return false;
+
+					});
+				}
+				else if (bSigned)
+				{
+					oVerControl = $('
')
+						.attr('title', Translator.i18n('MESSAGE/PGP_SIGNED_MESSAGE_DESC'));
+
+					oVerControl.on('click', function () {
+
+						if ($(this).hasClass('success') || $(this).hasClass('error'))
+						{
+							return false;
+						}
+
+						var oMessage = self.openpgp.cleartext.readArmored(sData);
+						if (oMessage && oMessage.getText && oMessage.verify)
+						{
+							self.verifyMessage(oMessage, function (oValidKey, aSigningKeyIds) {
+								if (oValidKey)
+								{
+									self.controlsHelper(mDom, oVerControl, true, Translator.i18n('PGP_NOTIFICATIONS/GOOD_SIGNATURE', {
+										'USER': oValidKey.user + ' (' + oValidKey.id + ')'
+									}), oMessage.getText());
+								}
+								else
+								{
+									var
+										aKeyIds = Utils.isNonEmptyArray(aSigningKeyIds) ? aSigningKeyIds : null,
+										sAdditional = aKeyIds ? _.compact(_.map(aKeyIds, function (oItem) {
+											return oItem && oItem.toHex ? oItem.toHex() : null;
+										})).join(', ') : ''
+									;
+
+									self.controlsHelper(mDom, oVerControl, false,
+										Translator.i18n('PGP_NOTIFICATIONS/UNVERIFIRED_SIGNATURE') +
+											(sAdditional ? ' (' + sAdditional + ')' : ''));
+								}
+							});
+
+							return false;
+						}
+
+						self.controlsHelper(mDom, oVerControl, false, Translator.i18n('PGP_NOTIFICATIONS/DECRYPTION_ERROR'));
+						return false;
+					});
+				}
+
+				if (oVerControl)
+				{
+					mDom.before(oVerControl).before('
');
+				}
+			}
+		}
+	};
+
 	module.exports = new PgpUserStore();
 
 }());
diff --git a/dev/Styles/AdminGeneral.less b/dev/Styles/AdminGeneral.less
index 79bb229a1..6158c72e5 100644
--- a/dev/Styles/AdminGeneral.less
+++ b/dev/Styles/AdminGeneral.less
@@ -6,8 +6,15 @@
 	}
 
 	.flag-name {
+
 		border-bottom: 1px dashed #555;
 		cursor: pointer;
+		padding: 2px 0px;
+
+		&:focus {
+			outline: 1px;
+			outline-style: dotted;
+		}
 	}
 }
 
diff --git a/dev/Styles/Animations.less b/dev/Styles/Animations.less
index fb9940869..abf72e01e 100644
--- a/dev/Styles/Animations.less
+++ b/dev/Styles/Animations.less
@@ -10,7 +10,7 @@
 }
 
 @keyframes bounce-me {
-	0% { transform: scale(1); } 50% { transform: scale(1.1); } 100% { transform: scale(1); }
+	0% { transform: scale(1); } 50% { transform: scale(1.2); } 100% { transform: scale(1); }
 }
 
 @keyframes textLoadingAnimationKeyFrame {
diff --git a/dev/Styles/Components.less b/dev/Styles/Components.less
index cef5608ba..9bb5d03a3 100644
--- a/dev/Styles/Components.less
+++ b/dev/Styles/Components.less
@@ -37,13 +37,36 @@
 
 .e-component {
 
+	&.e-select {
+
+		select:focus {
+			outline: 1px;
+			outline-style: dotted;
+		}
+	}
+
 	&.e-checkbox {
 
+		margin-bottom: 6px;
+		margin-left: -2px;
+		padding: 2px;
+
 		cursor: pointer;
 
+		&:focus {
+			outline: 1px;
+			outline-style: dotted;
+		}
+
+		.e-checkbox-icon {
+			padding: 1px 0 0 1px;
+		}
+
 		&.disabled {
 			cursor: default;
 			color: #999;
+			outline: 0;
+			outline-style: none;
 		}
 	}
 
@@ -60,11 +83,12 @@
 
 .e-component.material-design {
 
-	margin-top: 2px;
-	margin-bottom: 6px;
 
 	&.e-checkbox {
 
+		margin-top: 2px;
+		padding: 2px 2px 1px 2px;
+
 		.sub-checkbox-container {
 			display: inline-block;
 			position: relative;
diff --git a/dev/Styles/Filter.less b/dev/Styles/Filter.less
index d4860ab6e..3bbdd8af6 100644
--- a/dev/Styles/Filter.less
+++ b/dev/Styles/Filter.less
@@ -10,5 +10,10 @@
 		.button-delete {
 			cursor: pointer;
 		}
+
+		.setRecipientsBtn {
+			margin-top: -2px;
+			margin-left: 5px;
+		}
 	}
 }
diff --git a/dev/Styles/FolderList.less b/dev/Styles/FolderList.less
index d11993121..a97ac85f9 100644
--- a/dev/Styles/FolderList.less
+++ b/dev/Styles/FolderList.less
@@ -188,7 +188,7 @@
 /**/
 }
 
-html.rl-left-panel-disabled {
+html.rl-left-panel-disabled, html.rl-left-panel-short {
 	.btn.buttonContacts {
 		margin-top: 10px !important;
 		margin-left: 0 !important;
diff --git a/dev/Styles/Layout.less b/dev/Styles/Layout.less
index d183aded1..a7aca5690 100644
--- a/dev/Styles/Layout.less
+++ b/dev/Styles/Layout.less
@@ -205,6 +205,28 @@ html.rl-left-panel-disabled {
 	}
 }
 
+html.rl-left-panel-short {
+
+	#rl-left {
+		width: 60px !important;
+	}
+
+	#rl-right {
+		left: 60px !important;
+	}
+}
+
+html.rl-left-panel-none {
+
+	#rl-left {
+		width: 10px !important;
+	}
+
+	#rl-right {
+		left: 10px !important;
+	}
+}
+
 .ui-resizable-helper-w {
 	border-right: 5px solid #777;
 	border-right-color: rgba(255,255,255,0.7);
diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less
index 2a913bb65..8da8dab3d 100644
--- a/dev/Styles/Login.less
+++ b/dev/Styles/Login.less
@@ -25,6 +25,9 @@
 			max-width: 450px;
 		}
 
+		.wrapper-parent {
+		}
+
 		.loginForm {
 			background-color: #efefef;
 			text-align: left;
@@ -34,6 +37,18 @@
 			width: 303px;
 		}
 
+		.loginWelcomeForm {
+			display: none;
+		}
+
+		.welcome-on {
+			display: block;
+		}
+
+		.welcome-off {
+			display: none;
+		}
+
 /*		.control-label {
 			font-size: 16px;
 			line-height: 30px;
@@ -60,7 +75,11 @@
 			}
 		}
 
-		.signMeLabel, .languageLabel {
+		.languageLabel {
+			margin-top: 5px;
+		}
+
+		.signMeLabel .e-checkbox {
 			margin-top: 5px;
 		}
 
diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less
index 4c7dba60a..29ad90ad7 100644
--- a/dev/Styles/MessageList.less
+++ b/dev/Styles/MessageList.less
@@ -178,6 +178,17 @@ html.rl-no-preview-pane {
 			border-bottom: 1px solid #eee;
 		}
 
+		.listThreadUidDesc {
+			font-size: 16px;
+			padding: 7px 20px 6px 20px;
+			background-color: #aaa;
+			border-bottom: 1px solid #888;
+			color: #fff;
+			cursor: pointer;
+			text-shadow: 0 1px 0 #000;
+			text-align: center;
+		}
+
 		.delimiter {
 			display: block;
 			height: 1px;
@@ -313,6 +324,12 @@ html.rl-no-preview-pane {
 			&.e-single-line .dateParent {
 			}
 
+			.threadsParent {
+				display: inline-block;
+				float: right;
+				position: relative;
+			}
+
 			.attachmentParent {
 				display: inline-block;
 				float: right;
@@ -395,11 +412,25 @@ html.rl-no-preview-pane {
 
 			.threads-len {
 				.threads-len-data {
-					background-color: #999;
-					color: #fff;
+
+					background-color: #eee;
+					color: #666;
 					border-radius: 6px;
-					padding: 1px 6px 1px 5px;
-					margin-right: 5px;
+					padding: 2px 0px 1px 6px;
+					margin-right: 2px;
+					border: 1px solid #ccc;
+
+					[class^="icon-"],
+					[class*=" icon-"] {
+						font-size: 14px;
+					}
+
+					&:hover {
+						background-color: #aaa;
+						border-color: #666;
+						text-shadow: 0 1px 0 #999;
+						color: #fff;
+					}
 				}
 			}
 
diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less
index 2b272a3aa..a1440fee4 100644
--- a/dev/Styles/MessageView.less
+++ b/dev/Styles/MessageView.less
@@ -53,6 +53,10 @@ html.rl-no-preview-pane {
 			}
 		}
 
+		.logoPlace {
+			text-align: center;
+		}
+
 		.b-message-view-desc {
 			text-align: center;
 			font-size: 24px;
@@ -65,6 +69,22 @@ html.rl-no-preview-pane {
 			color: #DA4F49;
 		}
 
+		.b-message-view-iframe {
+		}
+
+		.b-message-view-iframe-backdrop {
+			display: none;
+			background: transparent;
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			top: 0px;
+			left: 0px;
+			right: 0px;
+			bottom: 0px;
+			opacity: .1;
+		}
+
 		.content {
 			-webkit-overflow-scrolling: touch;
 		}
@@ -150,6 +170,13 @@ html.rl-no-preview-pane {
 				border-radius: 5px;
 				padding: 10px 15px;
 				overflow: hidden;
+
+				.uiLine {
+				}
+
+				.uiLabelValue {
+					word-break: break-all;
+				}
 			}
 
 			.emptySubjectText {
@@ -263,6 +290,14 @@ html.rl-no-preview-pane {
 					}
 				}
 
+				&.unselectedAttachmentsError {
+					.attachmentItem {
+						box-shadow: 0 1px 4px red;
+						box-shadow: 0 1px 5px rgba(255, 0, 0, 0.4);
+						box-shadow: 0 0 0 1px rgba(255, 0, 0, 0.2), 0 1px 5px rgba(255, 0, 0, 0.3);
+					}
+				}
+
 				.controls-handle {
 					position: absolute;
 					bottom: 5px;
@@ -296,6 +331,10 @@ html.rl-no-preview-pane {
 				}
 			}
 
+			.bodySubHeader {
+				z-index: 2;
+			}
+
 			.bodyText {
 
 				color: #000;
@@ -303,9 +342,11 @@ html.rl-no-preview-pane {
 
 				.b-text-part {
 
+					height: 100%;
+
 					div[data-x-div-type=html] {
 						height: 100%;
-						div[data-x-div-type=html] {
+						div[data-x-div-type=body] {
 							height: 100%;
 						}
 					}
@@ -322,14 +363,10 @@ html.rl-no-preview-pane {
 						}
 					}
 
-					table {
-						border-collapse: separate;
-					}
-
 					blockquote {
 						border-left: 2px solid #000;
-						margin: 0;
 						padding: 0px 10px;
+						margin: 0;
 					}
 
 					.rl-bq-switcher.hidden-bq {
@@ -337,8 +374,10 @@ html.rl-no-preview-pane {
 					}
 
 					&.html {
+
 						div[data-x-div-type=body] {
-							margin: 15px;
+							padding: 15px;
+							// margin: 15px;
 						}
 
 						pre {
@@ -368,6 +407,16 @@ html.rl-no-preview-pane {
 							display: inline-block;
 							padding: 6px 10px;
 							border: 1px dashed #666;
+							background: #fff;
+
+							&.success {
+								border-color: green;
+								background-color: rgba(0, 255, 0, 0.03);
+							}
+							&.error {
+								border-color: red;
+								background-color: rgba(255, 0, 0, 0.03);
+							}
 						}
 
 						blockquote {
@@ -385,6 +434,27 @@ html.rl-no-preview-pane {
 							color: red;
 						}
 					}
+
+					.b-openpgp-control {
+
+						display: inline-block;
+						cursor: pointer;
+						color: #777;
+						/*float: left;*/
+
+						&:hover {
+							color: #111;
+						}
+
+						&.success {
+							color: green;
+							cursor: help;
+						}
+
+						&.error {
+							color: red;
+						}
+					}
 				}
 			}
 		}
@@ -434,6 +504,10 @@ html.rl-no-preview-pane {
 	}
 }
 
+html.rl-resizer .b-message-view-iframe-backdrop {
+	display: block !important;
+}
+
 html.rl-no-preview-pane .messageView {
 	.toolbar {
 		padding-left: @rlMainBorderSize;
diff --git a/dev/Styles/OpenPgpKey.less b/dev/Styles/OpenPgpKey.less
index 611c5e5c3..b9ff7a9f2 100644
--- a/dev/Styles/OpenPgpKey.less
+++ b/dev/Styles/OpenPgpKey.less
@@ -1,5 +1,5 @@
 .popups {
-	.b-open-pgp-key-view-content, .b-open-pgp-key-generate-content, .b-open-pgp-key-add-content, .b-compose-open-pgp-content {
+	.b-open-pgp-key-view-content, .b-open-pgp-key-generate-content, .b-open-pgp-key-add-content, .b-compose-open-pgp-content, .b-message-open-pgp-content {
 
 		.modal-header {
 			background-color: #fff;
@@ -18,4 +18,101 @@
 			overflow: auto;
 		}
 	}
+
+	.b-compose-open-pgp-content {
+		&.modal {
+			width: 700px;
+		}
+
+		.key-list {
+
+			background-color: #f9f9f9;
+			border-radius: 5px;
+			padding: 10px 15px;
+			margin-top: 10px;
+			min-height: 40px;
+
+			&-wrp {
+				overflow: hidden;
+				text-overflow: ellipsis;
+
+				&.empty {
+					text-align: center;
+					padding-top: 10px;
+					color: #aaa;
+					font-size: 16px;
+				}
+			}
+
+			&__item {
+
+				color: #333;
+				white-space: nowrap;
+
+				&-delete {
+					display: inline;
+					cursor: pointer;
+					margin-right: 5px;
+				}
+
+				&-name {
+					margin-right: 5px;
+					color: #333;
+					display: inline;
+
+					&.empty {
+						color: red;
+					}
+				}
+
+				&-error {
+					margin-right: 5px;
+					color: red;
+					display: inline;
+				}
+
+				&-hash {
+					margin-right: 5px;
+					color: #aaa;
+					display: inline;
+				}
+			}
+		}
+
+		.key-actions {
+			margin-top: 10px;
+			min-height: 40px;
+		}
+	}
+
+	.b-message-open-pgp-content {
+		&.modal {
+			width: 700px;
+		}
+
+		.key-list {
+
+			margin-top: 5px;
+			overflow: hidden;
+
+			&__item {
+
+				color: #555;
+				cursor: pointer;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+
+				&__radio {
+					padding-right: 5px;
+				}
+
+				&__name {
+
+					&:hover {
+						border-bottom: 1px dashed #555;
+					}
+				}
+			}
+		}
+	}
 }
diff --git a/dev/Styles/SettingsAccounts.less b/dev/Styles/SettingsAccounts.less
index 7c6cd63f6..04aeaf132 100644
--- a/dev/Styles/SettingsAccounts.less
+++ b/dev/Styles/SettingsAccounts.less
@@ -40,7 +40,7 @@
 			cursor: pointer;
 			color: #ccc;
 		}
-		
+
 		.identity-name {
 			display: inline-block;
 			word-break: break-all;
@@ -50,6 +50,12 @@
 		}
 	}
 
+	.accounts-list-top-padding, .identities-list-top-padding {
+		display: inline-block;
+		height: 5px;
+		width: 5px;
+	}
+
 	.account-item {
 
 		.e-action {
diff --git a/dev/Styles/SettingsFilters.less b/dev/Styles/SettingsFilters.less
index ea218b9fe..501098d52 100644
--- a/dev/Styles/SettingsFilters.less
+++ b/dev/Styles/SettingsFilters.less
@@ -46,6 +46,12 @@
 		}
 	}
 
+	.filters-list-top-padding {
+		display: inline-block;
+		height: 5px;
+		width: 5px;
+	}
+
 	.filter-item {
 
 		.e-action {
diff --git a/dev/Styles/SettingsFolders.less b/dev/Styles/SettingsFolders.less
index 734f0e026..8f18ef151 100644
--- a/dev/Styles/SettingsFolders.less
+++ b/dev/Styles/SettingsFolders.less
@@ -86,7 +86,7 @@
 			}
 		}
 
-		.delete-folder, .subscribe-folder, .unsubscribe-folder {
+		.delete-folder, .subscribe-folder, .unsubscribe-folder, .check-folder, .uncheck-folder {
 			cursor: pointer;
 			opacity: 0.6;
 		}
@@ -94,6 +94,10 @@
 		.unsubscribe-folder {
 			opacity: 0.2;
 		}
+
+		.uncheck-folder {
+			opacity: 0.1;
+		}
 	}
 
 	.folder-padding.deep-1 {
diff --git a/dev/Styles/SettingsGeneral.less b/dev/Styles/SettingsGeneral.less
index 7d4a236be..d4cf39586 100644
--- a/dev/Styles/SettingsGeneral.less
+++ b/dev/Styles/SettingsGeneral.less
@@ -20,7 +20,14 @@
 	}
 
 	.flag-name {
+		
 		border-bottom: 1px dashed #555;
 		cursor: pointer;
+		padding: 2px 0px;
+
+		&:focus {
+			outline: 1px;
+			outline-style: dotted;
+		}
 	}
 }
diff --git a/dev/Styles/SettingsOpenPGP.less b/dev/Styles/SettingsOpenPGP.less
index 3397d2922..894ca86b9 100644
--- a/dev/Styles/SettingsOpenPGP.less
+++ b/dev/Styles/SettingsOpenPGP.less
@@ -17,8 +17,13 @@
 		}
 
 		.open-pgp-key-img {
-			font-size: 12px;
-			margin-right: 5px;
+
+			margin-right: 10px;
+
+			.svg-icon {
+				width: 12px;
+				height: 12px;
+			}
 		}
 
 		.open-pgp-key-id, .open-pgp-key-user {
@@ -49,7 +54,11 @@
 
 		.delete-open-pgp-key, .view-open-pgp-key {
 			cursor: pointer;
-			opacity: 0.5;
+			opacity: 0.7;
+
+			&:hover {
+				opacity: 0.9;
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/dev/Styles/SettingsTemplates.less b/dev/Styles/SettingsTemplates.less
index 09ad48c32..3495173b1 100644
--- a/dev/Styles/SettingsTemplates.less
+++ b/dev/Styles/SettingsTemplates.less
@@ -37,6 +37,12 @@
 		}
 	}
 
+	.templates-list-top-padding {
+		display: inline-block;
+		height: 5px;
+		width: 5px;
+	}
+
 	.template-item {
 
 		.e-action {
diff --git a/dev/Styles/SystemDropDown.less b/dev/Styles/SystemDropDown.less
index 32422839f..4bab81b1b 100644
--- a/dev/Styles/SystemDropDown.less
+++ b/dev/Styles/SystemDropDown.less
@@ -34,16 +34,25 @@
 		vertical-align: middle;
 	}
 
+	.logoPlace {
+		margin: -5px 10px 0 0;
+		font-size: 25px;
+		line-height: 30px;
+		height: 40px;
+	}
+
 	.audioPlace {
 
 		font-size: 25px;
 		line-height: 30px;
-		margin-right: 15px;
+		margin-right: 10px;
+		width: 25px;
 
 		.playIcon, .stopIcon {
 			cursor: pointer;
 			color: orange;
 			text-shadow: 0 1px 0 #555;
+			float: right;
 		}
 
 		.playIcon {
diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less
index dbfa7b86b..53a821a38 100644
--- a/dev/Styles/Ui.less
+++ b/dev/Styles/Ui.less
@@ -21,12 +21,22 @@
 	color: #336699;
 	text-decoration: underline;
 	cursor: pointer;
+	padding: 2px;
+
+	&:focus {
+		outline: 1px;
+		outline-style: dotted;
+	}
 }
 
 .g-ui-min-height-300 {
 	min-height: 300px;
 }
 
+.g-ui-100-proc-height {
+	height: 100%;
+}
+
 .g-ui-absolute-reset {
 	position: absolute;
 	top: 0;
@@ -181,12 +191,21 @@ e-spinner {
 }
 
 .e-languages {
+
 	margin-top: 8px;
 	color: #333;
+
 	.flag-name {
+
 		color: #333;
-		/*text-decoration: underline;*/
 		border-bottom: 1px dashed #333;
+		cursor: pointer;
+		padding: 2px 0px;
+
+		&:focus {
+			outline: 1px;
+			outline-style: dotted;
+		}
 	}
 }
 
@@ -220,7 +239,6 @@ html.cssanimations {
 	.e-spinner .bounce2 {
 		animation-delay: -0.16s;
 	}
-
 }
 
 @keyframes bouncedelay {
diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less
index 9bb2619b8..3c7544cd0 100644
--- a/dev/Styles/_BootstrapFix.less
+++ b/dev/Styles/_BootstrapFix.less
@@ -7,7 +7,7 @@ label {
 	cursor: pointer;
 }
 
-label.inline {
+label.inline, span.inline {
 	display: inline-block;
 }
 
@@ -67,6 +67,10 @@ select {
 	width: 223px;
 }
 
+.btn .svg-icon {
+	vertical-align: middle;
+}
+
 .btn-small.btn-small-small {
 	padding: 3px 9px;
 	font-size: 11px;
diff --git a/dev/Styles/_End.less b/dev/Styles/_End.less
index 5fcebedea..d48b671d8 100644
--- a/dev/Styles/_End.less
+++ b/dev/Styles/_End.less
@@ -69,3 +69,22 @@
 		}
 	}
 }
+
+svg-icon {
+	display: none;
+}
+
+.svg-icon {
+	border: 0;
+	outline: 0;
+
+	height: 16px;
+	width: 16px;
+	display: inline-block;
+	fill: #333;
+
+	&.svg-icon-archive {
+		height: 14px;
+		width: 14px;
+	}
+}
diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less
index 9e61f787a..52d8db353 100644
--- a/dev/Styles/_FontasticToBoot.less
+++ b/dev/Styles/_FontasticToBoot.less
@@ -17,12 +17,19 @@
 	width: 17px;
 }
 
+.iconsize50 {
+	line-height: 50px;
+	font-size: 50px;
+	width: 50px;
+	height: 50px;
+}
+
 .iconsize24 {
 	line-height: 24px;
 	font-size: 24px;
 }
 
-.iconsize24 {
+.iconsize20 {
 	line-height: 20px;
 	font-size: 20px;
 }
@@ -142,7 +149,7 @@
 		border-color: transparent;
 		border-top-color: #999;
 
-		animation: rotation .8s infinite linear;
+		animation: rotation .8s infinite ease-in-out;
 	}
 
 	&.big {
diff --git a/dev/View/Admin/Login.js b/dev/View/Admin/Login.js
index e6a64c8ec..84d506e86 100644
--- a/dev/View/Admin/Login.js
+++ b/dev/View/Admin/Login.js
@@ -87,7 +87,6 @@
 				{
 					if (oData.Result)
 					{
-						this.formHidden(true);
 						require('App/Admin').loginAndLogoutReload(true);
 					}
 					else if (oData.ErrorCode)
diff --git a/dev/View/Admin/Settings/Pane.js b/dev/View/Admin/Settings/Pane.js
index fa6ff52a2..929ee0c67 100644
--- a/dev/View/Admin/Settings/Pane.js
+++ b/dev/View/Admin/Settings/Pane.js
@@ -26,6 +26,7 @@
 		this.version = ko.observable(Settings.settingsGet('Version'));
 
 		this.capa = !!Settings.settingsGet('PremType');
+		this.community = RL_COMMUNITY;
 
 		this.adminManLoading = ko.computed(function () {
 			return '000' !== [
diff --git a/dev/View/Popup/AdvancedSearch.js b/dev/View/Popup/AdvancedSearch.js
index ad4eef02a..9200b02b2 100644
--- a/dev/View/Popup/AdvancedSearch.js
+++ b/dev/View/Popup/AdvancedSearch.js
@@ -8,6 +8,7 @@
 		ko = require('ko'),
 
 		Utils = require('Common/Utils'),
+		Translator = require('Common/Translator'),
 
 		MessageStore = require('Stores/User/Message'),
 
@@ -46,6 +47,19 @@
 			this.cancelCommand();
 		});
 
+		this.selectedDates = ko.computed(function () {
+			Translator.trigger();
+			return [
+				{'id': -1, 'name': Translator.i18n('SEARCH/LABEL_ADV_DATE_ALL')},
+				{'id': 3, 'name': Translator.i18n('SEARCH/LABEL_ADV_DATE_3_DAYS')},
+				{'id': 7, 'name': Translator.i18n('SEARCH/LABEL_ADV_DATE_7_DAYS')},
+				{'id': 30, 'name': Translator.i18n('SEARCH/LABEL_ADV_DATE_MONTH')},
+				{'id': 90, 'name': Translator.i18n('SEARCH/LABEL_ADV_DATE_3_MONTHS')},
+				{'id': 180, 'name': Translator.i18n('SEARCH/LABEL_ADV_DATE_6_MONTHS')},
+				{'id': 365, 'name': Translator.i18n('SEARCH/LABEL_ADV_DATE_YEAR')}
+			];
+		}, this);
+
 		kn.constructorEnd(this);
 	}
 
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 42b8bf4ab..4e588b2ec 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -1,4 +1,6 @@
 
+/* global require, module */
+
 (function () {
 
 	'use strict';
@@ -87,6 +89,7 @@
 		this.resizerTrigger = _.bind(this.resizerTrigger, this);
 
 		this.allowContacts = !!AppStore.contactsIsAllowed();
+		this.allowFolders = !!Settings.capa(Enums.Capa.Folders);
 
 		this.bSkipNextHide = false;
 		this.composeInEdit = AppStore.composeInEdit;
@@ -319,7 +322,7 @@
 			}
 		}, this));
 
-		this.canBeSendedOrSaved = ko.computed(function () {
+		this.canBeSentOrSaved = ko.computed(function () {
 			return !this.sending() && !this.saving();
 		}, this);
 
@@ -373,6 +376,11 @@
 					}
 				}
 
+				if (!this.allowFolders)
+				{
+					sSentFolder = Consts.Values.UnuseOptionValue;
+				}
+
 				if ('' === sSentFolder)
 				{
 					kn.showScreenPopup(require('View/Popup/FolderSystem'), [Enums.SetSystemFoldersNotification.Sent]);
@@ -430,10 +438,16 @@
 					);
 				}
 			}
-		}, this.canBeSendedOrSaved);
+
+		}, this.canBeSentOrSaved);
 
 		this.saveCommand = Utils.createCommand(this, function () {
 
+			if (!this.allowFolders)
+			{
+				return false;
+			}
+
 			if (FolderStore.draftFolderNotEnabled())
 			{
 				kn.showScreenPopup(require('View/Popup/FolderSystem'), [Enums.SetSystemFoldersNotification.Draft]);
@@ -468,7 +482,7 @@
 				);
 			}
 
-		}, this.canBeSendedOrSaved);
+		}, this.canBeSentOrSaved);
 
 		this.skipCommand = Utils.createCommand(this, function () {
 
@@ -482,7 +496,7 @@
 
 			this.tryToClosePopup();
 
-		}, this.canBeSendedOrSaved);
+		}, this.canBeSentOrSaved);
 
 		this.contactsCommand = Utils.createCommand(this, function () {
 
@@ -523,7 +537,6 @@
 			if (window.Dropbox)
 			{
 				window.Dropbox.choose({
-					//'iframe': true,
 					'success': function(aFiles) {
 
 						if (aFiles && aFiles[0] && aFiles[0]['link'])
@@ -619,7 +632,7 @@
 						oEditor.setPlain(sResult);
 					});
 				},
-				this.oEditor.getData(),
+				this.oEditor.getData(false, true),
 				this.currentIdentity(),
 				this.to(),
 				this.cc(),
@@ -634,7 +647,7 @@
 			sDraftFolder = FolderStore.draftFolder()
 		;
 
-		if ('' !== sDraftFolder)
+		if ('' !== sDraftFolder && Consts.Values.UnuseOptionValue !== sDraftFolder)
 		{
 			Cache.setFolderHash(sDraftFolder, '');
 			if (FolderStore.currentFolderFullNameRaw() === sDraftFolder)
@@ -1097,6 +1110,26 @@
 				oText.find('.rlBlockquoteSwitcher').off('.rlBlockquoteSwitcher').remove();
 				oText.find('[data-html-editor-font-wrapper]').removeAttr('data-html-editor-font-wrapper');
 
+//				(function () {
+//
+//					var oTmp = null, iLimit = 0;
+//
+//					while (true)
+//					{
+//						iLimit++;
+//
+//						oTmp = oText.children();
+//						if (10 > iLimit && oTmp.is('div') && 1 === oTmp.length)
+//						{
+//							oTmp.children().unwrap();
+//							continue;
+//						}
+//
+//						break;
+//					}
+//
+//				}());
+
 				sText = oText.html();
 			}
 
@@ -1186,7 +1219,8 @@
 					});
 
 					sText = '

' + sReplyTitle + ':' +
-						'
' + Utils.trim(sText) + '
';
+						'
' + Utils.trim(sText) + '
';
+//						'
' + Utils.trim(sText) + '
';
 
 					break;
 
@@ -1202,6 +1236,7 @@
 							'
' + Translator.i18n('COMPOSE/FORWARD_MESSAGE_TOP_SUBJECT') + ': ' + Utils.encodeHtml(sSubject) +
 							'

' + Utils.trim(sText) + '

';
 					break;
+
 				case Enums.ComposeType.ForwardAsAttachment:
 					sText = '';
 					break;
@@ -1390,10 +1425,13 @@
 			return false;
 		});
 
-		key('ctrl+s, command+s', Enums.KeyState.Compose, function () {
-			self.saveCommand();
-			return false;
-		});
+		if (this.allowFolders)
+		{
+			key('ctrl+s, command+s', Enums.KeyState.Compose, function () {
+				self.saveCommand();
+				return false;
+			});
+		}
 
 		if (!!Settings.settingsGet('AllowCtrlEnterOnCompose'))
 		{
@@ -1414,11 +1452,11 @@
 		Events.sub('window.resize.real', this.resizerTrigger);
 		Events.sub('window.resize.real', _.debounce(this.resizerTrigger, 50));
 
-		if (this.dropboxEnabled())
+		if (this.dropboxEnabled() && this.dropboxApiKey() && !window.Dropbox)
 		{
 			oScript = window.document.createElement('script');
 			oScript.type = 'text/javascript';
-			oScript.src = 'https://www.dropbox.com/static/api/1/dropins.js';
+			oScript.src = 'https://www.dropbox.com/static/api/2/dropins.js';
 			$(oScript).attr('id', 'dropboxjs').attr('data-app-key', self.dropboxApiKey());
 
 			window.document.body.appendChild(oScript);
diff --git a/dev/View/Popup/ComposeOpenPgp.js b/dev/View/Popup/ComposeOpenPgp.js
index e77a82f18..70625f669 100644
--- a/dev/View/Popup/ComposeOpenPgp.js
+++ b/dev/View/Popup/ComposeOpenPgp.js
@@ -28,106 +28,150 @@
 	{
 		AbstractView.call(this, 'Popups', 'PopupsComposeOpenPgp');
 
+		var self = this;
+
+		this.optionsCaption = Translator.i18n('PGP_NOTIFICATIONS/ADD_A_PUBLICK_KEY');
+
 		this.notification = ko.observable('');
 
-		this.sign = ko.observable(true);
-		this.encrypt = ko.observable(true);
+		this.sign = ko.observable(false);
+		this.encrypt = ko.observable(false);
 
 		this.password = ko.observable('');
 		this.password.focus = ko.observable(false);
 		this.buttonFocus = ko.observable(false);
 
-		this.from = ko.observable('');
-		this.to = ko.observableArray([]);
 		this.text = ko.observable('');
+		this.selectedPublicKey = ko.observable(null);
 
-		this.resultCallback = null;
+		this.signKey = ko.observable(null);
+		this.encryptKeys = ko.observableArray([]);
+
+		this.encryptKeysView = ko.computed(function () {
+			return _.compact(_.map(this.encryptKeys(), function (oKey) {
+				return oKey ? oKey.key : null;
+			}));
+		}, this);
+
+		this.publicKeysOptions = ko.computed(function () {
+			return _.compact(_.map(PgpStore.openpgpkeysPublic(), function (oKey) {
+				return -1 < Utils.inArray(oKey, self.encryptKeysView()) ? null : {
+					'id': oKey.guid,
+					'name': '(' + oKey.id.substr(-6) + ') ' + oKey.user,
+					'key': oKey
+				};
+			}));
+		});
 
 		this.submitRequest = ko.observable(false);
 
+		this.resultCallback = null;
+
 		// commands
 		this.doCommand = Utils.createCommand(this, function () {
 
 			var
-				self = this,
 				bResult = true,
 				oPrivateKey = null,
+				aPrivateKeys = [],
 				aPublicKeys = []
 			;
 
 			this.submitRequest(true);
 
-			if (bResult && this.sign() && '' === this.from())
-			{
-				this.notification(Translator.i18n('PGP_NOTIFICATIONS/SPECIFY_FROM_EMAIL'));
-				bResult = false;
-			}
-
 			if (bResult && this.sign())
 			{
-				oPrivateKey = PgpStore.findPrivateKeyByEmail(this.from(), this.password());
-				if (!oPrivateKey)
+				if (!this.signKey())
+				{
+					this.notification(Translator.i18n('PGP_NOTIFICATIONS/SPECIFY_FROM_EMAIL'));
+					bResult = false;
+				}
+				else if (!this.signKey().key)
 				{
 					this.notification(Translator.i18n('PGP_NOTIFICATIONS/NO_PRIVATE_KEY_FOUND_FOR', {
-						'EMAIL': this.from()
+						'EMAIL': this.signKey().email
 					}));
 
 					bResult = false;
 				}
-			}
 
-			if (bResult && this.encrypt() && 0 === this.to().length)
-			{
-				this.notification(Translator.i18n('PGP_NOTIFICATIONS/SPECIFY_AT_LEAST_ONE_RECIPIENT'));
-				bResult = false;
+				if (bResult)
+				{
+					aPrivateKeys = this.signKey().key.getNativeKeys();
+					oPrivateKey = aPrivateKeys[0] || null;
+
+					try
+					{
+						if (oPrivateKey)
+						{
+							oPrivateKey.decrypt(Utils.pString(this.password()));
+						}
+					}
+					catch (e)
+					{
+						oPrivateKey = null;
+					}
+
+					if (!oPrivateKey)
+					{
+						this.notification(Translator.i18n('PGP_NOTIFICATIONS/NO_PRIVATE_KEY_FOUND'));
+						bResult = false;
+					}
+				}
 			}
 
 			if (bResult && this.encrypt())
 			{
-				aPublicKeys = [];
-				_.each(this.to(), function (sEmail) {
-					var aKeys = PgpStore.findPublicKeysByEmail(sEmail);
-					if (0 === aKeys.length && bResult)
-					{
-						self.notification(Translator.i18n('PGP_NOTIFICATIONS/NO_PUBLIC_KEYS_FOUND_FOR', {
-							'EMAIL': sEmail
-						}));
+				if (0 === this.encryptKeys().length)
+				{
+					this.notification(Translator.i18n('PGP_NOTIFICATIONS/NO_PUBLIC_KEYS_FOUND'));
+					bResult = false;
+				}
+				else if (this.encryptKeys())
+				{
+					aPublicKeys = [];
 
+					_.each(this.encryptKeys(), function (oKey) {
+						if (oKey && oKey.key)
+						{
+							aPublicKeys = aPublicKeys.concat(_.compact(_.flatten(oKey.key.getNativeKeys())));
+						}
+						else if (oKey && oKey.email)
+						{
+							self.notification(Translator.i18n('PGP_NOTIFICATIONS/NO_PUBLIC_KEYS_FOUND_FOR', {
+								'EMAIL': oKey.email
+							}));
+
+							bResult = false;
+						}
+					});
+
+					if (bResult && (0 === aPublicKeys.length || this.encryptKeys().length !== aPublicKeys.length))
+					{
 						bResult = false;
 					}
-
-					aPublicKeys = aPublicKeys.concat(aKeys);
-				});
-
-				if (bResult && (0 === aPublicKeys.length || this.to().length !== aPublicKeys.length))
-				{
-					bResult = false;
 				}
 			}
 
-			_.delay(function () {
+			if (bResult && self.resultCallback)
+			{
+				_.delay(function () {
 
-				if (self.resultCallback && bResult)
-				{
-					try {
+					var oPromise = null;
 
+					try
+					{
 						if (oPrivateKey && 0 === aPublicKeys.length)
 						{
-							self.resultCallback(
-								PgpStore.openpgp.signClearMessage([oPrivateKey], self.text())
-							);
+							oPromise = PgpStore.openpgp.signClearMessage([oPrivateKey], self.text());
 						}
 						else if (oPrivateKey && 0 < aPublicKeys.length)
 						{
-							self.resultCallback(
-								PgpStore.openpgp.signAndEncryptMessage(aPublicKeys, oPrivateKey, self.text())
-							);
+							oPromise = PgpStore.openpgp.signAndEncryptMessage(aPublicKeys, oPrivateKey, self.text());
 						}
 						else if (!oPrivateKey && 0 < aPublicKeys.length)
 						{
-							self.resultCallback(
-								PgpStore.openpgp.encryptMessage(aPublicKeys, self.text())
-							);
+							oPromise = PgpStore.openpgp.encryptMessage(aPublicKeys, self.text());
 						}
 					}
 					catch (e)
@@ -135,25 +179,84 @@
 						self.notification(Translator.i18n('PGP_NOTIFICATIONS/PGP_ERROR', {
 							'ERROR': '' + e
 						}));
-
-						bResult = false;
 					}
-				}
 
-				if (bResult)
-				{
-					self.cancelCommand();
-				}
+					if (oPromise)
+					{
+						try
+						{
+							oPromise.then(function (mData) {
 
+								self.resultCallback(mData);
+								self.cancelCommand();
+
+							})['catch'](function (e) {
+								self.notification(Translator.i18n('PGP_NOTIFICATIONS/PGP_ERROR', {
+									'ERROR': '' + e
+								}));
+							});
+						}
+						catch (e)
+						{
+							self.notification(Translator.i18n('PGP_NOTIFICATIONS/PGP_ERROR', {
+								'ERROR': '' + e
+							}));
+						}
+					}
+
+					self.submitRequest(false);
+
+				}, 10);
+			}
+			else
+			{
 				self.submitRequest(false);
+			}
 
-			}, 10);
+			return bResult;
 
 		}, function () {
 			return !this.submitRequest() &&	(this.sign() || this.encrypt());
 		});
 
+		this.addCommand = Utils.createCommand(this, function () {
+
+			var
+				sKeyId = this.selectedPublicKey(),
+				aKeys = this.encryptKeys(),
+				oOption = sKeyId ? _.find(this.publicKeysOptions(), function (oItem) {
+					return oItem && sKeyId === oItem.id;
+				}) : null
+			;
+
+			if (oOption)
+			{
+				aKeys.push({
+					'empty': !oOption.key,
+					'selected': ko.observable(!!oOption.key),
+					'user': oOption.key.user,
+					'hash': oOption.key.id.substr(-6),
+					'key': oOption.key
+				});
+
+				this.encryptKeys(aKeys);
+			}
+
+		}, function () {
+			return !this.submitRequest() &&	this.selectedPublicKey();
+		});
+
+		this.selectedPublicKey.subscribe(function (sValue) {
+			if (sValue)
+			{
+				this.addCommand();
+			}
+		}, this);
+
 		this.sDefaultKeyScope = Enums.KeyState.PopupComposeOpenPGP;
+		this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
+
+		this.deletePublickKey = _.bind(this.deletePublickKey, this);
 
 		kn.constructorEnd(this);
 	}
@@ -161,16 +264,24 @@
 	kn.extendAsViewModel(['View/Popup/ComposeOpenPgp', 'PopupsComposeOpenPgpViewModel'], ComposeOpenPgpPopupView);
 	_.extend(ComposeOpenPgpPopupView.prototype, AbstractView.prototype);
 
+	ComposeOpenPgpPopupView.prototype.deletePublickKey = function (oKey)
+	{
+		this.encryptKeys.remove(oKey);
+	};
+
 	ComposeOpenPgpPopupView.prototype.clearPopup = function ()
 	{
 		this.notification('');
 
+		this.sign(false);
+		this.encrypt(false);
+
 		this.password('');
 		this.password.focus(false);
 		this.buttonFocus(false);
 
-		this.from('');
-		this.to([]);
+		this.signKey(null);
+		this.encryptKeys([]);
 		this.text('');
 
 		this.submitRequest(false);
@@ -220,6 +331,8 @@
 
 		var
 			aRec = [],
+			sEmail = '',
+			oKey = null,
 			oEmail = new EmailModel()
 		;
 
@@ -247,8 +360,44 @@
 			return '' === oEmail.email ? false : oEmail.email;
 		}));
 
-		this.from(oIdentity ? oIdentity.email() : '');
-		this.to(aRec);
+		if (oIdentity && oIdentity.email())
+		{
+			sEmail = oIdentity.email();
+			oKey = PgpStore.findPrivateKeyByEmailNotNative(sEmail);
+			if (oKey)
+			{
+				this.signKey({
+					'user': oKey.user || sEmail,
+					'hash': oKey.id.substr(-6),
+					'key': oKey
+				});
+			}
+		}
+
+		if (this.signKey())
+		{
+			this.sign(true);
+		}
+
+		if (aRec && 0 < aRec.length)
+		{
+			this.encryptKeys(_.compact(_.map(aRec, function (sEmail) {
+				var oKey = PgpStore.findPublicKeyByEmailNotNative(sEmail) || null;
+				return {
+					'empty': !oKey,
+					'selected': ko.observable(!!oKey),
+					'user': oKey ? (oKey.user || sEmail) : sEmail,
+					'hash': oKey ? oKey.id.substr(-6) : '',
+					'key': oKey
+				};
+			})));
+
+			if (0 < this.encryptKeys().length)
+			{
+				this.encrypt(true);
+			}
+		}
+
 		this.text(sText);
 	};
 
diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js
index 0cf7c8b17..4ac9b6e7e 100644
--- a/dev/View/Popup/Contacts.js
+++ b/dev/View/Popup/Contacts.js
@@ -21,6 +21,8 @@
 		SettingsStore = require('Stores/User/Settings'),
 		ContactStore = require('Stores/User/Contact'),
 
+		Settings = require('Storage/Settings'),
+
 		Remote = require('Remote/User/Ajax'),
 
 		EmailModel = require('Model/Email'),
@@ -237,6 +239,12 @@
 		});
 
 		this.newMessageCommand = Utils.createCommand(this, function () {
+
+			if (!Settings.capa(Enums.Capa.Composer))
+			{
+				return false;
+			}
+
 			var
 				aE = [],
 				aC = this.contactsCheckedOrSelected(),
@@ -772,7 +780,10 @@
 		{
 			this.bBackToCompose = false;
 
-			kn.showScreenPopup(require('View/Popup/Compose'));
+			if (Settings.capa(Enums.Capa.Composer))
+			{
+				kn.showScreenPopup(require('View/Popup/Compose'));
+			}
 		}
 	};
 
diff --git a/dev/View/Popup/Filter.js b/dev/View/Popup/Filter.js
index c5f5ad428..41465f8ad 100644
--- a/dev/View/Popup/Filter.js
+++ b/dev/View/Popup/Filter.js
@@ -78,6 +78,7 @@
 		this.actionTypeOptions = ko.observableArray([]);
 		this.fieldOptions = ko.observableArray([]);
 		this.typeOptions = ko.observableArray([]);
+		this.typeOptionsSize = ko.observableArray([]);
 
 		Translator.initOnStartOrLangChange(this.populateOptions, this);
 
@@ -136,7 +137,9 @@
 		this.fieldOptions([
 			{'id': Enums.FilterConditionField.From, 'name': Translator.i18n('POPUPS_FILTER/SELECT_FIELD_FROM')},
 			{'id': Enums.FilterConditionField.Recipient, 'name': Translator.i18n('POPUPS_FILTER/SELECT_FIELD_RECIPIENTS')},
-			{'id': Enums.FilterConditionField.Subject, 'name': Translator.i18n('POPUPS_FILTER/SELECT_FIELD_SUBJECT')}
+			{'id': Enums.FilterConditionField.Subject, 'name': Translator.i18n('POPUPS_FILTER/SELECT_FIELD_SUBJECT')},
+			{'id': Enums.FilterConditionField.Size, 'name': Translator.i18n('POPUPS_FILTER/SELECT_FIELD_SIZE')},
+			{'id': Enums.FilterConditionField.Header, 'name': Translator.i18n('POPUPS_FILTER/SELECT_FIELD_HEADER')}
 		]);
 
 		this.typeOptions([
@@ -145,6 +148,11 @@
 			{'id': Enums.FilterConditionType.EqualTo, 'name': Translator.i18n('POPUPS_FILTER/SELECT_TYPE_EQUAL_TO')},
 			{'id': Enums.FilterConditionType.NotEqualTo, 'name': Translator.i18n('POPUPS_FILTER/SELECT_TYPE_NOT_EQUAL_TO')}
 		]);
+
+		this.typeOptionsSize([
+			{'id': Enums.FilterConditionType.Over, 'name': Translator.i18n('POPUPS_FILTER/SELECT_TYPE_OVER')},
+			{'id': Enums.FilterConditionType.Under, 'name': Translator.i18n('POPUPS_FILTER/SELECT_TYPE_UNDER')}
+		]);
 	};
 
 
diff --git a/dev/View/Popup/Languages.js b/dev/View/Popup/Languages.js
index cf32623c9..870d8850e 100644
--- a/dev/View/Popup/Languages.js
+++ b/dev/View/Popup/Languages.js
@@ -24,15 +24,16 @@
 		var self = this;
 
 		this.fLang = null;
-		this.sUserLanguage = '';
+		this.userLanguage = ko.observable('');
 
 		this.langs = ko.observableArray([]);
 
 		this.languages = ko.computed(function () {
+			var sUserLanguage = self.userLanguage();
 			return _.map(self.langs(), function (sLanguage) {
 				return {
 					'key': sLanguage,
-					'user': sLanguage === self.sUserLanguage,
+					'user': sLanguage === sUserLanguage,
 					'selected': ko.observable(false),
 					'fullName': Utils.convertLangName(sLanguage)
 				};
@@ -63,21 +64,22 @@
 		});
 	};
 
+	LanguagesPopupView.prototype.onBeforeShow = function ()
+	{
+		this.fLang = null;
+		this.userLanguage('');
+
+		this.langs([]);
+	};
+
 	LanguagesPopupView.prototype.onShow = function (fLanguage, aLangs, sUserLanguage)
 	{
 		this.fLang = fLanguage;
-		this.sUserLanguage = sUserLanguage || '';
+		this.userLanguage(sUserLanguage || '');
 
 		this.langs(aLangs);
 	};
 
-	LanguagesPopupView.prototype.onHide = function ()
-	{
-		this.fLang = null;
-		this.sUserLanguage = '';
-		this.langs([]);
-	};
-
 	LanguagesPopupView.prototype.changeLanguage = function (sLang)
 	{
 		if (this.fLang)
diff --git a/dev/View/Popup/MessageOpenPgp.js b/dev/View/Popup/MessageOpenPgp.js
new file mode 100644
index 000000000..7a861c58c
--- /dev/null
+++ b/dev/View/Popup/MessageOpenPgp.js
@@ -0,0 +1,179 @@
+
+(function () {
+
+	'use strict';
+
+	var
+		_ = require('_'),
+		ko = require('ko'),
+		key = require('key'),
+
+		Utils = require('Common/Utils'),
+		Enums = require('Common/Enums'),
+
+		kn = require('Knoin/Knoin'),
+		AbstractView = require('Knoin/AbstractView')
+	;
+
+	/**
+	 * @constructor
+	 * @extends AbstractView
+	 */
+	function MessageOpenPgpPopupView()
+	{
+		AbstractView.call(this, 'Popups', 'PopupsMessageOpenPgp');
+
+		this.notification = ko.observable('');
+
+		this.selectedKey = ko.observable(null);
+		this.privateKeys = ko.observableArray([]);
+
+		this.password = ko.observable('');
+		this.password.focus = ko.observable(false);
+		this.buttonFocus = ko.observable(false);
+
+		this.resultCallback = null;
+
+		this.submitRequest = ko.observable(false);
+
+		// commands
+		this.doCommand = Utils.createCommand(this, function () {
+
+			this.submitRequest(true);
+
+_.delay(_.bind(function() {
+
+			var
+				oPrivateKeys = [],
+				oPrivateKey = null
+			;
+
+			try
+			{
+				if (this.resultCallback && this.selectedKey())
+				{
+					oPrivateKeys = this.selectedKey().getNativeKeys();
+					oPrivateKey = oPrivateKeys && oPrivateKeys[0] ? oPrivateKeys[0] : null;
+
+					if (oPrivateKey)
+					{
+						try
+						{
+							if (!oPrivateKey.decrypt(Utils.pString(this.password())))
+							{
+								oPrivateKey = null;
+							}
+						}
+						catch (e)
+						{
+							oPrivateKey = null;
+						}
+					}
+				}
+			}
+			catch (oExc)
+			{
+				oPrivateKey = null;
+			}
+
+			this.submitRequest(false);
+
+			this.cancelCommand();
+			this.resultCallback(oPrivateKey);
+
+}, this), 100);
+
+		}, function () {
+			return !this.submitRequest();
+		});
+
+		this.sDefaultKeyScope = Enums.KeyState.PopupMessageOpenPGP;
+
+		kn.constructorEnd(this);
+	}
+
+	kn.extendAsViewModel(['View/Popup/MessageOpenPgp'], MessageOpenPgpPopupView);
+	_.extend(MessageOpenPgpPopupView.prototype, AbstractView.prototype);
+
+	MessageOpenPgpPopupView.prototype.clearPopup = function ()
+	{
+		this.notification('');
+
+		this.password('');
+		this.password.focus(false);
+		this.buttonFocus(false);
+
+		this.selectedKey(false);
+		this.submitRequest(false);
+
+		this.resultCallback = null;
+		this.privateKeys([]);
+	};
+
+	MessageOpenPgpPopupView.prototype.onBuild = function (oDom)
+	{
+		key('tab,shift+tab', Enums.KeyState.PopupMessageOpenPGP, _.bind(function () {
+
+			switch (true)
+			{
+				case this.password.focus():
+					this.buttonFocus(true);
+					break;
+				case this.buttonFocus():
+					this.password.focus(true);
+					break;
+			}
+
+			return false;
+
+		}, this));
+
+		var self = this;
+
+		oDom
+			.on('click', '.key-list__item', function () {
+
+				oDom.find('.key-list__item .key-list__item__radio')
+					.addClass('icon-radio-unchecked')
+					.removeClass('icon-radio-checked')
+				;
+
+				$(this).find('.key-list__item__radio')
+					.removeClass('icon-radio-unchecked')
+					.addClass('icon-radio-checked')
+				;
+
+				self.selectedKey(ko.dataFor(this));
+
+				self.password.focus(true);
+			})
+		;
+	};
+
+	MessageOpenPgpPopupView.prototype.onHideWithDelay = function ()
+	{
+		this.clearPopup();
+	};
+
+	MessageOpenPgpPopupView.prototype.onShowWithDelay = function ()
+	{
+		this.password.focus(true);
+//		this.buttonFocus(true);
+	};
+
+	MessageOpenPgpPopupView.prototype.onShow = function (fCallback, aPrivateKeys)
+	{
+		this.clearPopup();
+
+		this.resultCallback = fCallback;
+		this.privateKeys(aPrivateKeys);
+
+		if (this.viewModelDom)
+		{
+			this.viewModelDom.find('.key-list__item').first().click();
+		}
+	};
+
+	module.exports = MessageOpenPgpPopupView;
+
+}());
\ No newline at end of file
diff --git a/dev/View/Popup/NewOpenPgpKey.js b/dev/View/Popup/NewOpenPgpKey.js
index e929a438a..f57ad9850 100644
--- a/dev/View/Popup/NewOpenPgpKey.js
+++ b/dev/View/Popup/NewOpenPgpKey.js
@@ -42,7 +42,6 @@
 			var
 				self = this,
 				sUserID = '',
-				mKeyPair = null,
 				oOpenpgpKeyring = PgpStore.openpgpKeyring
 			;
 
@@ -62,29 +61,40 @@
 
 			_.delay(function () {
 
-				mKeyPair = false;
+				var mPromise = false;
+
 				try {
-					mKeyPair = PgpStore.openpgp.generateKeyPair({
+
+					mPromise = PgpStore.openpgp.generateKeyPair({
 						'userId': sUserID,
 						'numBits': Utils.pInt(self.keyBitLength()),
 						'passphrase': Utils.trim(self.password())
 					});
-				} catch (e) {
-//					window.console.log(e);
-				}
 
-				if (mKeyPair && mKeyPair.privateKeyArmored)
+					mPromise.then(function (mKeyPair) {
+
+						self.submitRequest(false);
+
+						if (mKeyPair && mKeyPair.privateKeyArmored)
+						{
+							oOpenpgpKeyring.privateKeys.importKey(mKeyPair.privateKeyArmored);
+							oOpenpgpKeyring.publicKeys.importKey(mKeyPair.publicKeyArmored);
+
+							oOpenpgpKeyring.store();
+
+							require('App/User').reloadOpenPgpKeys();
+							Utils.delegateRun(self, 'cancelCommand');
+						}
+
+					})['catch'](function() {
+						self.submitRequest(false);
+					});
+				}
+				catch (e)
 				{
-					oOpenpgpKeyring.privateKeys.importKey(mKeyPair.privateKeyArmored);
-					oOpenpgpKeyring.publicKeys.importKey(mKeyPair.publicKeyArmored);
-					oOpenpgpKeyring.store();
-
-					require('App/User').reloadOpenPgpKeys();
-					Utils.delegateRun(self, 'cancelCommand');
+					self.submitRequest(false);
 				}
 
-				self.submitRequest(false);
-				
 			}, 100);
 
 			return true;
diff --git a/dev/View/User/AbstractSystemDropDown.js b/dev/View/User/AbstractSystemDropDown.js
index 76c1d5e9e..88dcf9474 100644
--- a/dev/View/User/AbstractSystemDropDown.js
+++ b/dev/View/User/AbstractSystemDropDown.js
@@ -30,6 +30,12 @@
 	{
 		AbstractView.call(this, 'Right', 'SystemDropDown');
 
+		this.logoImg = Utils.trim(Settings.settingsGet('UserLogo'));
+		this.logoTitle = Utils.trim(Settings.settingsGet('UserLogoTitle'));
+
+		this.allowSettings = !!Settings.capa(Enums.Capa.Settings);
+		this.allowHelp = !!Settings.capa(Enums.Capa.Help);
+
 		this.currentAudio = AppStore.currentAudio;
 
 		this.accountEmail = AccountStore.email;
@@ -81,12 +87,18 @@
 
 	AbstractSystemDropDownUserView.prototype.settingsClick = function ()
 	{
-		require('Knoin/Knoin').setHash(Links.settings());
+		if (Settings.capa(Enums.Capa.Settings))
+		{
+			require('Knoin/Knoin').setHash(Links.settings());
+		}
 	};
 
 	AbstractSystemDropDownUserView.prototype.settingsHelp = function ()
 	{
-		require('Knoin/Knoin').showScreenPopup(require('View/Popup/KeyboardShortcutsHelp'));
+		if (Settings.capa(Enums.Capa.Help))
+		{
+			require('Knoin/Knoin').showScreenPopup(require('View/Popup/KeyboardShortcutsHelp'));
+		}
 	};
 
 	AbstractSystemDropDownUserView.prototype.addAccountClick = function ()
diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js
index f2ea8c45b..db5dc2e79 100644
--- a/dev/View/User/Login.js
+++ b/dev/View/User/Login.js
@@ -36,6 +36,8 @@
 	{
 		AbstractView.call(this, 'Center', 'Login');
 
+		this.welcome = ko.observable(!!Settings.settingsGet('UseLoginWelcomePage'));
+
 		this.email = ko.observable('');
 		this.password = ko.observable('');
 		this.signMe = ko.observable(false);
@@ -213,12 +215,10 @@
 								}
 								else if (oData.Admin)
 								{
-									this.formHidden(true);
 									require('App/User').redirectToAdminPanel();
 								}
 								else
 								{
-									this.formHidden(true);
 									require('App/User').loginAndLogoutReload(false);
 								}
 							}
@@ -296,11 +296,12 @@
 		});
 
 		this.googleLoginEnabled = ko.observable(false);
+		this.googleFastLoginEnabled = ko.observable(false);
 
 		this.googleCommand = Utils.createCommand(this, function () {
 
 			window.open(Links.socialGoogle(), 'Google',
-				'left=200,top=100,width=650,height=450,menubar=no,status=no,resizable=yes,scrollbars=yes');
+				'left=200,top=100,width=650,height=500,menubar=no,status=no,resizable=yes,scrollbars=yes');
 
 			return true;
 
@@ -308,6 +309,17 @@
 			return !this.submitRequest() && this.googleLoginEnabled();
 		});
 
+		this.googleFastCommand = Utils.createCommand(this, function () {
+
+			window.open(Links.socialGoogle(true), 'Google',
+				'left=200,top=100,width=650,height=500,menubar=no,status=no,resizable=yes,scrollbars=yes');
+
+			return true;
+
+		}, function () {
+			return !this.submitRequest() && this.googleFastLoginEnabled();
+		});
+
 		this.twitterLoginEnabled = ko.observable(false);
 
 		this.twitterCommand = Utils.createCommand(this, function () {
@@ -338,6 +350,11 @@
 	kn.extendAsViewModel(['View/User/Login', 'View/App/Login', 'LoginViewModel'], LoginUserView);
 	_.extend(LoginUserView.prototype, AbstractView.prototype);
 
+	LoginUserView.prototype.displayMainForm = function ()
+	{
+		this.welcome(false);
+	};
+
 	LoginUserView.prototype.onShow = function ()
 	{
 		kn.routeOff();
@@ -382,8 +399,6 @@
 				if (0 === iErrorCode)
 				{
 					self.submitRequest(true);
-					self.formHidden(true);
-					
 					require('App/User').loginAndLogoutReload(false);
 				}
 				else
@@ -397,6 +412,8 @@
 		this.twitterLoginEnabled(!!Settings.settingsGet('AllowTwitterSocial'));
 		this.googleLoginEnabled(!!Settings.settingsGet('AllowGoogleSocial') &&
 			!!Settings.settingsGet('AllowGoogleSocialAuth'));
+		this.googleFastLoginEnabled(!!Settings.settingsGet('AllowGoogleSocial') &&
+			!!Settings.settingsGet('AllowGoogleSocialAuthFast'));
 
 		switch (sSignMe)
 		{
@@ -426,7 +443,7 @@
 		this.email(AppStore.devEmail);
 		this.password(AppStore.devPassword);
 
-		if (this.googleLoginEnabled())
+		if (this.googleLoginEnabled() || this.googleFastLoginEnabled())
 		{
 			window['rl_' + sJsHash + '_google_login_service'] = fSocial;
 		}
@@ -471,6 +488,21 @@
 		]);
 	};
 
+	LoginUserView.prototype.selectLanguageOnTab = function (bShift)
+	{
+		if (!bShift)
+		{
+			var self = this;
+			_.delay(function () {
+				self.emailFocus(true);
+			}, 5);
+
+			return false;
+		}
+
+		return true;
+	};
+
 	module.exports = LoginUserView;
 
 }());
\ No newline at end of file
diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js
index 7004b0fb3..d32f72a6a 100644
--- a/dev/View/User/MailBox/FolderList.js
+++ b/dev/View/User/MailBox/FolderList.js
@@ -22,6 +22,8 @@
 		FolderStore = require('Stores/User/Folder'),
 		MessageStore = require('Stores/User/Message'),
 
+		Settings = require('Storage/Settings'),
+
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')
 	;
@@ -50,7 +52,9 @@
 
 		this.iDropOverTimer = 0;
 
+		this.allowComposer = !!Settings.capa(Enums.Capa.Composer);
 		this.allowContacts = !!AppStore.contactsIsAllowed();
+		this.allowFolders = !!Settings.capa(Enums.Capa.Folders);
 
 		this.folderListFocused = ko.computed(function () {
 			return Enums.Focused.FolderList === AppStore.focusedState();
@@ -259,7 +263,10 @@
 
 	FolderListMailBoxUserView.prototype.composeClick = function ()
 	{
-		kn.showScreenPopup(require('View/Popup/Compose'));
+		if (Settings.capa(Enums.Capa.Composer))
+		{
+			kn.showScreenPopup(require('View/Popup/Compose'));
+		}
 	};
 
 	FolderListMailBoxUserView.prototype.createFolder = function ()
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index cd254167f..cc67227a8 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -48,7 +48,12 @@
 		this.bPrefetch = false;
 		this.emptySubjectValue = '';
 
-		this.hideDangerousActions = !!Settings.settingsGet('HideDangerousActions');
+		this.allowReload = !!Settings.capa(Enums.Capa.Reload);
+		this.allowSearch = !!Settings.capa(Enums.Capa.Search);
+		this.allowSearchAdv = !!Settings.capa(Enums.Capa.SearchAdv);
+		this.allowComposer = !!Settings.capa(Enums.Capa.Composer);
+		this.allowMessageListActions = !!Settings.capa(Enums.Capa.MessageListActions);
+		this.allowDangerousActions = !!Settings.capa(Enums.Capa.DangerousActions);
 
 		this.popupVisibility = Globals.popupVisibility;
 
@@ -62,6 +67,7 @@
 		this.selectorMessageFocused = MessageStore.selectorMessageFocused;
 		this.isMessageSelected = MessageStore.isMessageSelected;
 		this.messageListSearch = MessageStore.messageListSearch;
+		this.messageListThreadUid = MessageStore.messageListThreadUid;
 		this.messageListError = MessageStore.messageListError;
 		this.folderMenuForMove = FolderStore.folderMenuForMove;
 
@@ -69,6 +75,7 @@
 
 		this.mainMessageListSearch = MessageStore.mainMessageListSearch;
 		this.messageListEndFolder = MessageStore.messageListEndFolder;
+		this.messageListEndThreadUid = MessageStore.messageListEndThreadUid;
 
 		this.messageListChecked = MessageStore.messageListChecked;
 		this.messageListCheckedOrSelected = MessageStore.messageListCheckedOrSelected;
@@ -198,18 +205,27 @@
 		this.canBeMoved = this.hasCheckedOrSelectedLines;
 
 		this.clearCommand = Utils.createCommand(this, function () {
-			kn.showScreenPopup(require('View/Popup/FolderClear'), [FolderStore.currentFolder()]);
+			if (Settings.capa(Enums.Capa.DangerousActions))
+			{
+				kn.showScreenPopup(require('View/Popup/FolderClear'), [FolderStore.currentFolder()]);
+			}
 		});
 
 		this.multyForwardCommand = Utils.createCommand(this, function () {
-			kn.showScreenPopup(require('View/Popup/Compose'), [
-				Enums.ComposeType.ForwardAsAttachment, MessageStore.messageListCheckedOrSelected()]);
+			if (Settings.capa(Enums.Capa.Composer))
+			{
+				kn.showScreenPopup(require('View/Popup/Compose'), [
+					Enums.ComposeType.ForwardAsAttachment, MessageStore.messageListCheckedOrSelected()]);
+			}
 		}, this.canBeMoved);
 
 		this.deleteWithoutMoveCommand = Utils.createCommand(this, function () {
-			require('App/User').deleteMessagesFromFolder(Enums.FolderType.Trash,
-				FolderStore.currentFolderFullNameRaw(),
-				MessageStore.messageListCheckedOrSelectedUidsWithSubMails(), false);
+			if (Settings.capa(Enums.Capa.DangerousActions))
+			{
+				require('App/User').deleteMessagesFromFolder(Enums.FolderType.Trash,
+					FolderStore.currentFolderFullNameRaw(),
+					MessageStore.messageListCheckedOrSelectedUidsWithSubMails(), false);
+			}
 		}, this.canBeMoved);
 
 		this.deleteCommand = Utils.createCommand(this, function () {
@@ -239,7 +255,7 @@
 		this.moveCommand = Utils.createCommand(this, Utils.emptyFunction, this.canBeMoved);
 
 		this.reloadCommand = Utils.createCommand(this, function () {
-			if (!MessageStore.messageListCompleteLoadingThrottleForAnimation())
+			if (!MessageStore.messageListCompleteLoadingThrottleForAnimation() && this.allowReload)
 			{
 				require('App/User').reloadMessageList(false, true);
 			}
@@ -276,6 +292,35 @@
 			}, this)
 		;
 
+		Events
+			.sub('mailbox.message.show', function (sFolder, sUid) {
+
+				var oMessage = _.find(this.messageList(), function (oItem) {
+					return oItem && sFolder === oItem.folderFullNameRaw && sUid === oItem.uid;
+				});
+
+				if ('INBOX' === sFolder)
+				{
+					kn.setHash(Links.mailBox(sFolder, 1));
+				}
+
+				if (oMessage)
+				{
+					this.selector.selectMessageItem(oMessage);
+				}
+				else
+				{
+					if ('INBOX' !== sFolder)
+					{
+						kn.setHash(Links.mailBox(sFolder, 1));
+					}
+
+					MessageStore.selectMessageByFolderAndUid(sFolder, sUid);
+				}
+
+			}, this)
+		;
+
 		MessageStore.messageListEndHash.subscribe(function () {
 			this.selector.scrollToTop();
 		}, this);
@@ -297,6 +342,11 @@
 	{
 		var self = this;
 
+		if (0 < this.messageListChecked().length)
+		{
+			return false;
+		}
+
 		window.clearTimeout(this.iGoToUpUpOrDownDownTimeout);
 		this.iGoToUpUpOrDownDownTimeout = window.setTimeout(function () {
 
@@ -388,6 +438,15 @@
 		this.inputMessageListSearchFocus(false);
 	};
 
+	MessageListMailBoxUserView.prototype.cancelThreadUid = function ()
+	{
+		kn.setHash(Links.mailBox(
+			FolderStore.currentFolderFullNameHash(),
+			MessageStore.messageListPageBeforeThread(),
+			MessageStore.messageListSearch()
+		));
+	};
+
 	/**
 	 * @param {string} sToFolderFullNameRaw
 	 * @param {boolean} bCopy
@@ -611,11 +670,34 @@
 			kn.setHash(Links.mailBox(
 				FolderStore.currentFolderFullNameHash(),
 				oPage.value,
-				MessageStore.messageListSearch()
+				MessageStore.messageListSearch(),
+				MessageStore.messageListThreadUid()
 			));
 		}
 	};
 
+	MessageListMailBoxUserView.prototype.gotoThread = function (oMessage)
+	{
+		if (oMessage && 0 < oMessage.threadsLen())
+		{
+			MessageStore.messageListPageBeforeThread(MessageStore.messageListPage());
+
+			kn.setHash(Links.mailBox(
+				FolderStore.currentFolderFullNameHash(),
+				1,
+				MessageStore.messageListSearch(),
+				oMessage.uid
+			));
+		}
+	};
+
+	MessageListMailBoxUserView.prototype.clearListIsVisible = function ()
+	{
+		return '' === this.messageListSearchDesc() && '' === this.messageListError() &&
+			'' === MessageStore.messageListEndThreadUid() &&
+			0 < this.messageList().length && (this.isSpamFolder() || this.isTrashFolder());
+	};
+
 	MessageListMailBoxUserView.prototype.onBuild = function (oDom)
 	{
 		var self = this;
@@ -641,6 +723,12 @@
 			.on('click', '.messageList .messageListItem .flagParent', function () {
 				self.flagMessages(ko.dataFor(this));
 			})
+			.on('click', '.messageList .messageListItem .threads-len', function () {
+				self.gotoThread(ko.dataFor(this));
+			})
+			.on('dblclick', '.messageList .messageListItem .actionHandle', function () {
+				self.gotoThread(ko.dataFor(this));
+			})
 		;
 
 		this.initUploaderForAppend();
@@ -673,37 +761,43 @@
 			}
 		});
 
-		// archive (zip)
-		key('z', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
-			self.archiveCommand();
-			return false;
-		});
-
-		// delete
-		key('delete, shift+delete, shift+3', Enums.KeyState.MessageList, function (event, handler) {
-			if (event)
-			{
-				if (0 < MessageStore.messageListCheckedOrSelected().length)
-				{
-					if (handler && 'shift+delete' === handler.shortcut)
-					{
-						self.deleteWithoutMoveCommand();
-					}
-					else
-					{
-						self.deleteCommand();
-					}
-				}
-
+		if (Settings.capa(Enums.Capa.MessageListActions))
+		{
+			// archive (zip)
+			key('z', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
+				self.archiveCommand();
 				return false;
-			}
-		});
+			});
 
-		// check mail
-		key('ctrl+r, command+r', [Enums.KeyState.FolderList, Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
-			self.reloadCommand();
-			return false;
-		});
+			// delete
+			key('delete, shift+delete, shift+3', Enums.KeyState.MessageList, function (event, handler) {
+				if (event)
+				{
+					if (0 < MessageStore.messageListCheckedOrSelected().length)
+					{
+						if (handler && 'shift+delete' === handler.shortcut)
+						{
+							self.deleteWithoutMoveCommand();
+						}
+						else
+						{
+							self.deleteCommand();
+						}
+					}
+
+					return false;
+				}
+			});
+		}
+
+		if (Settings.capa(Enums.Capa.Reload))
+		{
+			// check mail
+			key('ctrl+r, command+r', [Enums.KeyState.FolderList, Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
+				self.reloadCommand();
+				return false;
+			});
+		}
 
 		// check all
 		key('ctrl+a, command+a', Enums.KeyState.MessageList, function () {
@@ -711,46 +805,80 @@
 			return false;
 		});
 
-		// write/compose (open compose popup)
-		key('w,c', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
-			kn.showScreenPopup(require('View/Popup/Compose'));
+		if (Settings.capa(Enums.Capa.Composer))
+		{
+			// write/compose (open compose popup)
+			key('w,c', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
+				kn.showScreenPopup(require('View/Popup/Compose'));
+				return false;
+			});
+		}
+
+		if (Settings.capa(Enums.Capa.MessageListActions))
+		{
+			// important - star/flag messages
+			key('i', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
+				self.flagMessagesFast();
+				return false;
+			});
+		}
+
+		key('t', [Enums.KeyState.MessageList], function () {
+
+			var oMessage = self.selectorMessageSelected();
+			if (!oMessage)
+			{
+				oMessage = self.selectorMessageFocused();
+			}
+
+			if (oMessage && 0 < oMessage.threadsLen())
+			{
+				self.gotoThread(oMessage);
+			}
+
 			return false;
 		});
 
-		// important - star/flag messages
-		key('i', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
-			self.flagMessagesFast();
-			return false;
-		});
+		if (Settings.capa(Enums.Capa.MessageListActions))
+		{
+			// move
+			key('m', Enums.KeyState.MessageList, function () {
+				self.moveDropdownTrigger(true);
+				return false;
+			});
+		}
 
-		// move
-		key('m', Enums.KeyState.MessageList, function () {
-			self.moveDropdownTrigger(true);
-			return false;
-		});
+		if (Settings.capa(Enums.Capa.MessageListActions))
+		{
+			// read
+			key('q', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
+				self.seenMessagesFast(true);
+				return false;
+			});
 
-		// read
-		key('q', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
-			self.seenMessagesFast(true);
-			return false;
-		});
+			// unread
+			key('u', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
+				self.seenMessagesFast(false);
+				return false;
+			});
+		}
 
-		// unread
-		key('u', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
-			self.seenMessagesFast(false);
-			return false;
-		});
+		if (Settings.capa(Enums.Capa.Composer))
+		{
+			key('shift+f', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
+				self.multyForwardCommand();
+				return false;
+			});
+		}
 
-		key('shift+f', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
-			self.multyForwardCommand();
-			return false;
-		});
-
-		// search input focus
-		key('/', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
-			self.inputMessageListSearchFocus(true);
-			return false;
-		});
+		if (Settings.capa(Enums.Capa.Search))
+		{
+			// search input focus
+			key('/', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
+				self.inputMessageListSearchFocus(true);
+				return false;
+			});
+		}
 
 		// cancel search
 		key('esc', Enums.KeyState.MessageList, function () {
@@ -759,6 +887,11 @@
 				self.cancelSearch();
 				return false;
 			}
+			else if ('' !== self.messageListEndThreadUid())
+			{
+				self.cancelThreadUid();
+				return false;
+			}
 		});
 
 		// change focused state
@@ -821,12 +954,18 @@
 
 	MessageListMailBoxUserView.prototype.composeClick = function ()
 	{
-		kn.showScreenPopup(require('View/Popup/Compose'));
+		if (Settings.capa(Enums.Capa.Composer))
+		{
+			kn.showScreenPopup(require('View/Popup/Compose'));
+		}
 	};
 
 	MessageListMailBoxUserView.prototype.advancedSearchClick = function ()
 	{
-		kn.showScreenPopup(require('View/Popup/AdvancedSearch'));
+		if (Settings.capa(Enums.Capa.SearchAdv))
+		{
+			kn.showScreenPopup(require('View/Popup/AdvancedSearch'));
+		}
 	};
 
 	MessageListMailBoxUserView.prototype.quotaTooltip = function ()
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index fdba28c18..4109bdc0b 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -4,6 +4,7 @@
 	'use strict';
 
 	var
+		window = require('window'),
 		_ = require('_'),
 		$ = require('$'),
 		ko = require('ko'),
@@ -19,9 +20,11 @@
 		Events = require('Common/Events'),
 		Translator = require('Common/Translator'),
 		Audio = require('Common/Audio'),
+		Links = require('Common/Links'),
 
 		Cache = require('Common/Cache'),
 
+		SocialStore = require('Stores/Social'),
 		AppStore = require('Stores/User/App'),
 		SettingsStore = require('Stores/User/Settings'),
 		AccountStore = require('Stores/User/Account'),
@@ -29,6 +32,7 @@
 		MessageStore = require('Stores/User/Message'),
 
 		Local = require('Storage/Client'),
+		Settings = require('Storage/Settings'),
 		Remote = require('Remote/User/Ajax'),
 
 		Promises = require('Promises/User/Ajax'),
@@ -60,8 +64,19 @@
 		this.oHeaderDom = null;
 		this.oMessageScrollerDom = null;
 
+		this.bodyBackgroundColor = ko.observable('');
+
 		this.pswp = null;
 
+		this.allowComposer = !!Settings.capa(Enums.Capa.Composer);
+		this.allowMessageActions = !!Settings.capa(Enums.Capa.MessageActions);
+		this.allowMessageListActions = !!Settings.capa(Enums.Capa.MessageListActions);
+
+		this.logoImg = Utils.trim(Settings.settingsGet('UserLogoMessage'));
+		this.logoIframe = Utils.trim(Settings.settingsGet('UserIframeMessage'));
+
+		this.attachmentsActions = AppStore.attachmentsActions;
+
 		this.message = MessageStore.message;
 		this.messageListChecked = MessageStore.messageListChecked;
 		this.hasCheckedMessages = MessageStore.hasCheckedMessages;
@@ -80,12 +95,68 @@
 
 		this.messageListOfThreadsLoading = ko.observable(false).extend({'rateLimit': 1});
 
-		this.allowAttachmnetControls = ko.observable(false);
+		this.highlightUnselectedAttachments = ko.observable(false).extend({'falseTimeout': 2000});
+
 		this.showAttachmnetControls = ko.observable(false);
 
+		this.allowAttachmnetControls = ko.computed(function () {
+			return 0 < this.attachmentsActions().length &&
+				Settings.capa(Enums.Capa.AttachmentsActions);
+		}, this);
+
+		this.downloadAsZipAllowed = ko.computed(function () {
+			return -1 < Utils.inArray('zip', this.attachmentsActions()) &&
+				this.allowAttachmnetControls();
+		}, this);
+
 		this.downloadAsZipLoading = ko.observable(false);
+		this.downloadAsZipError = ko.observable(false).extend({'falseTimeout': 7000});
+
+		this.saveToOwnCloudAllowed = ko.computed(function () {
+			return -1 < Utils.inArray('owncloud', this.attachmentsActions()) &&
+				this.allowAttachmnetControls();
+		}, this);
+
 		this.saveToOwnCloudLoading = ko.observable(false);
+		this.saveToOwnCloudSuccess = ko.observable(false).extend({'falseTimeout': 2000});
+		this.saveToOwnCloudError = ko.observable(false).extend({'falseTimeout': 7000});
+
+		this.saveToOwnCloudSuccess.subscribe(function (bV) {
+			if (bV)
+			{
+				this.saveToOwnCloudError(false);
+			}
+		}, this);
+
+		this.saveToOwnCloudError.subscribe(function (bV) {
+			if (bV)
+			{
+				this.saveToOwnCloudSuccess(false);
+			}
+		}, this);
+
+		this.saveToDropboxAllowed = ko.computed(function () {
+			return -1 < Utils.inArray('dropbox', this.attachmentsActions()) &&
+				this.allowAttachmnetControls();
+		}, this);
+
 		this.saveToDropboxLoading = ko.observable(false);
+		this.saveToDropboxSuccess = ko.observable(false).extend({'falseTimeout': 2000});
+		this.saveToDropboxError = ko.observable(false).extend({'falseTimeout': 7000});
+
+		this.saveToDropboxSuccess.subscribe(function (bV) {
+			if (bV)
+			{
+				this.saveToDropboxError(false);
+			}
+		}, this);
+
+		this.saveToDropboxError.subscribe(function (bV) {
+			if (bV)
+			{
+				this.saveToDropboxSuccess(false);
+			}
+		}, this);
 
 		this.showAttachmnetControls.subscribe(function (bV) {
 			if (this.message())
@@ -155,7 +226,7 @@
 
 		this.deleteCommand = Utils.createCommand(this, function () {
 			var oMessage = this.message();
-			if (oMessage)
+			if (oMessage && this.allowMessageListActions)
 			{
 				this.message(null);
 				require('App/User').deleteMessagesFromFolder(Enums.FolderType.Trash,
@@ -165,7 +236,7 @@
 
 		this.deleteWithoutMoveCommand = Utils.createCommand(this, function () {
 			var oMessage = this.message();
-			if (oMessage)
+			if (oMessage && this.allowMessageListActions)
 			{
 				this.message(null);
 				require('App/User').deleteMessagesFromFolder(Enums.FolderType.Trash,
@@ -175,7 +246,7 @@
 
 		this.archiveCommand = Utils.createCommand(this, function () {
 			var oMessage = this.message();
-			if (oMessage)
+			if (oMessage && this.allowMessageListActions)
 			{
 				this.message(null);
 				require('App/User').deleteMessagesFromFolder(Enums.FolderType.Archive,
@@ -185,7 +256,7 @@
 
 		this.spamCommand = Utils.createCommand(this, function () {
 			var oMessage = this.message();
-			if (oMessage)
+			if (oMessage && this.allowMessageListActions)
 			{
 				this.message(null);
 				require('App/User').deleteMessagesFromFolder(Enums.FolderType.Spam,
@@ -195,7 +266,7 @@
 
 		this.notSpamCommand = Utils.createCommand(this, function () {
 			var oMessage = this.message();
-			if (oMessage)
+			if (oMessage && this.allowMessageListActions)
 			{
 				this.message(null);
 				require('App/User').deleteMessagesFromFolder(Enums.FolderType.NotSpam,
@@ -203,6 +274,9 @@
 			}
 		}, this.messageVisibility);
 
+		this.dropboxEnabled = SocialStore.dropbox.enabled;
+		this.dropboxApiKey = SocialStore.dropbox.apiKey;
+
 		// viewer
 
 		this.viewBodyTopValue = ko.observable(0);
@@ -229,174 +303,6 @@
 		this.viewIsImportant = ko.observable(false);
 		this.viewIsFlagged = ko.observable(false);
 
-// THREADS
-		this.viewThreads = ko.observableArray([]);
-		this.viewThreads.trigger = ko.observable(false);
-
-		this.viewThreadMessages = MessageStore.messageThreadList;
-
-		this.viewThreadMessages.error = ko.observable('');
-		this.viewThreadMessages.showMore = ko.observable(false);
-		this.viewThreadMessages.limit = 6;
-
-		this.viewThreadMessages.subscribe(function (aList) {
-
-			var iSelectedIndex = -1;
-
-			this.viewThreadMessages.error('');
-			if (aList && 0 < aList.length)
-			{
-				_.each(aList, function (oM, iIndex) {
-					if (oM && oM.selected())
-					{
-						iSelectedIndex = iIndex;
-					}
-				});
-
-				this.viewThreadMessages.showMore(this.viewThreadMessages.limit >= aList.length);
-
-				if (-1 < iSelectedIndex && !this.viewThreadMessages.showMore() &&
-					this.viewThreadMessages.limit < iSelectedIndex)
-				{
-					this.viewThreadMessages.showMore(true);
-				}
-
-				this.selectSelectedThreadMessage();
-				require('App/User').reloadFlagsCurrentMessageListAndMessageFromCache();
-			}
-
-		}, this);
-
-		MessageStore.messageLastThreadUidsData.subscribe(function (oData) {
-			if (oData && oData['Uids'])
-			{
-				oData['Uid'] = Utils.pString(oData['Uid']);
-				if (this.viewFolder === oData['Folder'] && this.viewUid === oData['Uid'])
-				{
-					this.viewThreads(oData['Uids']);
-					this.viewThreads.trigger(!this.viewThreads.trigger());
-				}
-
-				var oMessage = MessageStore.message();
-				if (oMessage && oMessage.folderFullNameRaw === oData['Folder'] && oMessage.uid === oData['Uid'])
-				{
-					oMessage.threads(oData['Uids']);
-				}
-
-				oMessage = _.find(MessageStore.messageList(), function (oMessage) {
-					return oMessage && oMessage.folderFullNameRaw === oData['Folder'] && oMessage.uid === oData['Uid'];
-				});
-
-				if (oMessage && oMessage.folderFullNameRaw === oData['Folder'] && oMessage.uid === oData['Uid'])
-				{
-					oMessage.threads(oData['Uids']);
-				}
-			}
-		}, this);
-
-		this.viewThreads.status = ko.computed(function () {
-
-			this.viewThreads.trigger();
-
-			var
-				iIndex = 0,
-				aResult = [false, '', '', '', ''],
-				aThreads = this.viewThreads.peek(),
-				iLen = aThreads.length
-			;
-
-			if (1 < iLen)
-			{
-				iIndex = Utils.inArray(this.viewUid, aThreads);
-				if (-1 < iIndex)
-				{
-					aResult[0] = true;
-					aResult[1] = (iIndex + 1) + '/' + iLen;
-					aResult[2] = aThreads[iIndex];
-					aResult[3] = 0 < iIndex && aThreads[iIndex - 1] ? aThreads[iIndex - 1] : '';
-					aResult[4] = aThreads[iIndex + 1] ? aThreads[iIndex + 1] : '';
-				}
-			}
-
-			return aResult;
-
-		}, this).extend({'notify': 'always'});
-
-		this.viewThreadsControlVisibility = ko.computed(function () {
-			return !!this.viewThreads.status()[0];
-		}, this);
-
-		this.viewThreadsControlDesc = ko.computed(function () {
-			return this.viewThreads.status()[1];
-		}, this);
-
-		this.viewThreadsControlBackAllow = ko.computed(function () {
-			return '' !== this.viewThreads.status()[4] && !this.messageLoadingThrottle();
-		}, this);
-
-		this.viewThreadsControlForwardAllow = ko.computed(function () {
-			return '' !== this.viewThreads.status()[3] && !this.messageLoadingThrottle();
-		}, this);
-
-		this.threadBackCommand = Utils.createCommand(this, function () {
-			var aStatus = this.viewThreads.status();
-			this.openThreadMessage(aStatus[4]);
-		}, this.viewThreadsControlBackAllow);
-
-		this.threadForwardCommand = Utils.createCommand(this, function () {
-			var aStatus = this.viewThreads.status();
-			this.openThreadMessage(aStatus[3]);
-		}, this.viewThreadsControlForwardAllow);
-
-		this.threadsDropdownTrigger = ko.observable(false);
-
-		this.threadListCommand = Utils.createCommand(this, function () {
-
-			var
-				self = this,
-				sFolder = this.viewFolder,
-				sUid = this.viewUid,
-				aUids = this.viewThreads(),
-				aStatus = this.viewThreads.status()
-			;
-
-			if (aStatus && aStatus[0])
-			{
-				self.viewThreadMessages([]);
-
-				Promises.messageListSimple(sFolder, aUids, this.messageListOfThreadsLoading).then(function (aList) {
-
-					_.each(aList, function (oItem) {
-						if (oItem && oItem.uid)
-						{
-							oItem.selected(sUid === oItem.uid);
-						}
-					});
-
-					self.viewThreadMessages(aList);
-
-				}).fail(function (iErrorCode) {
-					self.viewThreadMessages([]);
-					self.viewThreadMessages.error(Translator.getNotification(
-						iErrorCode, '', Enums.Notification.CantGetMessageList));
-				}).done();
-			}
-
-		}, function () {
-			return !this.messageLoadingThrottle() &&
-				!this.messageListOfThreadsLoading();
-		});
-
-// PGP
-		this.viewPgpPassword = ko.observable('');
-		this.viewPgpSignedVerifyStatus = ko.computed(function () {
-			return this.message() ? this.message().pgpSignedVerifyStatus() : Enums.SignedVerifyStatus.None;
-		}, this);
-
-		this.viewPgpSignedVerifyUser = ko.computed(function () {
-			return this.message() ? this.message().pgpSignedVerifyUser() : '';
-		}, this);
-
 		this.viewFromDkimStatusIconClass = ko.computed(function () {
 
 			var sResult = 'icon-none iconcolor-display-none';
@@ -437,12 +343,14 @@
 
 		}, this);
 
+		this.messageActiveDom.subscribe(function (oDom) {
+			this.bodyBackgroundColor(oDom ? this.detectDomBackgroundColor(oDom): '');
+		}, this);
+
 		this.message.subscribe(function (oMessage) {
 
 			this.messageActiveDom(null);
 
-			this.viewPgpPassword('');
-
 			if (oMessage)
 			{
 				this.showAttachmnetControls(false);
@@ -472,9 +380,6 @@
 				this.viewIsImportant(oMessage.isImportant());
 				this.viewIsFlagged(oMessage.flagged());
 
-				this.viewThreads(oMessage.threads());
-				this.viewThreads.trigger(!this.viewThreads.trigger());
-
 				sLastEmail = oMessage.fromAsSingleEmail();
 				Cache.getUserPic(sLastEmail, function (sPic, sEmail) {
 					if (sPic !== self.viewUserPic() && sLastEmail === sEmail)
@@ -495,8 +400,6 @@
 				this.viewUid = '';
 				this.viewHash = '';
 
-				this.viewThreads([]);
-
 				this.scrollMessageToTop();
 			}
 
@@ -555,52 +458,54 @@
 	kn.extendAsViewModel(['View/User/MailBox/MessageView', 'View/App/MailBox/MessageView', 'MailBoxMessageViewViewModel'], MessageViewMailBoxUserView);
 	_.extend(MessageViewMailBoxUserView.prototype, AbstractView.prototype);
 
-	MessageViewMailBoxUserView.prototype.openThreadMessage = function (sUid)
+	MessageViewMailBoxUserView.prototype.detectDomBackgroundColor = function (oDom)
 	{
-		var oMessage = this.message();
-		if (oMessage && sUid)
+		var
+			iLimit = 5,
+			sResult = '',
+			aC = null,
+			fFindDom = function (oDom) {
+				var aC = oDom ? oDom.children() : null;
+				return (aC && 1 === aC.length && aC.is('table,div,center')) ? aC : null;
+			},
+			fFindColor = function (oDom) {
+				var sResult = '';
+				if (oDom)
+				{
+					sResult = oDom.css('background-color') || '';
+					if (!oDom.is('table'))
+					{
+						sResult = 'rgba(0, 0, 0, 0)' === sResult || 'transparent' === sResult ? '' : sResult;
+					}
+				}
+
+				return sResult;
+			}
+		;
+
+		if (oDom && 1 === oDom.length)
 		{
-			MessageStore.selectThreadMessage(oMessage.folderFullNameRaw, sUid);
-		}
-	};
+			aC = oDom;
+			while ('' === sResult)
+			{
+				iLimit--;
+				if (0 >= iLimit)
+				{
+					break;
+				}
 
-	MessageViewMailBoxUserView.prototype.isPgpActionVisible = function ()
-	{
-		return Enums.SignedVerifyStatus.Success !== this.viewPgpSignedVerifyStatus();
-	};
+				aC = fFindDom(aC);
+				if (aC)
+				{
+					sResult = fFindColor(aC);
+				}
+				else
+				{
+					break;
+				}
+			}
 
-	MessageViewMailBoxUserView.prototype.isPgpStatusVerifyVisible = function ()
-	{
-		return Enums.SignedVerifyStatus.None !== this.viewPgpSignedVerifyStatus();
-	};
-
-	MessageViewMailBoxUserView.prototype.isPgpStatusVerifySuccess = function ()
-	{
-		return Enums.SignedVerifyStatus.Success === this.viewPgpSignedVerifyStatus();
-	};
-
-	MessageViewMailBoxUserView.prototype.pgpStatusVerifyMessage = function ()
-	{
-		var sResult = '';
-		switch (this.viewPgpSignedVerifyStatus())
-		{
-			case Enums.SignedVerifyStatus.UnknownPublicKeys:
-				sResult = Translator.i18n('PGP_NOTIFICATIONS/NO_PUBLIC_KEYS_FOUND');
-				break;
-			case Enums.SignedVerifyStatus.UnknownPrivateKey:
-				sResult = Translator.i18n('PGP_NOTIFICATIONS/NO_PRIVATE_KEY_FOUND');
-				break;
-			case Enums.SignedVerifyStatus.Unverified:
-				sResult = Translator.i18n('PGP_NOTIFICATIONS/UNVERIFIRED_SIGNATURE');
-				break;
-			case Enums.SignedVerifyStatus.Error:
-				sResult = Translator.i18n('PGP_NOTIFICATIONS/DECRYPTION_ERROR');
-				break;
-			case Enums.SignedVerifyStatus.Success:
-				sResult = Translator.i18n('PGP_NOTIFICATIONS/GOOD_SIGNATURE', {
-					'USER': this.viewPgpSignedVerifyUser()
-				});
-				break;
+			sResult = 'rgba(0, 0, 0, 0)' === sResult || 'transparent' === sResult ? '' : sResult;
 		}
 
 		return sResult;
@@ -631,7 +536,10 @@
 	 */
 	MessageViewMailBoxUserView.prototype.replyOrforward = function (sType)
 	{
-		kn.showScreenPopup(require('View/Popup/Compose'), [sType, MessageStore.message()]);
+		if (Settings.capa(Enums.Capa.Composer))
+		{
+			kn.showScreenPopup(require('View/Popup/Compose'), [sType, MessageStore.message()]);
+		}
 	};
 
 	MessageViewMailBoxUserView.prototype.checkHeaderHeight = function ()
@@ -643,10 +551,38 @@
 		}
 	};
 
+	/**
+	 * @todo
+	 * @param {string} sEmail
+	 */
+//	MessageViewMailBoxUserView.prototype.displayMailToPopup = function (sMailToUrl)
+//	{
+//		sMailToUrl = sMailToUrl.replace(/\?.+$/, '');
+//
+//		var
+//			sResult = '',
+//			aTo = [],
+//			EmailModel = require('Model/Email'),
+//			fParseEmailLine = function (sLine) {
+//				return sLine ? _.compact(_.map([window.decodeURIComponent(sLine)], function (sItem) {
+//						var oEmailModel = new EmailModel();
+//						oEmailModel.mailsoParse(sItem);
+//						return '' !== oEmailModel.email ? oEmailModel : null;
+//					})) : null;
+//			}
+//		;
+//
+//		aTo = fParseEmailLine(sMailToUrl);
+//		sResult = aTo && aTo[0] ? aTo[0].email : '';
+//
+//		return sResult;
+//	};
+
 	MessageViewMailBoxUserView.prototype.onBuild = function (oDom)
 	{
 		var
 			self = this,
+			oScript = null,
 			sErrorMessage = Translator.i18n('PREVIEW_POPUP/IMAGE_ERROR'),
 			fCheckHeaderHeight = _.bind(this.checkHeaderHeight, this)
 		;
@@ -660,6 +596,7 @@
 			}
 		}, this);
 
+		this.showAttachmnetControls.subscribe(fCheckHeaderHeight);
 		this.fullScreenMode.subscribe(fCheckHeaderHeight);
 		this.showFullInfo.subscribe(fCheckHeaderHeight);
 		this.message.subscribe(fCheckHeaderHeight);
@@ -675,6 +612,16 @@
 			Utils.windowResize(250);
 		});
 
+		if (this.dropboxEnabled() && this.dropboxApiKey() && !window.Dropbox)
+		{
+			oScript = window.document.createElement('script');
+			oScript.type = 'text/javascript';
+			oScript.src = 'https://www.dropbox.com/static/api/2/dropins.js';
+			$(oScript).attr('id', 'dropboxjs').attr('data-app-key', self.dropboxApiKey());
+
+			window.document.body.appendChild(oScript);
+		}
+
 		this.oHeaderDom = $('.messageItemHeader', oDom);
 		this.oHeaderDom = this.oHeaderDom[0] ? this.oHeaderDom : null;
 
@@ -683,9 +630,10 @@
 		if (this.pswpDom)
 		{
 			oDom
-				.on('click', '.attachmentImagePreview[data-index]', function (oEvent) {
+				.on('click', '.attachmentImagePreview.visible', function (oEvent) {
 
 					var
+						iIndex = 0,
 						oPs = null,
 						oEl = oEvent.currentTarget || null,
 						aItems = []
@@ -702,14 +650,18 @@
 //						}
 					;
 
-					oDom.find('.attachmentImagePreview[data-index]').each(function (index, oSubElement) {
+					oDom.find('.attachmentImagePreview.visible').each(function (index, oSubElement) {
 
 						var
 							$oItem = $(oSubElement)
 						;
 
+						if (oEl === oSubElement)
+						{
+							iIndex = index;
+						}
+
 						aItems.push({
-//							'el': $oItem,
 							'w': 600, 'h': 400,
 							'src': $oItem.attr('href'),
 							'title': $oItem.attr('title') || ''
@@ -721,7 +673,7 @@
 						Globals.useKeyboardShortcuts(false);
 
 						oPs = new PhotoSwipe(self.pswpDom, PhotoSwipeUI_Default, aItems, {
-							'index': Utils.pInt($(oEl).data('index')),
+							'index': iIndex,
 							'bgOpacity': 0.85,
 							'loadingIndicatorDelay': 500,
 							'errorMsg': '
' + sErrorMessage + '
',
@@ -760,8 +712,24 @@
 		oDom
 			.on('click', 'a', function (oEvent) {
 				// setup maito protocol
-				return !(!!oEvent && 3 !== oEvent['which'] && Utils.mailToHelper($(this).attr('href'), require('View/Popup/Compose')));
+				return !(!!oEvent && 3 !== oEvent['which'] && Utils.mailToHelper($(this).attr('href'),
+					Settings.capa(Enums.Capa.Composer) ? require('View/Popup/Compose') : null));
 			})
+//			.on('mouseover', 'a', _.debounce(function (oEvent) {
+//
+//				if (oEvent)
+//				{
+//					var sMailToUrl = $(this).attr('href');
+//					if (sMailToUrl && 'mailto:' === sMailToUrl.toString().substr(0, 7).toLowerCase())
+//					{
+//						sMailToUrl = sMailToUrl.toString().substr(7);
+//						self.displayMailToPopup(sMailToUrl);
+//					}
+//				}
+//
+//				return true;
+//
+//			}, 1000))
 			.on('click', '.attachmentsPlace .attachmentIconParent', function (oEvent) {
 				if (oEvent && oEvent.stopPropagation)
 				{
@@ -791,32 +759,6 @@
 					}
 				}
 			})
-			.on('click', '.thread-list .more-threads', function (e) {
-
-				var oLast = null;
-				if (!e || 0 === e.clientX) // probably enter
-				{
-					// It's a bad bad hack :(
-					oLast = $('.thread-list .e-item.thread-list-message.real-msg.more-that:first a.e-link', oDom);
-				}
-
-				self.viewThreadMessages.showMore(true);
-				self.threadsDropdownTrigger(true);
-
-				if (oLast && oLast[0])
-				{
-					oLast.focus();
-				}
-
-				return false;
-			})
-			.on('click', '.thread-list .thread-list-message', function () {
-				var oMessage = ko.dataFor(this);
-				if (oMessage && oMessage.folder && oMessage.uid)
-				{
-					self.openThreadMessage(oMessage.uid);
-				}
-			})
 			.on('click', '.attachmentsPlace .attachmentItem .attachmentNameParent', function () {
 
 				var
@@ -869,18 +811,6 @@
 		this.initShortcuts();
 	};
 
-	MessageViewMailBoxUserView.prototype.selectSelectedThreadMessage = function ()
-	{
-		var self = this;
-		_.delay(function () {
-			var oLast = self.oDom ? $('.thread-list .e-item.thread-list-message.real-msg.selected a.e-link', self.oDom) : null;
-			if (oLast && oLast[0])
-			{
-				oLast.focus();
-			}
-		}, 30);
-	};
-
 	/**
 	 * @return {boolean}
 	 */
@@ -970,35 +900,16 @@
 			}
 		});
 
-		key('t', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
-			if (MessageStore.message() && self.viewThreadsControlVisibility())
-			{
-				self.threadsDropdownTrigger(true);
-				self.threadListCommand();
-				return false;
-			}
-		});
-
-		key('ctrl+up, command+up', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
+		key('ctrl+up, command+up, ctrl+left, command+left', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
 			self.goUpCommand();
 			return false;
 		});
 
-		key('ctrl+down, command+down', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
+		key('ctrl+down, command+down, ctrl+right, command+right', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
 			self.goDownCommand();
 			return false;
 		});
 
-		key('ctrl+left, command+left', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
-			self.threadForwardCommand();
-			return false;
-		});
-
-		key('ctrl+right, command+right', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
-			self.threadBackCommand();
-			return false;
-		});
-
 		// print
 		key('ctrl+p, command+p', Enums.KeyState.MessageView, function () {
 			if (self.message())
@@ -1111,12 +1022,15 @@
 
 	MessageViewMailBoxUserView.prototype.composeClick = function ()
 	{
-		kn.showScreenPopup(require('View/Popup/Compose'));
+		if (Settings.capa(Enums.Capa.Composer))
+		{
+			kn.showScreenPopup(require('View/Popup/Compose'));
+		}
 	};
 
 	MessageViewMailBoxUserView.prototype.editMessage = function ()
 	{
-		if (MessageStore.message())
+		if (Settings.capa(Enums.Capa.Composer) && MessageStore.message())
 		{
 			kn.showScreenPopup(require('View/Popup/Compose'), [Enums.ComposeType.Draft, MessageStore.message()]);
 		}
@@ -1154,34 +1068,115 @@
 	MessageViewMailBoxUserView.prototype.getAttachmentsHashes = function ()
 	{
 		return _.compact(_.map(this.message() ? this.message().attachments() : [], function (oItem) {
-			return oItem && oItem.checked() ? oItem.download : '';
+			return oItem && !oItem.isLinked && oItem.checked() ? oItem.download : '';
 		}));
 	};
 
 	MessageViewMailBoxUserView.prototype.downloadAsZip = function ()
 	{
-		var aHashes = this.getAttachmentsHashes();
+		var self = this, aHashes = this.getAttachmentsHashes();
 		if (0 < aHashes.length)
 		{
-			Promises.attachmentsActions('Zip', aHashes, this.downloadAsZipLoading);
+			Promises.attachmentsActions('Zip', aHashes, this.downloadAsZipLoading).then(function (oResult) {
+				if (oResult && oResult.Result && oResult.Result.Files &&
+					oResult.Result.Files[0] && oResult.Result.Files[0].Hash)
+				{
+					require('App/User').download(
+						Links.attachmentDownload(oResult.Result.Files[0].Hash));
+				}
+				else
+				{
+					self.downloadAsZipError(true);
+				}
+			}).fail(function () {
+				self.downloadAsZipError(true);
+			});
+		}
+		else
+		{
+			this.highlightUnselectedAttachments(true);
 		}
 	};
 
 	MessageViewMailBoxUserView.prototype.saveToOwnCloud = function ()
 	{
-		var aHashes = this.getAttachmentsHashes();
+		var self = this, aHashes = this.getAttachmentsHashes();
 		if (0 < aHashes.length)
 		{
-			Promises.attachmentsActions('OwnCloud', aHashes, this.saveToOwnCloudLoading);
+			Promises.attachmentsActions('OwnCloud', aHashes, this.saveToOwnCloudLoading).then(function (oResult) {
+				if (oResult && oResult.Result)
+				{
+					self.saveToOwnCloudSuccess(true);
+				}
+				else
+				{
+					self.saveToOwnCloudError(true);
+				}
+			}).fail(function () {
+				self.saveToOwnCloudError(true);
+			});
+		}
+		else
+		{
+			this.highlightUnselectedAttachments(true);
 		}
 	};
 
 	MessageViewMailBoxUserView.prototype.saveToDropbox = function ()
 	{
-		var aHashes = this.getAttachmentsHashes();
+		var self = this, aFiles = [], aHashes = this.getAttachmentsHashes();
 		if (0 < aHashes.length)
 		{
-			Promises.attachmentsActions('Dropbox', aHashes, this.saveToDropboxLoading);
+			if (window.Dropbox)
+			{
+				Promises.attachmentsActions('Dropbox', aHashes, this.saveToDropboxLoading).then(function (oResult) {
+					if (oResult && oResult.Result && oResult.Result.Url && oResult.Result.ShortLife && oResult.Result.Files)
+					{
+						if (window.Dropbox && Utils.isArray(oResult.Result.Files))
+						{
+							_.each(oResult.Result.Files, function (oItem) {
+								aFiles.push({
+									'url': oResult.Result.Url +
+										Links.attachmentDownload(oItem.Hash, oResult.Result.ShortLife),
+									'filename': oItem.FileName
+								});
+							});
+
+							window.Dropbox.save({
+								'files': aFiles,
+								'progress': function () {
+									self.saveToDropboxLoading(true);
+									self.saveToDropboxError(false);
+									self.saveToDropboxSuccess(false);
+								},
+								'cancel': function () {
+									self.saveToDropboxSuccess(false);
+									self.saveToDropboxError(false);
+									self.saveToDropboxLoading(false);
+								},
+								'success': function () {
+									self.saveToDropboxSuccess(true);
+									self.saveToDropboxLoading(false);
+								},
+								'error': function () {
+									self.saveToDropboxError(true);
+									self.saveToDropboxLoading(false);
+								}
+							});
+						}
+						else
+						{
+							self.saveToDropboxError(true);
+						}
+					}
+				}).fail(function () {
+					self.saveToDropboxError(true);
+				});
+			}
+		}
+		else
+		{
+			this.highlightUnselectedAttachments(true);
 		}
 	};
 
@@ -1194,6 +1189,8 @@
 		{
 			oMessage.showExternalImages(true);
 		}
+
+		this.checkHeaderHeight();
 	};
 
 	/**
@@ -1205,29 +1202,6 @@
 		return 0 < iCnt ? (100 > iCnt ? iCnt : '99+') : '';
 	};
 
-
-	/**
-	 * @param {MessageModel} oMessage
-	 */
-	MessageViewMailBoxUserView.prototype.verifyPgpSignedClearMessage = function (oMessage)
-	{
-		if (oMessage)
-		{
-			oMessage.verifyPgpSignedClearMessage();
-		}
-	};
-
-	/**
-	 * @param {MessageModel} oMessage
-	 */
-	MessageViewMailBoxUserView.prototype.decryptPgpEncryptedMessage = function (oMessage)
-	{
-		if (oMessage)
-		{
-			oMessage.decryptPgpEncryptedMessage(this.viewPgpPassword());
-		}
-	};
-
 	/**
 	 * @param {MessageModel} oMessage
 	 */
@@ -1246,6 +1220,8 @@
 
 			require('App/User').reloadFlagsCurrentMessageListAndMessageFromCache();
 		}
+
+		this.checkHeaderHeight();
 	};
 
 	module.exports = MessageViewMailBoxUserView;
diff --git a/dev/bootstrap.js b/dev/bootstrap.js
index d88505169..b15af81a6 100644
--- a/dev/bootstrap.js
+++ b/dev/bootstrap.js
@@ -23,7 +23,6 @@
 
 		Globals.$win
 			.keydown(Utils.kill_CtrlA_CtrlS)
-			.keyup(Utils.kill_CtrlA_CtrlS)
 			.unload(function () {
 				Globals.bUnload = true;
 			})
@@ -82,7 +81,7 @@
 				}
 
 				window['__APP_BOOT'] = null;
-				
+
 			}, 10));
 		};
 
diff --git a/gulpfile.js b/gulpfile.js
index 4612b4f6d..e6ebe3b55 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,11 +1,17 @@
-/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
 'use strict';
 
 var
 	pkg = require('./package.json'),
+	head = {
+		rainloop: '/* RainLoop Webmail (c) RainLoop Team | Licensed under RainLoop Software License */',
+		agpl: '/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL v3 */'
+	},
 	cfg = {
 		devVersion: '0.0.0',
 		releasesPath: 'build/dist/releases',
+		community: true,
+		watch: false,
 
 		rainloopBuilded: false,
 		destPath: '',
@@ -25,20 +31,31 @@ var
 		}
 	},
 
+	_ = require('lodash'),
 	fs = require('node-fs'),
 	path = require('path'),
+	notifier = require('node-notifier'),
+
 	gulp = require('gulp'),
 	concat = require('gulp-concat-util'),
 	header = require('gulp-header'),
-	eol = require('gulp-eol'),
 	stripbom = require('gulp-stripbom'),
 	rename = require('gulp-rename'),
 	replace = require('gulp-replace'),
 	uglify = require('gulp-uglify'),
+	notify = require("gulp-notify"),
 	plumber = require('gulp-plumber'),
+	gulpif = require('gulp-if'),
+	eol = require('gulp-eol'),
+	livereload = require('gulp-livereload'),
 	gutil = require('gulp-util')
 ;
 
+function getHead()
+{
+	return !cfg.community ? head.rainloop : head.agpl;
+}
+
 function regOtherMinTask(sName, sPath, sInc, sOut, sHeader)
 {
 	gulp.task(sName, function() {
@@ -83,7 +100,10 @@ cfg.paths.less = {
 		src: 'dev/Styles/@Main.less',
 		watch: ['dev/Styles/*.less'],
 		options: {
-			paths: [path.join(__dirname, 'dev/Styles/'), path.join(__dirname, 'vendors/bootstrap/less/')]
+			paths: [
+				path.join(__dirname, 'dev', 'Styles'),
+				path.join(__dirname, 'vendors', 'bootstrap', 'less')
+			]
 		}
 	}
 };
@@ -97,7 +117,8 @@ cfg.paths.css = {
 			'vendors/fontastic/styles.css',
 			'vendors/jquery-nanoscroller/nanoscroller.css',
 			'vendors/jquery-letterfx/jquery-letterfx.min.css',
-			'vendors/simple-pace/styles.css',
+			'vendors/progress.js/minified/progressjs.min.css',
+			'vendors/progress.js/minified/progressjs.rainloop.css',
 			'vendors/inputosaurus/inputosaurus.css',
 			'vendors/opentip/opentip.css',
 			'vendors/photoswipe/photoswipe.css',
@@ -114,14 +135,21 @@ cfg.paths.js = {
 		src: [
 			'vendors/json2.min.js',
 			'vendors/labjs/LAB.min.js',
-			'vendors/simple-pace/simple-pace-1.0.min.js',
+			'vendors/modernizr.js',
+			'vendors/progress.js/minified/progress.min.js',
 			'vendors/rl/rl-1.5.min.js'
 		]
 	},
 	openpgp: {
-		name: 'openpgp.js',
+		name: 'openpgp.min.js',
 		src: [
-			'vendors/openpgp/openpgp-0.7.2.min.js'
+			'vendors/openpgp/openpgp-0.10.1.min.js'
+		]
+	},
+	openpgpworker: {
+		name: 'openpgp.worker.min.js',
+		src: [
+			'vendors/openpgp/openpgp-0.10.1.worker.min.js'
 		]
 	},
 	encrypt: {
@@ -140,12 +168,9 @@ cfg.paths.js = {
 	libs: {
 		name: 'libs.js',
 		src: [
-			'vendors/modernizr.js',
 			'vendors/underscore/1.6.0/underscore-min.js',
-			'vendors/is.js/is.min.js',
 			'vendors/jquery/jquery-1.11.2.min.js',
 			'vendors/jquery-ui/js/jquery-ui-1.10.3.custom.min.js',
-//			'vendors/jquery-ui.touch-punch/jquery.ui.touch-punch.min.js',
 			'vendors/jquery-cookie/jquery.cookie-1.4.0.min.js',
 			'vendors/jquery-finger/jquery.finger.min.js',
 			'vendors/jquery-mousewheel/jquery.mousewheel-3.1.4.min.js',
@@ -163,7 +188,6 @@ cfg.paths.js = {
 			'vendors/routes/hasher.min.js',
 			'vendors/routes/crossroads.min.js',
 			'vendors/knockout/knockout-3.3.0.js',
-//			'vendors/knockout-punches/knockout.punches.min.js',
 			'vendors/knockout-projections/knockout-projections-1.0.0.min.js',
 			'vendors/knockout-sortable/knockout-sortable.min.js',
 			'vendors/ssm/ssm.min.js',
@@ -176,6 +200,7 @@ cfg.paths.js = {
 //			'vendors/jsencrypt/jsencrypt.min.js',
 			'vendors/keymaster/keymaster.min.js',
 			'vendors/ifvisible/ifvisible.min.js',
+//			'vendors/svg4everybody/svg4everybody.js',
 			'vendors/bootstrap/js/bootstrap.min.js'
 		]
 	},
@@ -190,14 +215,17 @@ cfg.paths.js = {
 // CSS
 gulp.task('less:main', function() {
 	var less = require('gulp-less');
+
 	return gulp.src(cfg.paths.less.main.src)
+		.pipe(gulpif(cfg.watch, plumber({errorHandler: notify.onError("Error: <%= error.message %>")})))
 		.pipe(less({
 			'paths': cfg.paths.less.main.options.paths
 		}))
 		.pipe(rename(cfg.paths.less.main.name))
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticCSS))
-		.on('error', gutil.log);
+		.on('error', gutil.log)
+	;
 });
 
 gulp.task('css:main-begin', ['less:main'], function() {
@@ -209,7 +237,6 @@ gulp.task('css:main-begin', ['less:main'], function() {
 	;
 
 	return gulp.src(cfg.paths.css.main.src)
-		.pipe(plumber())
 		.pipe(concat(cfg.paths.css.main.name))
 		.pipe(autoprefixer('last 3 versions', '> 1%', 'ie 9', 'Firefox ESR', 'Opera 12.1'))
 //		.pipe(csscomb())
@@ -217,9 +244,20 @@ gulp.task('css:main-begin', ['less:main'], function() {
 //		.pipe(csslint.reporter())
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticCSS))
+		.pipe(livereload())
 	;
 });
 
+gulp.task('package:community-on', function() {
+	cfg.community = true;
+	return true;
+});
+
+gulp.task('package:community-off', function() {
+	cfg.community = false;
+	return true;
+});
+
 gulp.task('css:clear-less', ['css:main-begin'], function() {
 
 	return gulp.src(cfg.paths.staticCSS + cfg.paths.less.main.name, {read: false})
@@ -231,7 +269,6 @@ gulp.task('css:main', ['css:clear-less']);
 gulp.task('css:main:min', ['css:main'], function() {
 	var minifyCss = require('gulp-minify-css');
 	return gulp.src(cfg.paths.staticCSS + cfg.paths.css.main.name)
-		.pipe(plumber())
 		.pipe(minifyCss({
 			'keepSpecialComments': 0
 		}))
@@ -266,6 +303,13 @@ gulp.task('js:openpgp', function() {
 		.pipe(gulp.dest(cfg.paths.staticMinJS));
 });
 
+gulp.task('js:openpgpworker', function() {
+	return gulp.src(cfg.paths.js.openpgpworker.src)
+		.pipe(rename(cfg.paths.js.openpgpworker.name))
+		.pipe(eol('\n', true))
+		.pipe(gulp.dest(cfg.paths.staticMinJS));
+});
+
 gulp.task('js:libs', function() {
 	return gulp.src(cfg.paths.js.libs.src)
 		.pipe(concat(cfg.paths.js.libs.name, {separator: '\n\n'}))
@@ -289,7 +333,8 @@ gulp.task('js:webpack:clear', function() {
 		.pipe(require('gulp-rimraf')());
 });
 
-gulp.task('js:webpack', ['js:webpack:clear'], function(callback) {
+gulp.task('js:webpack', [/*'js:webpack:clear'*/], function(callback) {
+
 	var
 		webpack = require('webpack'),
 		webpackCfg = require('./webpack.config.js')
@@ -300,18 +345,66 @@ gulp.task('js:webpack', ['js:webpack:clear'], function(callback) {
 		webpackCfg.output.publicPath = cfg.paths.staticJS;
 	}
 
+	if (webpackCfg && webpackCfg.plugins)
+	{
+		webpackCfg.plugins.push(new webpack.DefinePlugin({
+            'RL_COMMUNITY': !!cfg.community
+        }));
+	}
+
 	webpack(webpackCfg, function(err, stats) {
-        if (err) {
-			throw new gutil.PluginError('webpack', err);
+
+		var
+			fN = function (err) {
+				if (err)
+				{
+					gutil.log('[webpack]', '---');
+					gutil.log('[webpack]', err.error ? err.error.toString() : '');
+					gutil.log('[webpack]', err.message || '');
+					gutil.log('[webpack]', '---');
+
+					notifier.notify({
+						'sound': true,
+						'title': 'webpack',
+						'message': err.error ? err.error.toString() : err.message
+					});
+				}
+			}
+		;
+
+        if (err)
+		{
+			if (cfg.watch)
+			{
+				fN(err);
+			}
+			else
+			{
+				throw new gutil.PluginError('webpack', err);
+			}
 		}
-		gutil.log('[webpack]', stats.toString({}));
+		else if (stats && stats.compilation && stats.compilation.errors &&
+			stats.compilation.errors[0])
+		{
+			if (cfg.watch)
+			{
+				_.each(stats.compilation.errors, function (err) {
+					fN(err);
+				});
+			}
+			else
+			{
+				throw new gutil.PluginError('webpack', stats.compilation.errors[0]);
+			}
+		}
+
         callback();
     });
 });
 
 gulp.task('js:app', ['js:webpack'], function() {
 	return gulp.src(cfg.paths.staticJS + cfg.paths.js.app.name)
-		.pipe(header('/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */\n'))
+		.pipe(header(getHead() + '\n'))
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticJS))
 		.on('error', gutil.log);
@@ -319,7 +412,7 @@ gulp.task('js:app', ['js:webpack'], function() {
 
 gulp.task('js:admin', ['js:webpack'], function() {
 	return gulp.src(cfg.paths.staticJS + cfg.paths.js.admin.name)
-		.pipe(header('/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */\n'))
+		.pipe(header(getHead() + '\n'))
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticJS))
 		.on('error', gutil.log);
@@ -327,7 +420,7 @@ gulp.task('js:admin', ['js:webpack'], function() {
 
 gulp.task('js:chunks', ['js:webpack'], function() {
 	return gulp.src(cfg.paths.staticJS + '*.subapp.js')
-		.pipe(header('/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */\n'))
+		.pipe(header(getHead() + '\n'))
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticJS))
 		.on('error', gutil.log);
@@ -338,7 +431,7 @@ gulp.task('js:min', ['js:app', 'js:admin', 'js:chunks'], function() {
 	return gulp.src(cfg.paths.staticJS + '*.js')
 		.pipe(replace(/"rainloop\/v\/([^\/]+)\/static\/js\/"/g, '"rainloop/v/$1/static/js/min/"'))
 		.pipe(uglify(cfg.uglify))
-		.pipe(header('/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */\n'))
+		.pipe(header(getHead() + '\n'))
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticMinJS))
 		.on('error', gutil.log);
@@ -402,12 +495,21 @@ gulp.task('fontastic-fonts:clear', function() {
 	return cleanDir('rainloop/v/' + cfg.devVersion + '/static/css/fonts/rainloop.*');
 });
 
+gulp.task('fontastic-svg:clear', function() {
+	return cleanDir('rainloop/v/' + cfg.devVersion + '/static/css/svg/*.svg');
+});
+
 gulp.task('fontastic-fonts:copy', ['fontastic-fonts:clear'], function() {
 	return gulp.src('vendors/fontastic/fonts/rainloop.*')
 		.pipe(gulp.dest('rainloop/v/' + cfg.devVersion + '/static/css/fonts'));
 });
 
-gulp.task('fontastic', ['fontastic-fonts:copy']);
+gulp.task('fontastic-svg:copy', ['fontastic-svg:clear'], function() {
+	return gulp.src('vendors/fontastic/svg/*.svg')
+		.pipe(gulp.dest('rainloop/v/' + cfg.devVersion + '/static/css/svg'));
+});
+
+gulp.task('fontastic', ['fontastic-fonts:copy', 'fontastic-svg:copy']);
 
 gulp.task('ckeditor:clear', function() {
 	return cleanDir('rainloop/v/' + cfg.devVersion + '/static/ckeditor');
@@ -426,7 +528,6 @@ gulp.task('ckeditor:copy-plugins', ['ckeditor:copy'], function() {
 gulp.task('ckeditor', ['ckeditor:copy-plugins'], function () {
 	return gulp.src('rainloop/v/' + cfg.devVersion + '/static/ckeditor/*.js')
 		.pipe(stripbom())
-//		.pipe(replace("\u200B", "\\u200B"))
 		.pipe(replace('console.log("Detecting changes using MutationObservers")', 'true'))
 		.pipe(header("\uFEFF")) // BOM
 		.pipe(gulp.dest('rainloop/v/' + cfg.devVersion + '/static/ckeditor'));
@@ -463,10 +564,15 @@ gulp.task('rainloop:setup', ['rainloop:copy'], function() {
 
 	fs.writeFileSync(dist + 'rainloop/v/' + versionFull + '/index.php.root', fs.readFileSync(dist + 'index.php'));
 
+	if (cfg.community)
+	{
+		require('rimraf').sync(dist + 'rainloop/v/' + versionFull + '/app/libraries/RainLoop/Prem/');
+	}
+
 	cfg.destPath = cfg.releasesPath + '/webmail/' + versionFull + '/';
 	cfg.cleanPath = dist;
 	cfg.zipSrcPath = dist;
-	cfg.zipFile = 'rainloop-' + versionFull + '.zip';
+	cfg.zipFile = 'rainloop-' + (cfg.community ? 'community-' : '') + versionFull + '.zip';
 	cfg.md5File = cfg.zipFile;
 
 	cfg.rainloopBuilded = true;
@@ -530,7 +636,10 @@ gulp.task('rainloop:owncloud:setup', ['rainloop:owncloud:copy',
 	;
 
 	fs.writeFileSync(dist + 'rainloop/appinfo/info.xml',
-		fs.readFileSync(dist + 'rainloop/appinfo/info.xml', 'utf8').replace('0.0', '' + versionFull + ''));
+		fs.readFileSync(dist + 'rainloop/appinfo/info.xml', 'utf8')
+			.replace('0.0', '' + versionFull + '')
+			.replace('', '' + (cfg.community ? 'AGPLv3' : 'RainLoop Software License') + '')
+		);
 
 	fs.writeFileSync(dist + 'rainloop/appinfo/version', versionFull);
 	fs.writeFileSync(dist + 'rainloop/VERSION', versionFull);
@@ -538,7 +647,7 @@ gulp.task('rainloop:owncloud:setup', ['rainloop:owncloud:copy',
 	cfg.destPath = cfg.releasesPath + '/owncloud/' + versionFull + '/';
 	cfg.cleanPath = dist;
 	cfg.zipSrcPath = dist;
-	cfg.zipFile = 'rainloop-owncloud-app-' + versionFull + '.zip';
+	cfg.zipFile = 'rainloop-owncloud-app-' + (cfg.community ? '' : 'standard-') + versionFull + '.zip';
 	cfg.md5File = cfg.zipFile;
 
 });
@@ -558,30 +667,56 @@ gulp.task('rainloop:owncloud:clean', ['rainloop:owncloud:copy', 'rainloop:ownclo
 });
 
 // MAIN
-gulp.task('default', ['js:libs', 'js:boot', 'js:openpgp', 'js:min', 'css:main:min', 'ckeditor', 'fontastic']);
-gulp.task('fast', ['js:app', 'js:admin', 'js:chunks', 'css:main']);
+gulp.task('default', ['js:libs', 'js:boot', 'js:openpgp', 'js:openpgpworker', 'js:min', 'css:main:min', 'ckeditor', 'fontastic']);
+gulp.task('fast-', ['js:app', 'js:admin', 'js:chunks', 'css:main']);
+
+gulp.task('fast', ['package:community-on', 'fast-']);
+gulp.task('fast+', ['package:community-off', 'fast-']);
 
 gulp.task('rainloop:start', ['js:lint', 'rainloop:copy', 'rainloop:setup']);
-gulp.task('rainloop', ['rainloop:start', 'rainloop:zip', 'rainloop:md5', 'rainloop:clean']);
 
-gulp.task('owncloud', ['rainloop:owncloud:copy',
+gulp.task('rainloop-', ['rainloop:start', 'rainloop:zip', 'rainloop:md5', 'rainloop:clean']);
+
+gulp.task('rainloop', ['package:community-on', 'rainloop-']);
+gulp.task('rainloop+', ['package:community-off', 'rainloop-']);
+
+gulp.task('owncloud-', ['rainloop:owncloud:copy',
 	'rainloop:owncloud:copy-rainloop', 'rainloop:owncloud:copy-rainloop:clean',
 	'rainloop:owncloud:setup', 'rainloop:owncloud:zip', 'rainloop:owncloud:md5', 'rainloop:owncloud:clean']);
 
+gulp.task('owncloud', ['package:community-on', 'owncloud-']);
+gulp.task('owncloud+', ['package:community-off', 'owncloud-']);
+
 //WATCH
 gulp.task('watch', ['fast'], function() {
-	gulp.watch(cfg.paths.globjs, {interval: 500}, ['js:app', 'js:admin']);
-	gulp.watch(cfg.paths.less.main.watch, {interval: 500}, ['css:main']);
+	cfg.watch = true;
+	livereload.listen();
+	gulp.watch(cfg.paths.globjs, {interval: 1000}, ['js:app', 'js:admin']);
+	gulp.watch(cfg.paths.less.main.watch, {interval: 1000}, ['css:main']);
+});
+
+gulp.task('watch+', ['fast+'], function() {
+	cfg.watch = true;
+	livereload.listen();
+	gulp.watch(cfg.paths.globjs, {interval: 1000}, ['js:app', 'js:admin']);
+	gulp.watch(cfg.paths.less.main.watch, {interval: 1000}, ['css:main']);
 });
 
 // ALIASES
 gulp.task('build', ['rainloop']);
+gulp.task('build+', ['rainloop+']);
 gulp.task('js:hint', ['js:lint']);
 
-gulp.task('own', ['owncloud']);
-gulp.task('rl', ['rainloop']);
 gulp.task('w', ['watch']);
+gulp.task('w+', ['watch+']);
 gulp.task('f', ['fast']);
-gulp.task('o', ['owncloud']);
+gulp.task('f+', ['fast+']);
+
 gulp.task('b', ['build']);
-gulp.task('h', ['js:lint']);
\ No newline at end of file
+gulp.task('b+', ['build+']);
+
+gulp.task('o', ['owncloud']);
+gulp.task('o+', ['owncloud+']);
+
+gulp.task('h', ['js:lint']);
+gulp.task('l', ['js:lint']);
\ No newline at end of file
diff --git a/package.json b/package.json
index 66ced8835..918f2d74e 100644
--- a/package.json
+++ b/package.json
@@ -1,75 +1,79 @@
 {
-	"name": "RainLoop",
-	"title": "RainLoop Webmail",
-	"version": "1.8.3",
-	"release": "302",
-	"description": "Simple, modern & fast web-based email client",
-	"homepage": "http://rainloop.net",
-	"main": "gulpfile.js",
-	"author": {
-		"name": "RainLoop Team",
-		"email": "support@rainloop.net",
-		"web": "http://rainloop.net"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git://github.com/RainLoop/rainloop-webmail.git"
-	},
-	"licenses": [
-		{
-			"type": "CC BY-NC-SA 3.0",
-			"ulr": "http://creativecommons.org/licenses/by-nc-sa/3.0/"
-		}
-	],
-	"bugs": {
-		"url": "https://github.com/RainLoop/rainloop-webmail/issues"
-	},
-	"keywords": [
-		"webmail",
-		"php",
-		"simple",
-		"modern",
-		"mail",
-		"web-based",
-		"email",
-		"client",
-		"plugins"
-	],
-	"readmeFilename": "README.md",
-	"ownCloudPackageVersion": "3.3",
-	"engines": {
-		"node": ">= 0.10.0"
-	},
-	"devDependencies": {
-
-		"node-fs": "*",
-		"jshint-summary": "*",
-
-		"webpack": "*",
-
-		"gulp": "*",
-		"gulp-util": "*",
-		"gulp-uglify": "*",
-		"gulp-rimraf": "*",
-		"gulp-jshint": "*",
-		"gulp-less": "1.3.6",
-		"gulp-zip": "*",
-		"gulp-rename": "*",
-		"gulp-replace": "*",
-		"gulp-header": "*",
-		"gulp-eol": "*",
-		"gulp-stripbom": "*",
-		"gulp-minify-css": "*",
-		"gulp-autoprefixer": "*",
-		"gulp-csscomb": "*",
-		"gulp-closure-compiler": "*",
-		"gulp-csslint": "*",
-		"gulp-beautify": "*",
-		"gulp-plumber": "*",
-		"gulp-concat-util": "*"
-	},
-	"scripts": {
-		"gulp": "gulp",
-		"w": "gulp w"
-	}
+  "name": "RainLoop",
+  "title": "RainLoop Webmail",
+  "version": "1.9.2",
+  "release": "343",
+  "description": "Simple, modern & fast web-based email client",
+  "homepage": "http://rainloop.net",
+  "main": "gulpfile.js",
+  "author": {
+    "name": "RainLoop Team",
+    "email": "support@rainloop.net",
+    "web": "http://rainloop.net"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/RainLoop/rainloop-webmail.git"
+  },
+  "licenses": [
+    {
+      "type": "AGPL 3.0",
+      "ulr": "http://www.gnu.org/licenses/agpl-3.0.html"
+    },
+    {
+      "type": "RainLoop Software License",
+      "ulr": "http://www.rainloop.net/licensing/"
+    }
+  ],
+  "bugs": {
+    "url": "https://github.com/RainLoop/rainloop-webmail/issues"
+  },
+  "keywords": [
+    "webmail",
+    "php",
+    "simple",
+    "modern",
+    "mail",
+    "web-based",
+    "email",
+    "client",
+    "plugins"
+  ],
+  "readmeFilename": "README.md",
+  "ownCloudPackageVersion": "4.4",
+  "engines": {
+    "node": ">= 0.10.0"
+  },
+  "devDependencies": {
+    "node-fs": "*",
+    "rimraf": "*",
+    "jshint-summary": "*",
+    "webpack": "*",
+    "gulp": "*",
+    "gulp-util": "*",
+    "gulp-uglify": "*",
+    "gulp-rimraf": "*",
+    "gulp-jshint": "*",
+    "gulp-less": "1.3.6",
+    "gulp-zip": "*",
+    "gulp-rename": "*",
+    "gulp-replace": "*",
+    "gulp-header": "*",
+    "gulp-eol": "*",
+    "gulp-stripbom": "*",
+    "gulp-minify-css": "*",
+    "gulp-autoprefixer": "*",
+    "gulp-csscomb": "*",
+    "gulp-closure-compiler": "*",
+    "gulp-csslint": "*",
+    "gulp-beautify": "*",
+    "gulp-plumber": "*",
+    "gulp-concat-util": "*",
+    "gulp-notify": "~2.2.0",
+    "gulp-through": "~0.3.0",
+    "lodash": "~3.9.3",
+    "gulp-if": "~1.2.5",
+    "node-notifier": "~4.2.3",
+    "gulp-livereload": "~3.8.0"
+  }
 }
diff --git a/vendors/is.js/LICENSE b/plugins/virtualmin-change-password/LICENSE
similarity index 96%
rename from vendors/is.js/LICENSE
rename to plugins/virtualmin-change-password/LICENSE
index 077f5b9d3..c364cecf0 100644
--- a/vendors/is.js/LICENSE
+++ b/plugins/virtualmin-change-password/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Aras Atasaygin
+Copyright (c) 2015 icedman21
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/plugins/virtualmin-change-password/README b/plugins/virtualmin-change-password/README
new file mode 100644
index 000000000..58f2e0378
--- /dev/null
+++ b/plugins/virtualmin-change-password/README
@@ -0,0 +1 @@
+This plugin utilizes Virtualmin's remote API to change user passwords. The plugin requires the Admin user name and password to succesfully execute the password change. The host and port where Virtualmin listens on is also needed. See https://www.virtualmin.com/documentation/developer/http for more information.
\ No newline at end of file
diff --git a/plugins/virtualmin-change-password/VERSION b/plugins/virtualmin-change-password/VERSION
new file mode 100644
index 000000000..9f8e9b69a
--- /dev/null
+++ b/plugins/virtualmin-change-password/VERSION
@@ -0,0 +1 @@
+1.0
\ No newline at end of file
diff --git a/plugins/virtualmin-change-password/VirtualminChangePasswordDriver.php b/plugins/virtualmin-change-password/VirtualminChangePasswordDriver.php
new file mode 100644
index 000000000..c4fbd72d6
--- /dev/null
+++ b/plugins/virtualmin-change-password/VirtualminChangePasswordDriver.php
@@ -0,0 +1,210 @@
+sHost = $sHost;
+		$this->sAdminUser = $sAdminUser;
+		$this->sAdminPassword = $sAdminPassword;
+
+		return $this;
+	}
+
+	/**
+	 * @param string $sAllowedEmails
+	 *
+	 * @return \VirtualminChangePasswordDriver
+	 */
+	public function SetAllowedEmails($sAllowedEmails)
+	{
+		$this->sAllowedEmails = $sAllowedEmails;
+
+		return $this;
+	}
+
+	/**
+	 * @param \MailSo\Log\Logger $oLogger
+	 *
+	 * @return \VirtualminChangePasswordDriver
+	 */
+	public function SetLogger($oLogger)
+	{
+		if ($oLogger instanceof \MailSo\Log\Logger)
+		{
+			$this->oLogger = $oLogger;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param string $sDesc
+	 * @param int $iType = \MailSo\Log\Enumerations\Type::INFO
+	 *
+	 * @return \VirtualminChangePasswordDriver
+	 */
+	public function WriteLog($sDesc, $iType = \MailSo\Log\Enumerations\Type::INFO)
+	{
+		if ($this->oLogger)
+		{
+			$this->oLogger->Write($sDesc, $iType);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param \RainLoop\Model\Account $oAccount
+	 *
+	 * @return bool
+	 */
+	public function PasswordChangePossibility($oAccount)
+	{
+		return $oAccount && $oAccount->Email() &&
+			\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $this->sAllowedEmails);
+	}
+
+	/**
+	 * @param \RainLoop\Model\Account $oAccount
+	 * @param string $sPrevPassword
+	 * @param string $sNewPassword
+	 *
+	 * @return bool
+	 */
+	public function ChangePassword(\RainLoop\Account $oAccount, $sPrevPassword, $sNewPassword)
+	{
+		$this->WriteLog('Virtualmin: Try to change password for '.$oAccount->Email());
+
+		$bResult = false;
+		if (!empty($this->sHost) && !empty($this->sAdminUser) && !empty($this->sAdminPassword) && $oAccount)
+		{
+			$this->WriteLog('Virtualmin:[Check] Required Fields Present');
+
+			$sEmail = \trim(\strtolower($oAccount->Email()));
+			$sEmailUser = \MailSo\Base\Utils::GetAccountNameFromEmail($sEmail);
+			$sEmailDomain = \MailSo\Base\Utils::GetDomainFromEmail($sEmail);
+
+			$sHost = \rtrim(\trim($this->sHost), '/');
+			$sUrl = $sHost.'/virtual-server/remote.cgi';
+
+			$sAdminUser = $this->sAdminUser;
+			$sAdminPassword = $this->sAdminPassword;
+
+			$iCode = 0;
+
+			$aPost = array(
+				'user'		=> $sEmailUser,
+				'pass'		=> $sNewPassword,
+				'domain'	=> $sEmailDomain,
+				'program'	=> 'modify-user'
+			);
+
+			$aOptions = array(
+				CURLOPT_URL => $sUrl,
+				CURLOPT_HEADER => false,
+				CURLOPT_FAILONERROR => true,
+				CURLOPT_SSL_VERIFYPEER => false,
+				CURLOPT_RETURNTRANSFER => true,
+				CURLOPT_POST => true,
+				CURLOPT_POSTFIELDS => \http_build_query($aPost, '', '&'),
+				CURLOPT_TIMEOUT => 20,
+				CURLOPT_SSL_VERIFYHOST => false,
+				CURLOPT_USERPWD => $sAdminUser.':'.$sAdminPassword
+			);
+
+			$oCurl = \curl_init();
+			\curl_setopt_array($oCurl, $aOptions);
+
+			$this->WriteLog('Virtualmin: Send post request: '.$sUrl);
+
+			$mResult = \curl_exec($oCurl);
+
+			$iCode = (int) \curl_getinfo($oCurl, CURLINFO_HTTP_CODE);
+			$sContentType = (string) \curl_getinfo($oCurl, CURLINFO_CONTENT_TYPE);
+
+			$this->WriteLog('Virtualmin: Post request result: (Status: '.$iCode.', ContentType: '.$sContentType.')');
+			if (false === $mResult || 200 !== $iCode)
+			{
+				$this->WriteLog('Virtualmin: Error: '.\curl_error($oCurl), \MailSo\Log\Enumerations\Type::WARNING);
+			}
+
+			if (\is_resource($oCurl))
+			{
+				\curl_close($oCurl);
+			}
+
+			if (false !== $mResult && 200 === $iCode)
+			{
+				$aRes = null;
+				@\parse_str($mResult, $aRes);
+				if (\is_array($aRes) && (!isset($aRes['error']) || (int) $aRes['error'] !== 1))
+				{
+					$iPos = \strpos($mResult, 'Exit status: ');
+
+					if ($iPos !== false)
+					{
+						$aStatus = \explode(' ', $mResult);
+						$sStatus = \trim(\array_pop($aStatus));
+
+						if ('0' === $sStatus)
+						{
+							$this->WriteLog('Virtualmin: Password Change Status: Success');
+							$bResult = true;
+						}
+						else
+						{
+							$this->WriteLog('Virtualmin[Error]: Response: '.$mResult);
+						}
+					}
+				}
+				else
+				{
+					$this->WriteLog('Virtualmin[Error]: Response: '.$mResult);
+				}
+			}
+			else
+			{
+				$this->WriteLog('Virtualmin[Error]: Empty Response: Code: '.$iCode);
+			}
+		}
+
+		return $bResult;
+	}
+}
diff --git a/plugins/virtualmin-change-password/index.php b/plugins/virtualmin-change-password/index.php
new file mode 100644
index 000000000..b4c0a86f6
--- /dev/null
+++ b/plugins/virtualmin-change-password/index.php
@@ -0,0 +1,54 @@
+addHook('main.fabrica', 'MainFabrica');
+	}
+
+	/**
+	 * @param string $sName
+	 * @param mixed $oProvider
+	 */
+	public function MainFabrica($sName, &$oProvider)
+	{
+		switch ($sName)
+		{
+			case 'change-password':
+
+				include_once __DIR__.'/VirtualminChangePasswordDriver.php';
+
+				$sHost = \trim($this->Config()->Get('plugin', 'host', ''));
+				$sAdminUser = (string) $this->Config()->Get('plugin', 'admin_user', '');
+				$sAdminPassword = (string) $this->Config()->Get('plugin', 'admin_password', '');
+
+				$oProvider = new \VirtualminChangePasswordDriver();
+				$oProvider->SetLogger($this->Manager()->Actions()->Logger());
+				$oProvider->SetConfig($sHost, $sAdminUser, $sAdminPassword);
+				$oProvider->SetAllowedEmails(\strtolower(\trim($this->Config()->Get('plugin', 'allowed_emails', ''))));
+
+				break;
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function configMapping()
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('host')->SetLabel('Virtualmin Host')
+					->SetDefaultValue('https://localhost:10000')
+					->SetDescription('Virtualmin host URL. Example: https://example.com:10000'),
+			\RainLoop\Plugins\Property::NewInstance('admin_user')->SetLabel('Admin User')
+					->SetDefaultValue(''),
+			\RainLoop\Plugins\Property::NewInstance('admin_password')->SetLabel('Admin Password')
+					->SetDefaultValue(''),
+			\RainLoop\Plugins\Property::NewInstance('allowed_emails')->SetLabel('Allowed emails')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Allowed emails, space as delimiter, wildcard supported. Example: user1@domain1.net user2@domain1.net *@domain2.net')
+				->SetDefaultValue('*')
+		);
+	}
+}
diff --git a/plugins/vpopmail-change-password/ChangePasswordVpopmailDriver.php b/plugins/vpopmail-change-password/ChangePasswordVpopmailDriver.php
new file mode 100755
index 000000000..7013d226e
--- /dev/null
+++ b/plugins/vpopmail-change-password/ChangePasswordVpopmailDriver.php
@@ -0,0 +1,228 @@
+mHost = $mHost;
+		return $this;
+	}
+
+	/**
+	 * @param string $mUser
+	 *
+	 * @return \ChangePasswordVpopmailDriver
+	 */
+	public function SetmUser($mUser)
+	{
+		$this->mUser = $mUser;
+		return $this;
+	}
+
+	/**
+	 * @param string $mPass
+	 *
+	 * @return \ChangePasswordVpopmailDriver
+	 */
+	public function SetmPass($mPass)
+	{
+		$this->mPass = $mPass;
+		return $this;
+	}
+
+	/**
+	 * @param string $mDatabase
+	 *
+	 * @return \ChangePasswordVpopmailDriver
+	 */
+	public function SetmDatabase($mDatabase)
+	{
+		$this->mDatabase = $mDatabase;
+		return $this;
+	}
+
+	/**
+	 * @param string $mTable
+	 *
+	 * @return \ChangePasswordVpopmailDriver
+	 */
+	public function SetmTable($mTable)
+	{
+		$this->mTable = $mTable;
+		return $this;
+	}
+
+	/**
+	 * @param string $mColumn
+	 *
+	 * @return \ChangePasswordVpopmailDriver
+	 */
+	public function SetmColumn($mColumn)
+	{
+		$this->mColumn = $mColumn;
+		return $this;
+	}
+
+	/**
+	 * @param \MailSo\Log\Logger $oLogger
+	 *
+	 * @return \ChangePasswordVpopmailDriver
+	 */
+	public function SetLogger($oLogger)
+	{
+		if ($oLogger instanceof \MailSo\Log\Logger)
+		{
+			$this->oLogger = $oLogger;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param array $aDomains
+	 *
+	 * @return bool
+	 */
+	public function SetAllowedDomains($aDomains)
+	{
+		if (\is_array($aDomains) && 0 < \count($aDomains))
+		{
+			$this->aDomains = $aDomains;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param \RainLoop\Account $oAccount
+	 *
+	 * @return bool
+	 */
+	public function PasswordChangePossibility($oAccount)
+	{
+		return 0 === \count($this->aDomains) || ($oAccount && \in_array(\strtolower(
+			\MailSo\Base\Utils::GetDomainFromEmail($oAccount->Email)), $this->aDomains));
+	}
+
+	/**
+	 * @param \RainLoop\Account $oAccount
+	 * @param string $sPrevPassword
+	 * @param string $sNewPassword
+	 *
+	 * @return bool
+	 */
+	public function ChangePassword(\RainLoop\Account $oAccount, $sPrevPassword, $sNewPassword)
+	{
+		if ($this->oLogger)
+		{
+			$this->oLogger->Write('Try to change password for '.$oAccount->Email());
+		}
+
+		if (empty($this->mHost) || empty($this->mDatabase) || empty($this->mColumn) || empty($this->mTable))
+		{
+			return false;
+		}
+
+		$bResult = false;
+
+		$sDsn = 'mysql:host='.$this->mHost.';dbname='.$this->mDatabase.';charset=utf8';
+		$aOptions = array(
+			PDO::ATTR_EMULATE_PREPARES  => false,
+			PDO::ATTR_PERSISTENT        => true,
+			PDO::ATTR_ERRMODE           => PDO::ERRMODE_EXCEPTION
+		);
+
+		$sLoginPart = \MailSo\Base\Utils::GetAccountNameFromEmail($oAccount->Email());
+		$sDomainPart = \MailSo\Base\Utils::GetDomainFromEmail($oAccount->Email());
+
+		try
+		{
+			$oConn = new PDO($sDsn, $this->mUser, $this->mPass, $aOptions);
+
+			$oSelect = $oConn->prepare('SELECT '.$this->mColumn.' FROM '.$this->mTable.' WHERE pw_name=? AND pw_domain=? LIMIT 1');
+			$oSelect->execute(array($sLoginPart, $sDomainPart));
+
+			$aColCrypt = $oSelect->fetchAll(PDO::FETCH_ASSOC);
+
+			$sCryptPass = isset($aColCrypt[0][$this->mColumn]) ? $aColCrypt[0][$this->mColumn] : '';
+			if (0 < \strlen($sCryptPass) && \crypt($sPrevPassword, $sCryptPass) === $sCryptPass)
+			{
+				$oUpdate = $oConn->prepare('UPDATE '.$this->mTable.' SET '.$this->mColumn.'=ENCRYPT(?,concat("$1$",right(md5(rand()), 8 ),"$")), pw_clear_passwd=\'\' WHERE pw_name=? AND pw_domain=?');
+				$oUpdate->execute(array(
+					$sNewPassword,
+					$sLoginPart,
+					$sDomainPart
+				));
+
+				$bResult = true;
+				if ($this->oLogger)
+				{
+					$this->oLogger->Write('Success! Password changed.');
+				}
+			}
+			else
+			{
+				$bResult = false;
+				if ($this->oLogger)
+				{
+					$this->oLogger->Write('Something went wrong. Either current password is incorrect, or new password does not match criteria.');
+				}
+			}
+		}
+		catch (\Exception $oException)
+		{
+			$bResult = false;
+			if ($this->oLogger)
+			{
+				$this->oLogger->WriteException($oException);
+			}
+		}
+
+		return $bResult;
+	}
+}
diff --git a/vendors/jquery-magnific-popup/LICENSE b/plugins/vpopmail-change-password/LICENSE
old mode 100644
new mode 100755
similarity index 94%
rename from vendors/jquery-magnific-popup/LICENSE
rename to plugins/vpopmail-change-password/LICENSE
index f6ea3a9d4..6739d4b4e
--- a/vendors/jquery-magnific-popup/LICENSE
+++ b/plugins/vpopmail-change-password/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Dmitry Semenov, http://dimsemenov.com
+Copyright (c) 2015 Almas at Dusal.net
 
 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
diff --git a/plugins/vpopmail-change-password/VERSION b/plugins/vpopmail-change-password/VERSION
new file mode 100755
index 000000000..9459d4ba2
--- /dev/null
+++ b/plugins/vpopmail-change-password/VERSION
@@ -0,0 +1 @@
+1.1
diff --git a/plugins/vpopmail-change-password/index.php b/plugins/vpopmail-change-password/index.php
new file mode 100755
index 000000000..8eb5fd5fe
--- /dev/null
+++ b/plugins/vpopmail-change-password/index.php
@@ -0,0 +1,71 @@
+addHook('main.fabrica', 'MainFabrica');
+	}
+
+	/**
+	 * @param string $sName
+	 * @param mixed $oProvider
+	 */
+	public function MainFabrica($sName, &$oProvider)
+	{
+		switch ($sName)
+		{
+			case 'change-password':
+
+				include_once __DIR__.'/ChangePasswordVpopmailDriver.php';
+
+				$oProvider = new ChangePasswordVpopmailDriver();
+
+				$sDomains = \strtolower(\trim(\preg_replace('/[\s;,]+/', ' ',
+					$this->Config()->Get('plugin', 'domains', ''))));
+
+				if (0 < \strlen($sDomains))
+				{
+					$aDomains = \explode(' ', $sDomains);
+					$oProvider->SetAllowedDomains($aDomains);
+				}
+
+				$oProvider
+						->SetLogger($this->Manager()->Actions()->Logger())
+						->SetmHost($this->Config()->Get('plugin', 'mHost', ''))
+						->SetmUser($this->Config()->Get('plugin', 'mUser', ''))
+						->SetmPass($this->Config()->Get('plugin', 'mPass', ''))
+						->SetmDatabase($this->Config()->Get('plugin', 'mDatabase', ''))
+						->SetmTable($this->Config()->Get('plugin', 'mTable', ''))
+						->SetmColumn($this->Config()->Get('plugin', 'mColumn', ''))
+				;
+
+				break;
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function configMapping()
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('domains')->SetLabel('Allowed Domains')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Allowed domains, space as delimiter')
+				->SetDefaultValue('gmail.com yahoo.com'),
+			\RainLoop\Plugins\Property::NewInstance('mHost')->SetLabel('MySQL Host')
+				->SetDefaultValue('localhost'),
+			\RainLoop\Plugins\Property::NewInstance('mUser')->SetLabel('MySQL User')
+				->SetDefaultValue('vpopmail'),
+			\RainLoop\Plugins\Property::NewInstance('mPass')->SetLabel('MySQL Password')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::PASSWORD),
+			\RainLoop\Plugins\Property::NewInstance('mDatabase')->SetLabel('MySQL Database')
+				->SetDefaultValue('vpopmail'),
+			\RainLoop\Plugins\Property::NewInstance('mTable')->SetLabel('MySQL Table')
+				->SetDefaultValue('vpopmail'),
+			\RainLoop\Plugins\Property::NewInstance('mColumn')->SetLabel('MySQL Column')
+				->SetDefaultValue('pw_passwd')
+		);
+	}
+}
diff --git a/rainloop/v/0.0.0/app/handle.php b/rainloop/v/0.0.0/app/handle.php
index ebb703d10..464a43e3d 100644
--- a/rainloop/v/0.0.0/app/handle.php
+++ b/rainloop/v/0.0.0/app/handle.php
@@ -22,7 +22,7 @@ if (!\defined('RAINLOOP_APP_LIBRARIES_PATH'))
 	function rainLoopSplAutoloadNamespaces()
 	{
 		return RAINLOOP_INCLUDE_AS_API_DEF ? array('RainLoop') :
-			array('RainLoop', 'Facebook', 'GuzzleHttp', 'Symfony', 'PHPThumb', 'Sabre');
+			array('RainLoop', 'Facebook', 'GuzzleHttp', 'PHPThumb', 'SabreForRainLoop');
 	}
 
 	/**
@@ -41,7 +41,7 @@ if (!\defined('RAINLOOP_APP_LIBRARIES_PATH'))
 		{
 			if (0 === \strpos($sClassName, $sNamespaceName.'\\'))
 			{
-				if ('Sabre' === $sNamespaceName && !RAINLOOP_MB_SUPPORTED && !defined('RL_MB_FIXED'))
+				if ('SabreForRainLoop' === $sNamespaceName && !RAINLOOP_MB_SUPPORTED && !defined('RL_MB_FIXED'))
 				{
 					\define('RL_MB_FIXED', true);
 					include_once RAINLOOP_APP_LIBRARIES_PATH.'RainLoop/Common/MbStringFix.php';
@@ -59,7 +59,7 @@ if (!\defined('RAINLOOP_APP_LIBRARIES_PATH'))
 
 if (\class_exists('RainLoop\Api'))
 {
-	if (!\class_exists('MailSo\Version'))
+	if (!\class_exists('MailSo\Version', false))
 	{
 		include APP_VERSION_ROOT_PATH.'app/libraries/MailSo/MailSo.php';
 	}
diff --git a/rainloop/v/0.0.0/app/i18n/langs.ini b/rainloop/v/0.0.0/app/i18n/langs.ini
index 9f19d3d74..88bea1b60 100644
--- a/rainloop/v/0.0.0/app/i18n/langs.ini
+++ b/rainloop/v/0.0.0/app/i18n/langs.ini
@@ -104,6 +104,9 @@ LANG_BS = "Bosanski"
 LANG_BS_BS = "Bosanski"
 LANG_BS_BA = "Bosanski"
 
+LANG_AR = "‏العربية‏"
+LANG_AR_AR = "‏العربية‏"
+
 [LANGS_NAMES_EN]
 LANG_EN = "English"
 LANG_EN_US = "English (US)"
@@ -210,3 +213,6 @@ LANG_SR_RS = "Serbian"
 LANG_BS = "Bosnian"
 LANG_BS_BS = "Bosnian"
 LANG_BS_BA = "Bosnian"
+
+LANG_AR = "Arabic"
+LANG_AR_AR = "Arabic"
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
index 5896a536b..5ab334e6e 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
@@ -49,7 +49,13 @@ class DateTimeHelper
 	 */
 	public static function ParseRFC2822DateString($sDateTime)
 	{
-		$sDateTime = \trim(\preg_replace('/ \([a-zA-Z0-9]+\)$/', '', \trim($sDateTime)));
+		$sDateTime = \trim($sDateTime);
+		if (empty($sDateTime))
+		{
+			return 0;
+		}
+
+		$sDateTime = \trim(\preg_replace('/ \([a-zA-Z0-9]+\)$/', '', $sDateTime));
 		$oDateTime = \DateTime::createFromFormat('D, d M Y H:i:s O', $sDateTime, \MailSo\Base\DateTimeHelper::GetUtcTimeZoneObject());
 		return $oDateTime ? $oDateTime->getTimestamp() : 0;
 	}
@@ -65,7 +71,12 @@ class DateTimeHelper
 	public static function ParseInternalDateString($sDateTime)
 	{
 		$sDateTime = \trim($sDateTime);
-		if (\preg_match('/^[a-z]{2,4}, /i', $sDateTime)) // RFC2822
+		if (empty($sDateTime))
+		{
+			return 0;
+		}
+
+		if (\preg_match('/^[a-z]{2,4}, /i', $sDateTime)) // RFC2822 ~ "Thu, 10 Jun 2010 08:58:33 -0700 (PDT)"
 		{
 			return \MailSo\Base\DateTimeHelper::ParseRFC2822DateString($sDateTime);
 		}
@@ -83,7 +94,30 @@ class DateTimeHelper
 	 */
 	public static function ParseDateStringType1($sDateTime)
 	{
-		$oDateTime = \DateTime::createFromFormat('Y-m-d H:i:s O', \trim($sDateTime), \MailSo\Base\DateTimeHelper::GetUtcTimeZoneObject());
+		$sDateTime = \trim($sDateTime);
+		if (empty($sDateTime))
+		{
+			return 0;
+		}
+
+		$oDateTime = \DateTime::createFromFormat('Y-m-d H:i:s O', $sDateTime, \MailSo\Base\DateTimeHelper::GetUtcTimeZoneObject());
 		return $oDateTime ? $oDateTime->getTimestamp() : 0;
 	}
+
+	/**
+	 * Parse date string formated as "2015-05-08T14:32:18.483-07:00"
+	 *
+	 * @param string $sDateTime
+	 *
+	 * @return int
+	 */
+	public static function TryToParseSpecEtagFormat($sDateTime)
+	{
+		$sDateTime = \trim(\preg_replace('/ \([a-zA-Z0-9]+\)$/', '', \trim($sDateTime)));
+		$sDateTime = \trim(\preg_replace('/(:[\d]{2})\.[\d]{3}/', '$1', \trim($sDateTime)));
+		$sDateTime = \trim(\preg_replace('/(-[\d]{2})T([\d]{2}:)/', '$1 $2', \trim($sDateTime)));
+		$sDateTime = \trim(\preg_replace('/([\-+][\d]{2}):([\d]{2})$/', ' $1$2', \trim($sDateTime)));
+
+		return \MailSo\Base\DateTimeHelper::ParseDateStringType1($sDateTime);
+	}
 }
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Enumerations/Charset.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Enumerations/Charset.php
index 8b09686e3..85132e6ea 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Enumerations/Charset.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Enumerations/Charset.php
@@ -34,4 +34,5 @@ class Charset
 	const ISO_8859_8 = 'iso-8859-8';
 	const ISO_8859_8_I = 'iso-8859-8-i';
 	const ISO_2022_JP = 'iso-2022-jp';
+	const CP858 = 'cp858';
 }
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
index 243019693..bb9a2e419 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
@@ -35,23 +35,32 @@ class HtmlUtils
 	 */
 	public static function GetDomFromText($sText, $sHtmlAttrs = '', $sBodyAttrs = '')
 	{
-		static $bOnce = true;
-		if ($bOnce)
+		$bState = true;
+		if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_use_internal_errors'))
 		{
-			$bOnce = false;
-			if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_use_internal_errors'))
-			{
-				@\libxml_use_internal_errors(true);
-			}
+			$bState = \libxml_use_internal_errors(true);
 		}
 
 		$oDom = new \DOMDocument('1.0', 'utf-8');
 		$oDom->encoding = 'UTF-8';
+		$oDom->strictErrorChecking = false;
 		$oDom->formatOutput = false;
 
 		@$oDom->loadHTML('<'.'?xml version="1.0" encoding="utf-8"?'.'>'.
 			''.$sText.'');
 
+		@$oDom->normalizeDocument();
+
+		if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_use_internal_errors'))
+		{
+			@\libxml_clear_errors();
+		}
+
+		if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_use_internal_errors'))
+		{
+			\libxml_use_internal_errors($bState);
+		}
+
 		return $oDom;
 	}
 
@@ -65,13 +74,13 @@ class HtmlUtils
 	public static function ClearBodyAndHtmlTag($sHtml, &$sHtmlAttrs = '', &$sBodyAttrs = '')
 	{
 		$aMatch = array();
-		if (preg_match('/]+)>/im', $sHtml, $aMatch) && !empty($aMatch[1]))
+		if (\preg_match('/]+)>/im', $sHtml, $aMatch) && !empty($aMatch[1]))
 		{
 			$sHtmlAttrs = $aMatch[1];
 		}
 
 		$aMatch = array();
-		if (preg_match('/]+)>/im', $sHtml, $aMatch) && !empty($aMatch[1]))
+		if (\preg_match('/]+)>/im', $sHtml, $aMatch) && !empty($aMatch[1]))
 		{
 			$sBodyAttrs = $aMatch[1];
 		}
@@ -81,22 +90,53 @@ class HtmlUtils
 		$sHtml = \preg_replace('/]*)>/im', '', $sHtml);
 		$sHtml = \preg_replace('/<\/html>/im', '', $sHtml);
 
+		$sHtmlAttrs = \preg_replace('/xmlns:[a-z]="[^"]*"/im', '', $sHtmlAttrs);
+		$sHtmlAttrs = \preg_replace('/xmlns="[^"]*"/im', '', $sHtmlAttrs);
+		$sBodyAttrs = \preg_replace('/xmlns:[a-z]="[^"]*"/im', '', $sBodyAttrs);
+
 		return $sHtml;
 	}
 
 	/**
 	 * @param string $sHtml
+	 * @param bool $bClearEmpty = true
 	 *
 	 * @return string
 	 */
-	public static function ClearTags($sHtml)
+	public static function FixSchemas($sHtml, $bClearEmpty = true)
+	{
+		if ($bClearEmpty)
+		{
+			$sHtml = \str_replace('', '', $sHtml);
+		}
+
+		$sHtml = \str_replace('', '', $sHtml);
+		$sHtml = \str_replace('', '', $sHtml);
+
+		return $sHtml;
+	}
+
+	/**
+	 * @param string $sHtml
+	 * @param bool $bClearStyleAndHead = true
+	 *
+	 * @return string
+	 */
+	public static function ClearTags($sHtml, $bClearStyleAndHead = true)
 	{
 		$aRemoveTags = array(
-			'head', 'link', 'base', 'meta', 'title', 'style', 'script', 'bgsound', 'keygen', 'source',
-			'object', 'embed', 'applet', 'mocha', 'iframe', 'frame', 'frameset', 'video', 'audio'
+			'link', 'base', 'meta', 'title', 'script', 'bgsound', 'keygen', 'source',
+			'object', 'embed', 'applet', 'mocha', 'iframe', 'frame', 'frameset', 'video', 'audio', 'area', 'map'
 		);
 
+		if ($bClearStyleAndHead)
+		{
+			$aRemoveTags[] = 'head';
+			$aRemoveTags[] = 'style';
+		}
+
 		$aToRemove = array(
+			'/]*><\/p>/i',
 			'/]*>/msi',
 			'/<\?xml [^>]*\?>/msi'
 		);
@@ -150,6 +190,227 @@ class HtmlUtils
 		return \preg_replace($aToReplace, 'оn\\1', $sHtml);
 	}
 
+//	public static function ClearStyleUrlValueParserHelper($oUrlValue, $oRule, $oRuleSet,
+//		$oElem = null,
+//		&$bHasExternals = false, &$aFoundCIDs = array(),
+//		$aContentLocationUrls = array(), &$aFoundedContentLocationUrls = array(),
+//		$bDoNotReplaceExternalUrl = false, $fAdditionalExternalFilter = null
+//	)
+//	{
+//		if ($oUrlValue instanceof \Sabberworm\CSS\Value\URL)
+//		{
+//			$oNewRule = new \Sabberworm\CSS\Rule\Rule('x-rl-orig-'.$oRule->getRule());
+//			$oNewRule->setValue((string) $oRule->getValue());
+//			$oNewRule->setIsImportant($oRule->getIsImportant());
+//
+//			$oRuleSet->addRule($oNewRule);
+//
+//			$oUrl = $oUrlValue->getURL();
+//			$sUrl = $oUrl ? $oUrl->getString() : '';
+//
+//			if ('cid:' === \strtolower(\substr($sUrl, 0, 4)))
+//			{
+//				$aFoundCIDs[] = \substr($sUrl, 4);
+//
+//				$oRule->setRule('x-rl-mod-'.$oRule->getRule());
+//
+//				if ($oElem)
+//				{
+//					$oElem->setAttribute('data-x-style-mod', '1');
+//				}
+//			}
+//			else
+//			{
+//				if (\preg_match('/http[s]?:\/\//i', $sUrl) || '//' === \substr($sUrl, 0, 2))
+//				{
+//					$oRule->setRule('x-rl-mod-'.$oRule->getRule());
+//
+//					if (\in_array($sUrl, $aContentLocationUrls))
+//					{
+//						$aFoundedContentLocationUrls[] = $sUrl;
+//					}
+//					else
+//					{
+//						$bHasExternals = true;
+//						if (!$bDoNotReplaceExternalUrl)
+//						{
+//							if ($fAdditionalExternalFilter)
+//							{
+//								$sAdditionalResult = \call_user_func($fAdditionalExternalFilter, $sUrl);
+//								if (0 < \strlen($sAdditionalResult) && $oUrl)
+//								{
+//									$oUrl->setString($sAdditionalResult);
+//								}
+//							}
+//						}
+//					}
+//
+//					if ($oElem)
+//					{
+//						$oElem->setAttribute('data-x-style-mod', '1');
+//					}
+//				}
+//				else if ('data:image/' !== \strtolower(\substr(\trim($sUrl), 0, 11)))
+//				{
+//					$oRuleSet->removeRule($oRule);
+//				}
+//			}
+//		}
+//		else if ($oRule instanceof \Sabberworm\CSS\Rule\Rule)
+//		{
+//			if ('x-rl-' !== \substr($oRule->getRule(), 0, 5))
+//			{
+//				$oValue = $oRule->getValue();
+//				if ($oValue instanceof \Sabberworm\CSS\Value\URL)
+//				{
+//					\MailSo\Base\HtmlUtils::ClearStyleUrlValueParserHelper($oValue, $oRule, $oRuleSet, $oElem,
+//						$bHasExternals, $aFoundCIDs,
+//						$aContentLocationUrls, $aFoundedContentLocationUrls,
+//						$bDoNotReplaceExternalUrl, $fAdditionalExternalFilter);
+//				}
+//				else if ($oValue instanceof \Sabberworm\CSS\Value\RuleValueList)
+//				{
+//					$aComps = $oValue->getListComponents();
+//					foreach ($aComps as $oValue)
+//					{
+//						if ($oValue instanceof \Sabberworm\CSS\Value\URL)
+//						{
+//							\MailSo\Base\HtmlUtils::ClearStyleUrlValueParserHelper($oValue, $oRule, $oRuleSet, $oElem,
+//								$bHasExternals, $aFoundCIDs,
+//								$aContentLocationUrls, $aFoundedContentLocationUrls,
+//								$bDoNotReplaceExternalUrl, $fAdditionalExternalFilter);
+//						}
+//					}
+//				}
+//			}
+//		}
+//	}
+//
+//	public static function ClearStyleSmart($sStyle, $oElement = null,
+//		&$bHasExternals = false, &$aFoundCIDs = array(),
+//		$aContentLocationUrls = array(), &$aFoundedContentLocationUrls = array(),
+//		$bDoNotReplaceExternalUrl = false, $fAdditionalExternalFilter = null,
+//		$sSelectorPrefix = '')
+//	{
+//		$mResult = false;
+//		$oCss = null;
+//
+//		if (!\class_exists('Sabberworm\CSS\Parser'))
+//		{
+//			return $mResult;
+//		}
+//
+//		$sStyle = \trim($sStyle);
+//		if (empty($sStyle))
+//		{
+//			return '';
+//		}
+//
+//		$sStyle = \trim(\preg_replace('/[\r\n\t\s]+/', ' ', $sStyle));
+//
+//		try
+//		{
+//			$oSettings = \Sabberworm\CSS\Settings::create();
+//			$oSettings->beStrict();
+//			$oSettings->withMultibyteSupport(false);
+//
+//			$oCssParser = new \Sabberworm\CSS\Parser($sStyle, $oSettings);
+//			$oCss = $oCssParser->parse();
+//		}
+//		catch (\Exception $oEception)
+//		{
+//			unset($oEception);
+//			$mResult = false;
+//		}
+//
+//		if ($oCss)
+//		{
+//			foreach ($oCss->getAllDeclarationBlocks() as $oBlock)
+//			{
+//				foreach($oBlock->getSelectors() as $oSelector)
+//				{
+//					$sS = ' '.\trim($oSelector->getSelector()).' ';
+//					$sS = \preg_replace('/ body([\.# ])/i', ' [data-x-div-type="body"]$1', $sS);
+//					$sS = \preg_replace('/ html([\.# ])/i', ' [data-x-div-type="html"]$1', $sS);
+//
+//					if (0 < \strlen($sSelectorPrefix))
+//					{
+//						$sS = \trim($sSelectorPrefix.' '.\trim($sS));
+//					}
+//
+//					$oSelector->setSelector(\trim($sS));
+//				}
+//			}
+//
+//			$aRulesToRemove = array(
+//				'pointer-events', 'content', 'behavior', 'cursor',
+//			);
+//
+//			foreach($oCss->getAllRuleSets() as $oRuleSet)
+//			{
+//				foreach ($aRulesToRemove as $sRuleToRemove)
+//				{
+//					$oRuleSet->removeRule($sRuleToRemove);
+//				}
+//
+//				// position: fixed -> position: fixed -> absolute
+//				$aRules = $oRuleSet->getRules('position');
+//				if (\is_array($aRules))
+//				{
+//					foreach ($aRules as $oRule)
+//					{
+//						$mValue = $oRule->getValue();
+//						if (\is_string($mValue) && 'fixed' === \trim(\strtolower($mValue)))
+//						{
+//							$oRule->setValue('absolute');
+//						}
+//					}
+//				}
+//			}
+//
+//			foreach($oCss->getAllDeclarationBlocks() as $oRuleSet)
+//			{
+//				if ($oRuleSet instanceof \Sabberworm\CSS\RuleSet\RuleSet)
+//				{
+//					if ($oRuleSet instanceof \Sabberworm\CSS\RuleSet\DeclarationBlock)
+//					{
+//						$oRuleSet->expandBackgroundShorthand();
+//						$oRuleSet->expandListStyleShorthand();
+//					}
+//
+//					$aRules = $oRuleSet->getRules();
+//					if (\is_array($aRules) && 0 < \count($aRules))
+//					{
+//						foreach ($aRules as $oRule)
+//						{
+//							if ($oRule instanceof \Sabberworm\CSS\Rule\Rule)
+//							{
+//								\MailSo\Base\HtmlUtils::ClearStyleUrlValueParserHelper(null, $oRule, $oRuleSet,
+//									$oElement,
+//									$bHasExternals, $aFoundCIDs,
+//									$aContentLocationUrls, $aFoundedContentLocationUrls,
+//									$bDoNotReplaceExternalUrl, $fAdditionalExternalFilter
+//								);
+//							}
+//						}
+//					}
+//				}
+//			}
+//
+//			try
+//			{
+//				$mResult = $oCss->render(\Sabberworm\CSS\OutputFormat::createCompact());
+//			}
+//			catch (\Exception $oEception)
+//			{
+//				unset($oEception);
+//				$mResult = false;
+//			}
+//		}
+//
+//		return $mResult;
+//	}
+
 	/**
 	 *
 	 * @param string $sStyle
@@ -208,7 +469,7 @@ class HtmlUtils
 			{
 				// skip
 			}
-			else if (\in_array($sName, array('background-image', 'background', 'list-style-image', 'content'))
+			else if (\in_array($sName, array('background-image', 'background', 'list-style', 'list-style-image', 'content'))
 				&& \preg_match('/url[\s]?\(([^)]+)\)/im', $sValue, $aMatch) && !empty($aMatch[1]))
 			{
 				$sFullUrl = \trim($aMatch[0], '"\' ');
@@ -409,14 +670,18 @@ class HtmlUtils
 	 * @param bool $bDoNotReplaceExternalUrl = false
 	 * @param bool $bFindLinksInHtml = false
 	 * @param callback|null $fAdditionalExternalFilter = null
+	 * @param callback|null $fAdditionalDomReader = null
 	 *
 	 * @return string
 	 */
 	public static function ClearHtml($sHtml, &$bHasExternals = false, &$aFoundCIDs = array(),
 		$aContentLocationUrls = array(), &$aFoundedContentLocationUrls = array(),
-		$bDoNotReplaceExternalUrl = false, $bFindLinksInHtml = false, $fAdditionalExternalFilter = null)
+		$bDoNotReplaceExternalUrl = false, $bFindLinksInHtml = false,
+		$fAdditionalExternalFilter = null, $fAdditionalDomReader = false,
+		$bTryToDetectHiddenImages = false)
 	{
 		$sResult = '';
+
 		$sHtml = null === $sHtml ? '' : (string) $sHtml;
 		$sHtml = \trim($sHtml);
 		if (0 === \strlen($sHtml))
@@ -429,9 +694,16 @@ class HtmlUtils
 			$fAdditionalExternalFilter = null;
 		}
 
+		if ($fAdditionalDomReader && !\is_callable($fAdditionalDomReader))
+		{
+			$fAdditionalDomReader = null;
+		}
+
 		$bHasExternals = false;
 
-		$sHtml = \MailSo\Base\HtmlUtils::ClearTags($sHtml);
+		$sHtml = \MailSo\Base\HtmlUtils::FixSchemas($sHtml);
+
+		$sHtml = \MailSo\Base\HtmlUtils::ClearTags($sHtml, false);
 		$sHtml = \MailSo\Base\HtmlUtils::ClearOn($sHtml);
 
 		$sHtmlAttrs = $sBodyAttrs = '';
@@ -443,22 +715,58 @@ class HtmlUtils
 
 		if ($oDom)
 		{
+			if ($fAdditionalDomReader)
+			{
+				$oResDom = \call_user_func($fAdditionalDomReader, $oDom);
+				if ($oResDom)
+				{
+					$oDom = $oResDom;
+				}
+
+				unset($oResDom);
+			}
+
 			if ($bFindLinksInHtml)
 			{
 				\MailSo\Base\HtmlUtils::FindLinksInDOM($oDom);
 			}
 
-			$aNodes = $oDom->getElementsByTagName('*');
-			foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement)
+			$oXpath = new \DOMXpath($oDom);
+			$oComments = $oXpath->query('//comment()');
+			if ($oComments)
 			{
-				if (\in_array(\strtolower($oElement->tagName), array('svg', 'head', 'link',
-					'base', 'meta', 'title', 'style', 'x-script', 'script', 'bgsound', 'keygen', 'source',
-					'object', 'embed', 'applet', 'mocha', 'iframe', 'frame', 'frameset', 'video', 'audio')) && isset($oElement->parentNode))
+				foreach ($oComments as $oComment)
 				{
-					@$oElement->parentNode->removeChild($oElement);
+					if (isset($oComment->parentNode))
+					{
+						@$oComment->parentNode->removeChild($oComment);
+					}
 				}
 			}
 
+			unset($oXpath, $oComments);
+
+			$aNodes = $oDom->getElementsByTagName('*');
+			foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement)
+			{
+				if ($oElement)
+				{
+					$sTagNameLower = \strtolower($oElement->tagName);
+
+					if ('' !== $sTagNameLower && \in_array($sTagNameLower, array('svg', 'head', 'link',
+						'base', 'meta', 'title', 'style', 'x-script', 'script', 'bgsound', 'keygen', 'source',
+						'object', 'embed', 'applet', 'mocha', 'iframe', 'frame', 'frameset',
+						'video', 'audio', 'area', 'map')))
+					{
+						if (isset($oElement->parentNode))
+						{
+							@$oElement->parentNode->removeChild($oElement);
+						}
+					}
+				}
+			}
+
+			$sLinkColor = '';
 			$aNodes = $oDom->getElementsByTagName('*');
 			foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement)
 			{
@@ -468,6 +776,7 @@ class HtmlUtils
 				if ('body' === $sTagNameLower)
 				{
 					$aAttrs = array(
+						'link' => '',
 						'text' => '',
 						'topmargin' => '',
 						'leftmargin' => '',
@@ -499,6 +808,13 @@ class HtmlUtils
 
 							switch ($sIndex)
 							{
+								case 'link':
+									$sLinkColor = \trim($aItem[1]);
+									if (!\preg_match('/^#[abcdef0-9]{3,6}$/i', $sLinkColor))
+									{
+										$sLinkColor = '';
+									}
+									break;
 								case 'text':
 									$aStyles[] = 'color: '.$aItem[1];
 									break;
@@ -520,7 +836,7 @@ class HtmlUtils
 
 					if (0 < \count($aStyles))
 					{
-						$sStyles = $oElement->hasAttribute('style') ? $oElement->getAttribute('style') : '';
+						$sStyles = $oElement->hasAttribute('style') ? \trim(\trim(\trim($oElement->getAttribute('style')), ';')) : '';
 						$oElement->setAttribute('style', (empty($sStyles) ? '' : $sStyles.'; ').\implode('; ', $aStyles));
 					}
 				}
@@ -530,6 +846,15 @@ class HtmlUtils
 					$oElement->setAttribute('src', 'javascript:false');
 				}
 
+				if ('a' === $sTagNameLower && !empty($sLinkColor))
+				{
+					$sStyles = $oElement->hasAttribute('style')
+						?  \trim(\trim(\trim($oElement->getAttribute('style')), ';')) : '';
+
+					$oElement->setAttribute('style',
+						'color: '.$sLinkColor.\trim((empty($sStyles) ? '' : '; '.$sStyles)));
+				}
+
 				if (\in_array($sTagNameLower, array('a', 'form', 'area')))
 				{
 					$oElement->setAttribute('target', '_blank');
@@ -540,14 +865,11 @@ class HtmlUtils
 					$oElement->setAttribute('tabindex', '-1');
 				}
 
-//				if ('blockquote' === $sTagNameLower)
-//				{
-//					$oElement->removeAttribute('style');
-//				}
-
 				foreach (array(
-					'id', 'class', 'contenteditable', 'designmode', 'formaction',
-					'data-bind', 'xmlns', 'srcset'
+					'id', 'class',
+					'contenteditable', 'designmode', 'formaction',
+					'data-bind', 'data-reactid', 'xmlns', 'srcset',
+					'data-x-skip-style'
 				) as $sAttr)
 				{
 					@$oElement->removeAttribute($sAttr);
@@ -578,6 +900,58 @@ class HtmlUtils
 					}
 				}
 
+				if ($bTryToDetectHiddenImages && 'img' === $sTagNameLower)
+				{
+					$sAlt = $oElement->hasAttribute('alt')
+						? \trim($oElement->getAttribute('alt')) : '';
+
+					if ($oElement->hasAttribute('src') && '' === $sAlt)
+					{
+						$aH = array(
+							'email.microsoftemail.com/open',
+							'github.com/notifications/beacon/',
+							'mandrillapp.com/track/open',
+							'list-manage.com/track/open'
+						);
+
+						$sH = $oElement->hasAttribute('height')
+							? \trim($oElement->getAttribute('height')) : '';
+
+//						$sW = $oElement->hasAttribute('width')
+//							? \trim($oElement->getAttribute('width')) : '';
+
+						$sStyles = $oElement->hasAttribute('style')
+							? \preg_replace('/[\s]+/', '', \trim(\trim(\trim($oElement->getAttribute('style')), ';'))) : '';
+
+						$sSrc = \trim($oElement->getAttribute('src'));
+
+						$bC = \in_array($sH, array('1', '0', '1px', '0px')) ||
+							\preg_match('/(display:none|visibility:hidden|height:0|height:[01][a-z][a-z])/i', $sStyles);
+
+						if (!$bC)
+						{
+							$sSrcLower = \strtolower($sSrc);
+							foreach ($aH as $sLine)
+							{
+								if (false !== \strpos($sSrcLower, $sLine))
+								{
+									$bC = true;
+									break;
+								}
+							}
+						}
+
+						if ($bC)
+						{
+							$oElement->setAttribute('style', 'display:none');
+							$oElement->setAttribute('data-x-skip-style', 'true');
+							$oElement->setAttribute('data-x-hidden-src', $sSrc);
+
+							$oElement->removeAttribute('src');
+						}
+					}
+				}
+
 				if ($oElement->hasAttribute('src'))
 				{
 					$sSrc = \trim($oElement->getAttribute('src'));
@@ -636,7 +1010,7 @@ class HtmlUtils
 				{
 					$aStyles = array();
 					$sStyles = $oElement->hasAttribute('style')
-						? $oElement->getAttribute('style') : '';
+						? \trim(\trim(\trim($oElement->getAttribute('style')), ';')) : '';
 
 					if (!empty($sBackground))
 					{
@@ -653,12 +1027,14 @@ class HtmlUtils
 					$oElement->setAttribute('style', (empty($sStyles) ? '' : $sStyles.'; ').\implode('; ', $aStyles));
 				}
 
-				if ($oElement->hasAttribute('style'))
+				if ($oElement->hasAttribute('style') && !$oElement->hasAttribute('data-x-skip-style'))
 				{
 					$oElement->setAttribute('style',
 						\MailSo\Base\HtmlUtils::ClearStyle($oElement->getAttribute('style'), $oElement, $bHasExternals,
 							$aFoundCIDs, $aContentLocationUrls, $aFoundedContentLocationUrls, $bDoNotReplaceExternalUrl, $fAdditionalExternalFilter));
 				}
+
+				$oElement->removeAttribute('data-x-skip-style');
 			}
 
 			$sResult = $oDom->saveHTML();
@@ -674,6 +1050,7 @@ class HtmlUtils
 		$sResult = '
'.$sResult.'
';
 
 		$sResult = \str_replace(\MailSo\Base\HtmlUtils::$KOS, ':', $sResult);
+		$sResult = \MailSo\Base\Utils::StripSpaces($sResult);
 
 		return \trim($sResult);
 	}
@@ -925,103 +1302,104 @@ class HtmlUtils
 	 */
 	public static function ConvertHtmlToPlain($sText)
 	{
-		$sText = trim(stripslashes($sText));
-		$sText = preg_replace('/[\s]+/', ' ', $sText);
-		$sText = preg_replace(array(
-				"/\r/",
-				"/[\n\t]+/",
-				'/]*>.*?<\/script>/i',
-				'/]*>.*?<\/style>/i',
-				'/]*>.*?<\/title>/i',
-				'/]*>(.+?)<\/h[123]>/i',
-				'/]*>(.+?)<\/h[456]>/i',
-				'/]*>/i',
-				'/]*>/i',
-				'/]*>(.+?)<\/b>/i',
-				'/]*>(.+?)<\/i>/i',
-				'/(]*>|<\/ul>)/i',
-				'/(]*>|<\/ol>)/i',
-				'/]*>/i',
-				'/]*href="([^"]+)"[^>]*>(.+?)<\/a>/i',
-				'/]*>/i',
-				'/(]*>|<\/table>)/i',
-				'/(]*>|<\/tr>)/i',
-				'/]*>(.+?)<\/td>/i',
-				'/]*>(.+?)<\/th>/i',
-				'/ /i',
-				'/"/i',
-				'/>/i',
-				'/</i',
-				'/&/i',
-				'/©/i',
-				'/™/i',
-				'/“/',
-				'/”/',
-				'/–/',
-				'/’/',
-				'/&/',
-				'/©/',
-				'/™/',
-				'/—/',
-				'/“/',
-				'/”/',
-				'/•/',
-				'/®/i',
-				'/•/i',
-				'/&[&;]+;/i',
-				'/'/',
-				'/ /'
-			), array(
-				'',
-				' ',
-				'',
-				'',
-				'',
-				"\n\n\\1\n\n",
-				"\n\n\\1\n\n",
-				"\n\n\t",
-				"\n",
-				'\\1',
-				'\\1',
-				"\n\n",
-				"\n\n",
-				"\n\t* ",
-				'\\2 (\\1)',
-				"\n------------------------------------\n",
-				"\n",
-				"\n",
-				"\t\\1\n",
-				"\t\\1\n",
-				' ',
-				'"',
-				'>',
-				'<',
-				'&',
-				'(c)',
-				'(tm)',
-				'"',
-				'"',
-				'-',
-				"'",
-				'&',
-				'(c)',
-				'(tm)',
-				'--',
-				'"',
-				'"',
-				'*',
-				'(R)',
-				'*',
-				'',
-				'\'',
-				''
-			), $sText);
+		$sText = \trim(\stripslashes($sText));
+		$sText = \MailSo\Base\Utils::StripSpaces($sText);
 
-		$sText = str_ireplace('
',"\n
", $sText);
-		$sText = strip_tags($sText, '');
-		$sText = preg_replace("/\n\\s+\n/", "\n", $sText);
-		$sText = preg_replace("/[\n]{3,}/", "\n\n", $sText);
+		$sText = \preg_replace(array(
+			"/\r/",
+			"/[\n\t]+/",
+			'/]*>.*?<\/script>/i',
+			'/]*>.*?<\/style>/i',
+			'/]*>.*?<\/title>/i',
+			'/]*>(.+?)<\/h[123]>/i',
+			'/]*>(.+?)<\/h[456]>/i',
+			'/]*>/i',
+			'/]*>/i',
+			'/]*>(.+?)<\/b>/i',
+			'/]*>(.+?)<\/i>/i',
+			'/(]*>|<\/ul>)/i',
+			'/(]*>|<\/ol>)/i',
+			'/]*>/i',
+			'/]*href="([^"]+)"[^>]*>(.+?)<\/a>/i',
+			'/]*>/i',
+			'/(]*>|<\/table>)/i',
+			'/(]*>|<\/tr>)/i',
+			'/]*>(.+?)<\/td>/i',
+			'/]*>(.+?)<\/th>/i',
+			'/ /i',
+			'/"/i',
+			'/>/i',
+			'/</i',
+			'/&/i',
+			'/©/i',
+			'/™/i',
+			'/“/',
+			'/”/',
+			'/–/',
+			'/’/',
+			'/&/',
+			'/©/',
+			'/™/',
+			'/—/',
+			'/“/',
+			'/”/',
+			'/•/',
+			'/®/i',
+			'/•/i',
+			'/&[&;]+;/i',
+			'/'/',
+			'/ /'
+		), array(
+			'',
+			' ',
+			'',
+			'',
+			'',
+			"\n\n\\1\n\n",
+			"\n\n\\1\n\n",
+			"\n\n\t",
+			"\n",
+			'\\1',
+			'\\1',
+			"\n\n",
+			"\n\n",
+			"\n\t* ",
+			'\\2 (\\1)',
+			"\n------------------------------------\n",
+			"\n",
+			"\n",
+			"\t\\1\n",
+			"\t\\1\n",
+			' ',
+			'"',
+			'>',
+			'<',
+			'&',
+			'(c)',
+			'(tm)',
+			'"',
+			'"',
+			'-',
+			"'",
+			'&',
+			'(c)',
+			'(tm)',
+			'--',
+			'"',
+			'"',
+			'*',
+			'(R)',
+			'*',
+			'',
+			'\'',
+			''
+		), $sText);
 
-		return trim($sText);
+		$sText = \str_ireplace('
',"\n
", $sText);
+		$sText = \strip_tags($sText, '');
+		$sText = \preg_replace("/\n\\s+\n/", "\n", $sText);
+		$sText = \preg_replace("/[\n]{3,}/", "\n\n", $sText);
+
+		return \trim($sText);
 	}
 }
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Http.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Http.php
index 4294908da..f34e47214 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Http.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Http.php
@@ -567,6 +567,12 @@ class Http
 			return false;
 		}
 
+		$sUrl = \trim($sUrl);
+		if ('//' === substr($sUrl, 0, 2))
+		{
+			$sUrl = 'http:'.$sUrl;
+		}
+
 		$aOptions = array(
 			CURLOPT_URL => $sUrl,
 			CURLOPT_HEADER => false,
@@ -679,10 +685,10 @@ class Http
 			{
 				if ($bSetCacheHeader)
 				{
-					\header('Cache-Control: public', true);
-					\header('Pragma: public', true);
-					\header('Last-Modified: '.\gmdate('D, d M Y H:i:s', $iUtcTimeStamp - $iExpireTime).' UTC', true);
-					\header('Expires: '.\gmdate('D, j M Y H:i:s', $iUtcTimeStamp + $iExpireTime).' UTC', true);
+					@\header('Cache-Control: public', true);
+					@\header('Pragma: public', true);
+					@\header('Last-Modified: '.\gmdate('D, d M Y H:i:s', $iUtcTimeStamp - $iExpireTime).' UTC', true);
+					@\header('Expires: '.\gmdate('D, j M Y H:i:s', $iUtcTimeStamp + $iExpireTime).' UTC', true);
 
 					if (0 < strlen($sEtag))
 					{
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/TempFile.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/TempFile.php
index dfe6ff609..196b2b5f5 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/TempFile.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/TempFile.php
@@ -43,14 +43,16 @@ class TempFile
 
 	/**
 	 * @param string $sHash
+	 * @param string $sFileName
 	 *
 	 * @return resource|bool
 	 */
-	public static function CreateStream($sHash)
+	public static function CreateStream($sHash, &$sFileName = '')
 	{
 		self::Reg();
 
-		return fopen(self::STREAM_NAME.'://'.$sHash, 'r+b');
+		$sFileName = self::STREAM_NAME.'://'.$sHash;
+		return fopen($sFileName, 'r+b');
 	}
 
 	/**
@@ -72,6 +74,7 @@ class TempFile
 				is_resource(self::$aStreams[$sHashName]))
 			{
 				$this->rSream = self::$aStreams[$sHashName];
+				\fseek($this->rSream, 0);
 				$bResult = true;
 			}
 			else
@@ -93,7 +96,7 @@ class TempFile
 	 */
 	public function stream_close()
 	{
-		return -1 !== fseek($this->rSream, 0);
+		return true;
 	}
 
 	/**
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php
index 669f24dae..d2608c334 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php
@@ -235,6 +235,56 @@ END;
 		return $sCharset;
 	}
 
+	/**
+	 * @param string $sFilePath
+	 * @param function $fFileExistsCallback = null
+	 *
+	 * @return string
+	 */
+	public static function SmartFileExists($sFilePath, $fFileExistsCallback = null)
+	{
+		$sFilePath = \str_replace('\\', '/', \trim($sFilePath));
+		if (!$fFileExistsCallback)
+		{
+			$fFileExistsCallback = function ($sPath) {
+				return \file_exists($sPath);
+			};
+		}
+
+		if (!\call_user_func($fFileExistsCallback, $sFilePath))
+		{
+			return $sFilePath;
+		}
+
+		$aFileInfo = \pathinfo($sFilePath);
+
+		$iIndex = 0;
+
+		do
+		{
+			$iIndex++;
+
+			$sFilePathNew = $aFileInfo['dirname'].'/'.
+				\preg_replace('/\(\d{1,2}\)$/', '', $aFileInfo['filename']).
+				' ('.$iIndex.')'.
+				(empty($aFileInfo['extension']) ? '' : '.'.$aFileInfo['extension'])
+			;
+
+			if (!\call_user_func($fFileExistsCallback, $sFilePathNew))
+			{
+				$sFilePath = $sFilePathNew;
+				break;
+			}
+			else if (10 < $iIndex)
+			{
+				break;
+			}
+		}
+		while (true);
+
+		return $sFilePath;
+	}
+
 	/**
 	 * @return bool
 	 */
@@ -500,6 +550,17 @@ END;
 		return \MailSo\Base\Utils::IsAscii($sValue) ? \strtoupper($sValue) : $sValue;
 	}
 
+	/**
+	 * @param string $sValue
+	 *
+	 * @return string
+	 */
+	public static function StripSpaces($sValue)
+	{
+		return \MailSo\Base\Utils::Trim(
+			\preg_replace('/[\s]+/u', ' ', $sValue));
+	}
+
 	/**
 	 * @param string $sValue
 	 *
@@ -507,7 +568,7 @@ END;
 	 */
 	public static function IsUtf8($sValue)
 	{
-		return (bool) ( \function_exists('mb_check_encoding') ?
+		return (bool) (\function_exists('mb_check_encoding') ?
 			\mb_check_encoding($sValue, 'UTF-8') : \preg_match('//u', $sValue));
 	}
 
@@ -551,6 +612,16 @@ END;
 		return $sResult;
 	}
 
+	/**
+	 * @param string $sInputValue
+	 *
+	 * @return string
+	 */
+	public static function DecodeFlowedFormat($sInputValue)
+	{
+		return \preg_replace('/ ([\r]?[\n])/m', ' ', $sInputValue);
+	}
+
 	/**
 	 * @param string $sEncodedValue
 	 * @param string $sIncomingCharset = ''
@@ -670,6 +741,64 @@ END;
 		return $sValue;
 	}
 
+	/**
+	 * @param string $sIncHeaders
+	 * @param string $aHeadersToRemove = array()
+	 *
+	 * @return string
+	 */
+	public static function RemoveHeaderFromHeaders($sIncHeaders, $aHeadersToRemove = array())
+	{
+		$sResultHeaders = $sIncHeaders;
+
+		if (\is_array($aHeadersToRemove) && 0 < \count($aHeadersToRemove))
+		{
+			$aHeadersToRemove = \array_map('strtolower', $aHeadersToRemove);
+
+			$sIncHeaders = \preg_replace('/[\r\n]+/', "\n", $sIncHeaders);
+			$aHeaders = \explode("\n", $sIncHeaders);
+
+			$bSkip = false;
+			$aResult = array();
+
+			foreach ($aHeaders as $sLine)
+			{
+				if (0 < \strlen($sLine))
+				{
+					$sFirst = $sLine{1};
+					if (' ' === $sFirst || "\t" === $sFirst)
+					{
+						if (!$bSkip)
+						{
+							$aResult[] = $sLine;
+						}
+					}
+					else
+					{
+						$bSkip = false;
+						$aParts = \explode(':', $sLine, 2);
+
+						if (!empty($aParts) && !empty($aParts[0]))
+						{
+							if (\in_array(\strtolower(\trim($aParts[0])), $aHeadersToRemove))
+							{
+								$bSkip = true;
+							}
+							else
+							{
+								$aResult[] = $sLine;
+							}
+						}
+					}
+				}
+			}
+
+			$sResultHeaders = \implode("\r\n", $aResult);
+		}
+
+		return $sResultHeaders;
+	}
+
 	/**
 	 * @param string $sEncodeType
 	 * @param string $sValue
@@ -812,7 +941,7 @@ END;
 		$sResult = '';
 		if (0 < \strlen($sEmail))
 		{
-			$iPos = \strpos($sEmail, '@');
+			$iPos = \strrpos($sEmail, '@');
 			$sResult = (false === $iPos) ? $sEmail : \substr($sEmail, 0, $iPos);
 		}
 
@@ -829,7 +958,7 @@ END;
 		$sResult = '';
 		if (0 < \strlen($sEmail))
 		{
-			$iPos = \strpos($sEmail, '@');
+			$iPos = \strrpos($sEmail, '@');
 			if (false !== $iPos && 0 < $iPos)
 			{
 				$sResult = \substr($sEmail, $iPos + 1);
@@ -839,6 +968,20 @@ END;
 		return $sResult;
 	}
 
+	/**
+	 * @param string $sDomain
+	 *
+	 * @return string
+	 */
+	public static function GetClearDomainName($sDomain)
+	{
+		$sResultDomain = \preg_replace(
+			'/^(webmail|email|mail|www|imap4|pop3|imap|pop|demo|client|ssl|secure|test|cloud|box|m)\./i',
+				'', $sDomain);
+
+		return false === \strpos($sResultDomain, '.') ? $sDomain : $sResultDomain;
+	}
+
 	/**
 	 * @param string $sFileName
 	 *
@@ -1230,8 +1373,9 @@ END;
 	 */
 	public static function ClearFileName($sFileName)
 	{
-		return \MailSo\Base\Utils::ClearNullBite(\preg_replace('/[\s]+/u', ' ',
-			\str_replace(array('"', '/', '\\', '*', '?', '<', '>', '|', ':'), ' ', $sFileName)));
+		return \MailSo\Base\Utils::Trim(\MailSo\Base\Utils::ClearNullBite(
+			\MailSo\Base\Utils::StripSpaces(
+				\str_replace(array('"', '/', '\\', '*', '?', '<', '>', '|', ':'), ' ', $sFileName))));
 	}
 
 	/**
@@ -1241,8 +1385,8 @@ END;
 	 */
 	public static function ClearXss($sValue)
 	{
-		return \MailSo\Base\Utils::ClearNullBite(
-			\str_replace(array('"', '/', '\\', '*', '?', '<', '>', '|', ':'), ' ', $sValue));
+		return \MailSo\Base\Utils::Trim(\MailSo\Base\Utils::ClearNullBite(
+			\str_replace(array('"', '/', '\\', '*', '?', '<', '>', '|', ':'), ' ', $sValue)));
 	}
 
 	/**
@@ -2224,7 +2368,8 @@ END;
 	{
 		$aMatch = array();
 		return \preg_match('/.+(\.[a-zA-Z]+)$/', $sDomain, $aMatch) && !empty($aMatch[1]) && \in_array($aMatch[1], \explode(' ',
-			'.aero .asia .biz .cat .com .coop .edu .gov .info .int .jobs .mil .mobi .museum .name .net .org .pro .tel .travel .xxx .ac .ad .ae .af .ag .ai .al .am .an .ao .aq .ar .as .at .au .aw .ax .az .ba .bb .bd .be .bf .bg .bh .bi .bj .bm .bn .bo .br .bs .bt .bv .bw .by .bz .ca .cc .cd .cf .cg .ch .ci .ck .cl .cm .cn .co .cr .cs .cu .cv .cx .cy .cz .dd .de .dj .dk .dm .do .dz .ec .ee .eg .er .es .et .eu .fi .fj .fk .fm .fo .fr .ga .gb .gd .ge .gf .gg .gh .gi .gl .gm .gn .gp .gq .gr .gs .gt .gu .gw .gy .hk .hm .hn .hr .ht .hu .id .ie .il .im .in .io .iq .ir .is .it .je .jm .jo .jp .ke .kg .kh .ki .km .kn .kp .kr .kw .ky .kz .la .lb .lc .li .lk .lr .ls .lt .lu .lv .ly .ma .mc .md .me .mg .mh .mk .ml .mm .mn .mo .mp .mq .mr .ms .mt .mu .mv .mw .mx .my .mz .na .nc .ne .nf .ng .ni .nl .no .np .nr .nu .nz .om .pa .pe .pf .pg .ph .pk .pl .pm .pn .pr .ps .pt .pw .py .qa .re .ro .rs .ru . .rw .sa .sb .sc .sd .se .sg .sh .si .sj .sk .sl .sm .sn .so .sr .st .su .sv .sy .sz .tc .td .tf .tg .th .tj .tk .tl .tm .tn .to .tp .tr .tt .tv .tw .tz .ua .ug .uk .us .uy .uz .va .vc .ve .vg .vi .vn .vu .wf .ws .ye .yt .za .zm .zw'
+			'.academy .actor .agency .audio .bar .beer .bike .blue .boutique .cab .camera .camp .capital .cards .careers .cash .catering .center .cheap .city .cleaning .clinic .clothing .club .coffee .community .company .computer .construction .consulting .contractors .cool .credit .dance .dating .democrat .dental .diamonds .digital .direct .directory .discount .domains .education .email .energy .equipment .estate .events .expert .exposed .fail .farm .fish .fitness .florist .fund .futbol .gallery .gift .glass .graphics .guru .help .holdings .holiday .host .hosting .house .institute .international .kitchen .land .life .lighting .limo .link .management .market .marketing .media .menu .moda .partners .parts .photo .photography .photos .pics .pink .press .productions .pub .red .rentals .repair .report .rest .sexy .shoes .social .solar .solutions .space .support .systems .tattoo .tax .technology .tips .today .tools .town .toys .trade .training .university .uno .vacations .vision .vodka .voyage .watch .webcam .wiki .work .works .wtf .zone .aero .asia .biz .cat .com .coop .edu .gov .info .int .jobs .mil .mobi .museum .name .net .org .pro .tel .travel .xxx '.
+			'.ac .ad .ae .af .ag .ai .al .am .an .ao .aq .ar .as .at .au .aw .ax .az .ba .bb .bd .be .bf .bg .bh .bi .bj .bm .bn .bo .br .bs .bt .bv .bw .by .bz .ca .cc .cd .cf .cg .ch .ci .ck .cl .cm .cn .co .cr .cs .cu .cv .cx .cy .cz .dd .de .dj .dk .dm .do .dz .ec .ee .eg .er .es .et .eu .fi .fj .fk .fm .fo .fr .ga .gb .gd .ge .gf .gg .gh .gi .gl .gm .gn .gp .gq .gr .gs .gt .gu .gw .gy .hk .hm .hn .hr .ht .hu .id .ie .il .im .in .io .iq .ir .is .it .je .jm .jo .jp .ke .kg .kh .ki .km .kn .kp .kr .kw .ky .kz .la .lb .lc .li .lk .lr .ls .lt .lu .lv .ly .ma .mc .md .me .mg .mh .mk .ml .mm .mn .mo .mp .mq .mr .ms .mt .mu .mv .mw .mx .my .mz .na .nc .ne .nf .ng .ni .nl .no .np .nr .nu .nz .om .pa .pe .pf .pg .ph .pk .pl .pm .pn .pr .ps .pt .pw .py .qa .re .ro .rs .ru . .rw .sa .sb .sc .sd .se .sg .sh .si .sj .sk .sl .sm .sn .so .sr .st .su .sv .sy .sz .tc .td .tf .tg .th .tj .tk .tl .tm .tn .to .tp .tr .tt .tv .tw .tz .ua .ug .uk .us .uy .uz .va .vc .ve .vg .vi .vn .vu .wf .ws .ye .yt .za .zm .zw'
 		));
 	}
 
@@ -2303,6 +2448,38 @@ END;
 		return ('' === $sUser ? '' : $sUser.'@').$sDomain;
 	}
 
+	/**
+	 * @param string $sHash
+	 * @param string $sSalt
+	 *
+	 * @return int
+	 */
+	public static function HashToId($sHash, $sSalt = '')
+	{
+		$sData = $sHash ? @\MailSo\Base\Crypt::XxteaDecrypt(\hex2bin($sHash), \md5($sSalt)) : null;
+
+		$aMatch = array();
+		if ($sData && preg_match('/^id:(\d+)$/', $sData, $aMatch) && isset($aMatch[1]))
+		{
+			return is_numeric($aMatch[1]) ? (int) $aMatch[1] : null;
+		}
+
+		return null;
+	}
+
+	/**
+	 * @param int $iID
+	 * @param string $sSalt
+	 *
+	 * @return string
+	 */
+	public static function IdToHash($iID, $sSalt = '')
+	{
+		return is_int($iID) ?
+			\bin2hex(\MailSo\Base\Crypt::XxteaEncrypt('id:'.$iID, \md5($sSalt))) : null
+		;
+	}
+
 	/**
 	 * @param string $sPassword
 	 *
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Config.php b/rainloop/v/0.0.0/app/libraries/MailSo/Config.php
index 682b0439b..add7b0a33 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Config.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Config.php
@@ -46,11 +46,21 @@ class Config
 	 */
 	public static $MessageListDateFilter = 0;
 
+	/**
+	 * @var string
+	 */
+	public static $MessageListPermanentFilter = '';
+
 	/**
 	 * @var int
 	 */
 	public static $LargeThreadLimit = 50;
 
+	/**
+	 * @var bool
+	 */
+	public static $MessageAllHeaders = false;
+
 	/**
 	 * @var bool
 	 */
@@ -61,6 +71,11 @@ class Config
 	 */
 	public static $PreferStartTlsIfAutoDetect = true;
 
+	/**
+	 * @var string
+	 */
+	public static $BoundaryPrefix = '_Part_';
+
 	/**
 	 * @var \MailSo\Log\Logger|null
 	 */
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
index eaf460485..624f2beb8 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
@@ -285,6 +285,22 @@ class BodyStructure
 		return $bResult;
 	}
 
+	/**
+	 * @return bool
+	 */
+	public function IsFlowedFormat()
+	{
+		$bResult = !empty($this->aBodyParams['format']) &&
+			'flowed' === \strtolower(\trim($this->aBodyParams['format']));
+
+		if ($bResult && \in_array(\strtolower($this->MailEncodingName()), array('base64', 'quoted-printable')))
+		{
+			$bResult = false;
+		}
+
+		return $bResult;
+	}
+
 	/**
 	 * @return array|null
 	 */
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php
index f1f14fee8..588473edf 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php
@@ -22,5 +22,6 @@ class FolderResponseStatus
 	const RECENT = 'RECENT';
 	const UNSEEN = 'UNSEEN';
 	const UIDNEXT = 'UIDNEXT';
+	const HIGHESTMODSEQ = 'HIGHESTMODSEQ';
 	const UIDVALIDITY = 'UIDVALIDITY';
 }
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php
index d958e4897..7b9fc4e70 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php
@@ -22,5 +22,6 @@ class FolderStatus
 	const RECENT = 'RECENT';
 	const UNSEEN = 'UNSEEN';
 	const UIDNEXT = 'UIDNEXT';
+	const HIGHESTMODSEQ = 'HIGHESTMODSEQ';
 	const UIDVALIDITY = 'UIDVALIDITY';
 }
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/Folder.php b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/Folder.php
index 26dc3cfac..50fd42337 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/Folder.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/Folder.php
@@ -94,6 +94,11 @@ class Folder
 		if (0 < \strlen($this->sDelimiter))
 		{
 			$aNames = \explode($this->sDelimiter, $this->sFullNameRaw);
+			if (false !== \array_search('', $aNames))
+			{
+				throw new \MailSo\Base\Exceptions\InvalidArgumentException();
+			}
+
 			$this->sNameRaw = \end($aNames);
 		}
 	}
@@ -102,7 +107,7 @@ class Folder
 	 * @param string $sFullNameRaw
 	 * @param string $sDelimiter = '.'
 	 * @param array $aFlags = array()
-	 * 
+	 *
 	 * @return \MailSo\Imap\Folder
 	 *
 	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
@@ -167,7 +172,7 @@ class Folder
 	{
 		return 'INBOX' === \strtoupper($this->sFullNameRaw) || \in_array('\inbox', $this->aFlagsLowerCase);
 	}
-	
+
 	/**
 	 * @param string $sName
 	 * @param mixed $mData
@@ -176,7 +181,7 @@ class Folder
 	{
 		$this->aExtended[$sName] = $mData;
 	}
-	
+
 	/**
 	 * @param string $sName
 	 * @return mixed
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php
index c5b437889..f6ac83e43 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php
@@ -62,6 +62,11 @@ class FolderInformation
 	 */
 	public $Uidnext;
 
+	/**
+	 * @var string
+	 */
+	public $HighestModSeq;
+
 	/**
 	 * @access private
 	 *
@@ -79,6 +84,7 @@ class FolderInformation
 
 		$this->Unread = null;
 		$this->Uidnext = null;
+		$this->HighestModSeq = null;
 	}
 
 	/**
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
index 8abaea90a..85ed08edd 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
@@ -326,7 +326,24 @@ class ImapClient extends \MailSo\Net\NetClient
 
 		try
 		{
-			$this->SendRequestWithCheck('AUTHENTICATE', array('XOAUTH2', \trim($sXOAuth2Token)));
+			$this->SendRequest('AUTHENTICATE', array('XOAUTH2', \trim($sXOAuth2Token)));
+			$aR = $this->parseResponseWithValidation();
+
+			if (\is_array($aR) && 0 < \count($aR) && isset($aR[\count($aR) - 1]))
+			{
+				$oR = $aR[\count($aR) - 1];
+				if (\MailSo\Imap\Enumerations\ResponseType::CONTINUATION === $oR->ResponseType)
+				{
+					if (!empty($oR->ResponseList[1]) && preg_match('/^[a-zA-Z0-9=+\/]+$/', $oR->ResponseList[1]))
+					{
+						$this->Logger()->Write(\base64_decode($oR->ResponseList[1]),
+							\MailSo\Log\Enumerations\Type::WARNING);
+					}
+
+					$this->sendRaw('');
+					$this->parseResponseWithValidation();
+				}
+			}
 		}
 		catch (\MailSo\Imap\Exceptions\NegativeResponseException $oException)
 		{
@@ -681,6 +698,7 @@ class ImapClient extends \MailSo\Net\NetClient
 					{
 						$sName = null;
 						$aStatus = array();
+
 						foreach ($oImapResponse->ResponseList[3] as $sArrayItem)
 						{
 							if (null === $sName)
@@ -734,17 +752,21 @@ class ImapClient extends \MailSo\Net\NetClient
 			$this->EscapeString($sListPattern)
 		);
 
-		if ($bUseListStatus && $this->IsSupported('LIST-STATUS'))
+		if ($bUseListStatus && !$bIsSubscribeList && $this->IsSupported('LIST-STATUS'))
 		{
-			$aParameters[] = 'RETURN';
-			$aParameters[] = array(
-				 'STATUS',
-				 array(
-					\MailSo\Imap\Enumerations\FolderStatus::MESSAGES,
-					\MailSo\Imap\Enumerations\FolderStatus::UNSEEN,
-					\MailSo\Imap\Enumerations\FolderStatus::UIDNEXT
-				 )
+			$aL = array(
+				\MailSo\Imap\Enumerations\FolderStatus::MESSAGES,
+				\MailSo\Imap\Enumerations\FolderStatus::UNSEEN,
+				\MailSo\Imap\Enumerations\FolderStatus::UIDNEXT
 			);
+
+//			if ($this->IsSupported('CONDSTORE'))
+//			{
+//				$aL[] = \MailSo\Imap\Enumerations\FolderStatus::HIGHESTMODSEQ;
+//			}
+
+			$aParameters[] = 'RETURN';
+			$aParameters[] = array('STATUS', $aL);
 		}
 		else
 		{
@@ -846,6 +868,12 @@ class ImapClient extends \MailSo\Net\NetClient
 						{
 							$oResult->Uidnext = $oImapResponse->OptionalResponse[1];
 						}
+						else if ('HIGHESTMODSEQ' === $oImapResponse->OptionalResponse[0] &&
+							isset($oImapResponse->OptionalResponse[1]) &&
+							\is_numeric($oImapResponse->OptionalResponse[1]))
+						{
+							$oResult->HighestModSeq = \trim($oImapResponse->OptionalResponse[1]);
+						}
 					}
 
 					if (\count($oImapResponse->ResponseList) > 2 &&
@@ -1861,7 +1889,7 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * @throws \MailSo\Net\Exceptions\Exception
 	 */
 	private function partialParseResponseBranch(&$oImapResponse, $iStackIndex = -1,
-		$bTreatAsAtom = false, $sParentToken = '')
+		$bTreatAsAtom = false, $sParentToken = '', $sOpenBracket = '')
 	{
 		$mNull = null;
 
@@ -1992,7 +2020,7 @@ class ImapClient extends \MailSo\Net\NetClient
 				if ($bTreatAsAtom)
 				{
 					$sAtomBlock = $this->partialParseResponseBranch($mNull, $iStackIndex, true,
-						null === $sPreviousAtomUpperCase ? '' : \strtoupper($sPreviousAtomUpperCase));
+						null === $sPreviousAtomUpperCase ? '' : \strtoupper($sPreviousAtomUpperCase), $sOpenBracket);
 
 					$sAtomBuilder .= $sAtomBlock;
 					$iPos = $this->iResponseBufParsedPos;
@@ -2007,7 +2035,7 @@ class ImapClient extends \MailSo\Net\NetClient
 			else if ($bIsGotoNotAtomBracket)
 			{
 				$aSubItems = $this->partialParseResponseBranch($mNull, $iStackIndex, false,
-					null === $sPreviousAtomUpperCase ? '' : \strtoupper($sPreviousAtomUpperCase));
+					null === $sPreviousAtomUpperCase ? '' : \strtoupper($sPreviousAtomUpperCase), $sOpenBracket);
 
 				$aList[] = $aSubItems;
 				$iPos = $this->iResponseBufParsedPos;
@@ -2037,27 +2065,36 @@ class ImapClient extends \MailSo\Net\NetClient
 				$sChar = $this->sResponseBuffer[$iPos];
 			}
 
-			switch ($sChar)
+			switch (true)
 			{
-				case ']':
-				case ')':
+				case ']' === $sChar:
 					$iPos++;
 					$sPreviousAtomUpperCase = null;
 					$bIsEndOfList = true;
 					break;
-				case ' ':
+				case ')' === $sChar:
+					$iPos++;
+					$sPreviousAtomUpperCase = null;
+					$bIsEndOfList = true;
+					break;
+				case ' ' === $sChar:
 					if ($bTreatAsAtom)
 					{
 						$sAtomBuilder .= ' ';
 					}
 					$iPos++;
 					break;
-				case '[':
+				case '[' === $sChar:
 					$bIsClosingBracketSquare = true;
-				case '(':
+				case '(' === $sChar:
+					if ('(' === $sChar)
+					{
+						$bIsClosingBracketSquare = false;
+					}
+
 					if ($bTreatAsAtom)
 					{
-						$sAtomBuilder .= ($bIsClosingBracketSquare) ? '[' : '(';
+						$sAtomBuilder .= $bIsClosingBracketSquare ? '[' : '(';
 					}
 					$iPos++;
 
@@ -2065,13 +2102,15 @@ class ImapClient extends \MailSo\Net\NetClient
 					if ($bTreatAsAtom)
 					{
 						$bIsGotoAtomBracket = true;
+						$sOpenBracket = $bIsClosingBracketSquare ? '[' : '(';
 					}
 					else
 					{
 						$bIsGotoNotAtomBracket = true;
+						$sOpenBracket = $bIsClosingBracketSquare ? '[' : '(';
 					}
 					break;
-				case '{':
+				case '{' === $sChar:
 					$bIsLiteralParsed = false;
 					$mLiteralEndPos = \strpos($this->sResponseBuffer, '}', $iPos);
 					if (false !== $mLiteralEndPos && $mLiteralEndPos > $iPos)
@@ -2092,7 +2131,7 @@ class ImapClient extends \MailSo\Net\NetClient
 					}
 					$sPreviousAtomUpperCase = null;
 					break;
-				case '"':
+				case '"' === $sChar:
 					$bIsQuotedParsed = false;
 					while (true)
 					{
@@ -2178,7 +2217,7 @@ class ImapClient extends \MailSo\Net\NetClient
 					$sPreviousAtomUpperCase = null;
 					break;
 
-				case 'GOTO_DEFAULT':
+				case 'GOTO_DEFAULT' === $sChar:
 				default:
 					$iCharBlockStartPos = $iPos;
 
@@ -2186,7 +2225,7 @@ class ImapClient extends \MailSo\Net\NetClient
 					{
 						$iPos = $iBufferEndIndex;
 
-						while ($iPos > $iCharBlockStartPos && $this->sResponseBuffer[$iCharBlockStartPos] == ' ')
+						while ($iPos > $iCharBlockStartPos && $this->sResponseBuffer[$iCharBlockStartPos] === ' ')
 						{
 							$iCharBlockStartPos++;
 						}
@@ -2196,9 +2235,9 @@ class ImapClient extends \MailSo\Net\NetClient
 					while (!$bIsAtomDone && ($iPos <= $iBufferEndIndex))
 					{
 						$sCharDef = $this->sResponseBuffer[$iPos];
-						switch ($sCharDef)
+						switch (true)
 						{
-							case '[':
+							case '[' === $sCharDef:
 								if (null === $sAtomBuilder)
 								{
 									$sAtomBuilder = '';
@@ -2210,7 +2249,7 @@ class ImapClient extends \MailSo\Net\NetClient
 								$this->iResponseBufParsedPos = $iPos;
 
 								$sListBlock = $this->partialParseResponseBranch($mNull, $iStackIndex, true,
-									null === $sPreviousAtomUpperCase ? '' : \strtoupper($sPreviousAtomUpperCase));
+									null === $sPreviousAtomUpperCase ? '' : \strtoupper($sPreviousAtomUpperCase), '[');
 
 								if (null !== $sListBlock)
 								{
@@ -2220,9 +2259,9 @@ class ImapClient extends \MailSo\Net\NetClient
 								$iPos = $this->iResponseBufParsedPos;
 								$iCharBlockStartPos = $iPos;
 								break;
-							case ' ':
-							case ']':
-							case ')':
+							case ' ' === $sCharDef:
+							case ')' === $sCharDef && '(' === $sOpenBracket:
+							case ']' === $sCharDef && '[' === $sOpenBracket:
 								$bIsAtomDone = true;
 								break;
 							default:
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Log/Driver.php b/rainloop/v/0.0.0/app/libraries/MailSo/Log/Driver.php
index 60a8d0021..755df58cb 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Log/Driver.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Log/Driver.php
@@ -47,6 +47,11 @@ abstract class Driver
 	 */
 	protected $bTypedPrefix;
 
+	/**
+	 * @var string
+	 */
+	protected $sNewLine;
+
 	/**
 	 * @var int
 	 */
@@ -79,10 +84,13 @@ abstract class Driver
 	{
 		$this->sDatePattern = 'H:i:s';
 		$this->sName = 'INFO';
+		$this->sNewLine = "\r\n";
 		$this->bTimePrefix = true;
 		$this->bTypedPrefix = true;
 		$this->bGuidPrefix = true;
 
+		$this->iTimeOffset = 0;
+
 		$this->iWriteOnTimeoutOnly = 0;
 		$this->bWriteOnErrorOnly = false;
 		$this->bWriteOnPhpErrorOnly = false;
@@ -106,6 +114,17 @@ abstract class Driver
 		);
 	}
 
+	/**
+	 * @param int $iTimeOffset
+	 *
+	 * @return \MailSo\Log\Driver
+	 */
+	public function SetTimeOffset($iTimeOffset)
+	{
+		$this->iTimeOffset = $iTimeOffset;
+		return $this;
+	}
+
 	/**
 	 * @return \MailSo\Log\Driver
 	 */
@@ -217,7 +236,7 @@ abstract class Driver
 	protected function getTimeWithMicroSec()
 	{
 		$aMicroTimeItems = \explode(' ', \microtime());
-		return \gmdate($this->sDatePattern, $aMicroTimeItems[1]).'.'.
+		return \MailSo\Log\Logger::DateHelper($this->sDatePattern, $this->iTimeOffset, $aMicroTimeItems[1]).'.'.
 			\str_pad((int) ($aMicroTimeItems[0] * 1000), 3, '0', STR_PAD_LEFT);
 	}
 
@@ -233,21 +252,50 @@ abstract class Driver
 		return isset($this->aPrefixes[$iType]) ? $sName.$this->aPrefixes[$iType].': ' : '';
 	}
 
+	/**
+	 * @param string|array $mDesc
+	 * @param bool $bDiplayCrLf = false
+	 *
+	 * @return string
+	 */
+	protected function localWriteImplementation($mDesc, $bDiplayCrLf = false)
+	{
+		if ($bDiplayCrLf)
+		{
+			if (\is_array($mDesc))
+			{
+				foreach ($mDesc as &$sLine)
+				{
+					$sLine = \strtr($sLine, array("\r" => '\r', "\n" => '\n'.$this->sNewLine));
+					$sLine = \rtrim($sLine);
+				}
+			}
+			else
+			{
+				$mDesc = \strtr($mDesc, array("\r" => '\r', "\n" => '\n'.$this->sNewLine));
+				$mDesc = \rtrim($mDesc);
+			}
+		}
+
+		return $this->writeImplementation($mDesc);
+	}
+
 	/**
 	 * @final
 	 * @param string $sDesc
 	 * @param int $iType = \MailSo\Log\Enumerations\Type::INFO
 	 * @param string $sName = ''
+	 * @param bool $bDiplayCrLf = false
 	 *
 	 * @return bool
 	 */
-	final public function Write($sDesc, $iType = \MailSo\Log\Enumerations\Type::INFO, $sName = '')
+	final public function Write($sDesc, $iType = \MailSo\Log\Enumerations\Type::INFO, $sName = '', $bDiplayCrLf = false)
 	{
 		$bResult = true;
 		if (!$this->bFlushCache && ($this->bWriteOnErrorOnly || $this->bWriteOnPhpErrorOnly || 0 < $this->iWriteOnTimeoutOnly))
 		{
 			$bErrorPhp = false;
-			
+
 			$bError = $this->bWriteOnErrorOnly && \in_array($iType, array(
 				\MailSo\Log\Enumerations\Type::NOTICE,
 				\MailSo\Log\Enumerations\Type::NOTICE_PHP,
@@ -272,18 +320,18 @@ abstract class Driver
 				if (isset($this->aCache[0]) && empty($this->aCache[0]))
 				{
 					$this->aCache[0] = $sFlush;
-					array_unshift($this->aCache, '');
+					\array_unshift($this->aCache, '');
 				}
 				else
 				{
-					array_unshift($this->aCache, $sFlush);
+					\array_unshift($this->aCache, $sFlush);
 				}
 
 				$this->aCache[] = '--- FlushLogCache: Trigger';
 				$this->aCache[] = $this->loggerLineImplementation($this->getTimeWithMicroSec(), $sDesc, $iType, $sName);
 
 				$this->bFlushCache = true;
-				$bResult = $this->writeImplementation($this->aCache);
+				$bResult = $this->localWriteImplementation($this->aCache, $bDiplayCrLf);
 				$this->aCache = array();
 			}
 			else if (0 < $this->iWriteOnTimeoutOnly && \time() - APP_START_TIME > $this->iWriteOnTimeoutOnly)
@@ -292,18 +340,18 @@ abstract class Driver
 				if (isset($this->aCache[0]) && empty($this->aCache[0]))
 				{
 					$this->aCache[0] = $sFlush;
-					array_unshift($this->aCache, '');
+					\array_unshift($this->aCache, '');
 				}
 				else
 				{
-					array_unshift($this->aCache, $sFlush);
+					\array_unshift($this->aCache, $sFlush);
 				}
 
 				$this->aCache[] = '--- FlushLogCache: Trigger';
 				$this->aCache[] = $this->loggerLineImplementation($this->getTimeWithMicroSec(), $sDesc, $iType, $sName);
 
 				$this->bFlushCache = true;
-				$bResult = $this->writeImplementation($this->aCache);
+				$bResult = $this->localWriteImplementation($this->aCache, $bDiplayCrLf);
 				$this->aCache = array();
 			}
 			else
@@ -313,13 +361,21 @@ abstract class Driver
 		}
 		else
 		{
-			$bResult = $this->writeImplementation(
-				$this->loggerLineImplementation($this->getTimeWithMicroSec(), $sDesc, $iType, $sName));
+			$bResult = $this->localWriteImplementation(
+				$this->loggerLineImplementation($this->getTimeWithMicroSec(), $sDesc, $iType, $sName), $bDiplayCrLf);
 		}
 
 		return $bResult;
 	}
 
+	/**
+	 * @return string
+	 */
+	public function GetNewLine()
+	{
+		return $this->sNewLine;
+	}
+
 	/**
 	 * @final
 	 * @return bool
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Log/Drivers/File.php b/rainloop/v/0.0.0/app/libraries/MailSo/Log/Drivers/File.php
index 942df84f0..b3c3678c1 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Log/Drivers/File.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Log/Drivers/File.php
@@ -23,23 +23,18 @@ class File extends \MailSo\Log\Driver
 	 */
 	private $sLoggerFileName;
 
-	/**
-	 * @var string
-	 */
-	private $sCrLf;
-	
 	/**
 	 * @access protected
 	 *
 	 * @param string $sLoggerFileName
-	 * @param string $sCrLf = "\r\n"
+	 * @param string $sNewLine = "\r\n"
 	 */
-	protected function __construct($sLoggerFileName, $sCrLf = "\r\n")
+	protected function __construct($sLoggerFileName, $sNewLine = "\r\n")
 	{
 		parent::__construct();
 
 		$this->sLoggerFileName = $sLoggerFileName;
-		$this->sCrLf = $sCrLf;
+		$this->sNewLine = $sNewLine;
 	}
 
 	/**
@@ -52,13 +47,13 @@ class File extends \MailSo\Log\Driver
 
 	/**
 	 * @param string $sLoggerFileName
-	 * @param string $sCrLf = "\r\n"
+	 * @param string $sNewLine = "\r\n"
 	 *
 	 * @return \MailSo\Log\Drivers\File
 	 */
-	public static function NewInstance($sLoggerFileName, $sCrLf = "\r\n")
+	public static function NewInstance($sLoggerFileName, $sNewLine = "\r\n")
 	{
-		return new self($sLoggerFileName, $sCrLf);
+		return new self($sLoggerFileName, $sNewLine);
 	}
 
 	/**
@@ -86,11 +81,11 @@ class File extends \MailSo\Log\Driver
 	 */
 	private function writeToLogFile($mDesc)
 	{
-		if (is_array($mDesc))
+		if (\is_array($mDesc))
 		{
-			$mDesc = \implode($this->sCrLf, $mDesc);
+			$mDesc = \implode($this->sNewLine, $mDesc);
 		}
-		
-		return \error_log($mDesc.$this->sCrLf, 3, $this->sLoggerFileName);
+
+		return \error_log($mDesc.$this->sNewLine, 3, $this->sLoggerFileName);
 	}
 }
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Log/Drivers/Inline.php b/rainloop/v/0.0.0/app/libraries/MailSo/Log/Drivers/Inline.php
index 529a3106b..817ffbb5b 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Log/Drivers/Inline.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Log/Drivers/Inline.php
@@ -18,11 +18,6 @@ namespace MailSo\Log\Drivers;
  */
 class Inline extends \MailSo\Log\Driver
 {
-	/**
-	 * @var string
-	 */
-	private $sNewLine;
-
 	/**
 	 * @var bool
 	 */
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Log/Logger.php b/rainloop/v/0.0.0/app/libraries/MailSo/Log/Logger.php
index 3d513f170..49022c446 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Log/Logger.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Log/Logger.php
@@ -91,6 +91,21 @@ class Logger extends \MailSo\Base\Collection
 		return $oInstance;
 	}
 
+	/**
+	 * @param string $sFormat
+	 * @param int $iTimeOffset = 0
+	 * @param int $iTimestamp = 0
+	 *
+	 * @return string
+	 */
+	public static function DateHelper($sFormat, $iTimeOffset = 0, $iTimestamp = null)
+	{
+		$iTimestamp = null === $iTimestamp ? \time() : (int) $iTimestamp;
+		$iTimeOffset = (int) $iTimeOffset;
+
+		return \gmdate($sFormat, $iTimestamp + $iTimeOffset * 3600);
+	}
+
 	/**
 	 * @return bool
 	 */
@@ -150,7 +165,7 @@ class Logger extends \MailSo\Base\Collection
 	 */
 	public function AddSecret($sWord)
 	{
-		if (0 < \strlen(\trim($sWord)))
+		if (\is_string($sWord) && 0 < \strlen(\trim($sWord)))
 		{
 			$this->aSecretWords[] = $sWord;
 			$this->aSecretWords = \array_unique($this->aSecretWords);
@@ -281,11 +296,13 @@ class Logger extends \MailSo\Base\Collection
 	 * @param string $sDesc
 	 * @param int $iType = \MailSo\Log\Enumerations\Type::INFO
 	 * @param string $sName = ''
-	 * @param bool $bSearchWords = false
+	 * @param bool $bSearchSecretWords = true
+	 * @param bool $bDiplayCrLf = false
 	 *
 	 * @return bool
 	 */
-	public function Write($sDesc, $iType = \MailSo\Log\Enumerations\Type::INFO, $sName = '', $bSearchWords = false)
+	public function Write($sDesc, $iType = \MailSo\Log\Enumerations\Type::INFO,
+		$sName = '', $bSearchSecretWords = true, $bDiplayCrLf = false)
 	{
 		if (isset($this->aForbiddenTypes[$iType]) && true === $this->aForbiddenTypes[$iType])
 		{
@@ -298,7 +315,7 @@ class Logger extends \MailSo\Base\Collection
 		$aLoggers = array();
 		$iResult = 1;
 
-		if ($bSearchWords && !$this->bShowSecter && 0 < \count($this->aSecretWords))
+		if ($bSearchSecretWords && !$this->bShowSecter && 0 < \count($this->aSecretWords))
 		{
 			$sDesc = \str_replace($this->aSecretWords, '*******', $sDesc);
 		}
@@ -306,7 +323,7 @@ class Logger extends \MailSo\Base\Collection
 		$aLoggers =& $this->GetAsArray();
 		foreach ($aLoggers as /* @var $oLogger \MailSo\Log\Driver */ $oLogger)
 		{
-			$iResult &= $oLogger->Write($sDesc, $iType, $sName);
+			$iResult &= $oLogger->Write($sDesc, $iType, $sName, $bDiplayCrLf);
 		}
 
 		return (bool) $iResult;
@@ -317,12 +334,14 @@ class Logger extends \MailSo\Base\Collection
 	 * @param int $iType = \MailSo\Log\Enumerations\Type::INFO
 	 * @param string $sName = ''
 	 * @param bool $bSearchSecretWords = false
+	 * @param bool $bDiplayCrLf = false
 	 *
 	 * @return bool
 	 */
-	public function WriteDump($oValue, $iType = \MailSo\Log\Enumerations\Type::INFO, $sName = '', $bSearchSecretWords = false)
+	public function WriteDump($oValue, $iType = \MailSo\Log\Enumerations\Type::INFO, $sName = '',
+		$bSearchSecretWords = false, $bDiplayCrLf = false)
 	{
-		return $this->Write(\print_r($oValue, true), $iType, $sName, $bSearchSecretWords);
+		return $this->Write(\print_r($oValue, true), $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
 	}
 
 	/**
@@ -330,10 +349,12 @@ class Logger extends \MailSo\Base\Collection
 	 * @param int $iType = \MailSo\Log\Enumerations\Type::NOTICE
 	 * @param string $sName = ''
 	 * @param bool $bSearchSecretWords = true
+	 * @param bool $bDiplayCrLf = false
 	 *
 	 * @return bool
 	 */
-	public function WriteException($oException, $iType = \MailSo\Log\Enumerations\Type::NOTICE, $sName = '', $bSearchSecretWords = true)
+	public function WriteException($oException, $iType = \MailSo\Log\Enumerations\Type::NOTICE, $sName = '',
+		$bSearchSecretWords = true, $bDiplayCrLf = false)
 	{
 		if ($oException instanceof \Exception)
 		{
@@ -344,7 +365,34 @@ class Logger extends \MailSo\Base\Collection
 
 			$oException->__LOGINNED__ = true;
 
-			return $this->Write((string) $oException, $iType, $sName, $bSearchSecretWords);
+			return $this->Write((string) $oException, $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param \Exception $oException
+	 * @param int $iType = \MailSo\Log\Enumerations\Type::NOTICE
+	 * @param string $sName = ''
+	 * @param bool $bSearchSecretWords = true
+	 * @param bool $bDiplayCrLf = false
+	 *
+	 * @return bool
+	 */
+	public function WriteExceptionShort($oException, $iType = \MailSo\Log\Enumerations\Type::NOTICE, $sName = '',
+		$bSearchSecretWords = true, $bDiplayCrLf = false)
+	{
+		if ($oException instanceof \Exception)
+		{
+			if (isset($oException->__LOGINNED__))
+			{
+				return true;
+			}
+
+			$oException->__LOGINNED__ = true;
+
+			return $this->Write($oException->getMessage(), $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
 		}
 
 		return false;
@@ -355,10 +403,12 @@ class Logger extends \MailSo\Base\Collection
 	 * @param int $iType = \MailSo\Log\Enumerations\Type::NOTICE
 	 * @param string $sName = ''
 	 * @param bool $bSearchSecretWords = true
+	 * @param bool $bDiplayCrLf = false
 	 *
 	 * @return bool
 	 */
-	public function WriteMixed($mData, $iType = null, $sName = '', $bSearchSecretWords = true)
+	public function WriteMixed($mData, $iType = null, $sName = '',
+		$bSearchSecretWords = true, $bDiplayCrLf = false)
 	{
 		$iType = null === $iType ? \MailSo\Log\Enumerations\Type::INFO : $iType;
 		if (\is_array($mData) || \is_object($mData))
@@ -366,16 +416,16 @@ class Logger extends \MailSo\Base\Collection
 			if ($mData instanceof \Exception)
 			{
 				$iType = null === $iType ? \MailSo\Log\Enumerations\Type::NOTICE : $iType;
-				return $this->WriteException($mData, $iType, $sName, $bSearchSecretWords);
+				return $this->WriteException($mData, $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
 			}
 			else
 			{
-				return  $this->WriteDump($mData, $iType, $sName, $bSearchSecretWords);
+				return  $this->WriteDump($mData, $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
 			}
 		}
 		else
 		{
-			return $this->Write($mData, $iType, $sName, $bSearchSecretWords);
+			return $this->Write($mData, $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
 		}
 
 		return false;
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php
index 25303c8b6..9f0c00a0e 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php
@@ -20,7 +20,7 @@ class FolderCollection extends \MailSo\Base\Collection
 	/**
 	 * @var string
 	 */
-	private $sNamespace;
+	public $Namespace;
 
 	/**
 	 * @var string
@@ -49,7 +49,7 @@ class FolderCollection extends \MailSo\Base\Collection
 	{
 		parent::__construct();
 
-		$this->sNamespace = '';
+		$this->Namespace = '';
 		$this->FoldersHash = '';
 		$this->SystemFolders = array();
 		$this->IsThreadsSupported = false;
@@ -96,12 +96,30 @@ class FolderCollection extends \MailSo\Base\Collection
 		return $mResult;
 	}
 
+	/**
+	 * @return int
+	 */
+	public function CountRec()
+	{
+		$iResult = $this->Count();
+		foreach ($this->aItems as /* @var $oFolder \MailSo\Mail\Folder */ $oFolder)
+		{
+			if ($oFolder)
+			{
+				$oSub = $oFolder->SubFolders();
+				$iResult += $oSub ? $oSub->CountRec() : 0;
+			}
+		}
+
+		return $iResult;
+	}
+
 	/**
 	 * @return string
 	 */
 	public function GetNamespace()
 	{
-		return $this->sNamespace;
+		return $this->Namespace;
 	}
 
 	/**
@@ -110,7 +128,7 @@ class FolderCollection extends \MailSo\Base\Collection
 	public function FindDelimiter()
 	{
 		$sDelimiter = '/';
-		
+
 		$oFolder = $this->GetByFullNameRaw('INBOX');
 		if (!$oFolder)
 		{
@@ -132,7 +150,7 @@ class FolderCollection extends \MailSo\Base\Collection
 	 */
 	public function SetNamespace($sNamespace)
 	{
-		$this->sNamespace = $sNamespace;
+		$this->Namespace = $sNamespace;
 
 		return $this;
 	}
@@ -172,8 +190,15 @@ class FolderCollection extends \MailSo\Base\Collection
 
 					if (!isset($aSortedByLenImapFolders[$sNonExistenFolderFullNameRaw]))
 					{
-						$aAddedFolders[$sNonExistenFolderFullNameRaw] =
-							Folder::NewNonExistenInstance($sNonExistenFolderFullNameRaw, $sDelimiter);
+						try
+						{
+							$aAddedFolders[$sNonExistenFolderFullNameRaw] =
+								Folder::NewNonExistenInstance($sNonExistenFolderFullNameRaw, $sDelimiter);
+						}
+						catch (\Exception $oExc)
+						{
+							unset($oExc);
+						}
 					}
 				}
 			}
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index ce428e586..ea8665381 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -179,33 +179,41 @@ class MailClient
 	 */
 	private function getEnvelopeOrHeadersRequestString()
 	{
-		return \MailSo\Imap\Enumerations\FetchType::BODY_HEADER_PEEK;
+		if (\MailSo\Config::$MessageAllHeaders)
+		{
+			return \MailSo\Imap\Enumerations\FetchType::BODY_HEADER_PEEK;
+		}
 
-//		return \MailSo\Imap\Enumerations\FetchType::ENVELOPE;
+		return \MailSo\Imap\Enumerations\FetchType::BuildBodyCustomHeaderRequest(array(
+			\MailSo\Mime\Enumerations\Header::RETURN_PATH,
+			\MailSo\Mime\Enumerations\Header::RECEIVED,
+			\MailSo\Mime\Enumerations\Header::MIME_VERSION,
+			\MailSo\Mime\Enumerations\Header::MESSAGE_ID,
+			\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
+			\MailSo\Mime\Enumerations\Header::FROM_,
+			\MailSo\Mime\Enumerations\Header::TO_,
+			\MailSo\Mime\Enumerations\Header::CC,
+			\MailSo\Mime\Enumerations\Header::BCC,
+			\MailSo\Mime\Enumerations\Header::SENDER,
+			\MailSo\Mime\Enumerations\Header::REPLY_TO,
+			\MailSo\Mime\Enumerations\Header::DELIVERED_TO,
+			\MailSo\Mime\Enumerations\Header::IN_REPLY_TO,
+			\MailSo\Mime\Enumerations\Header::REFERENCES,
+			\MailSo\Mime\Enumerations\Header::DATE,
+			\MailSo\Mime\Enumerations\Header::SUBJECT,
+			\MailSo\Mime\Enumerations\Header::SENSITIVITY,
+			\MailSo\Mime\Enumerations\Header::X_MSMAIL_PRIORITY,
+			\MailSo\Mime\Enumerations\Header::IMPORTANCE,
+			\MailSo\Mime\Enumerations\Header::X_PRIORITY,
+			\MailSo\Mime\Enumerations\Header::X_DRAFT_INFO,
+			\MailSo\Mime\Enumerations\Header::RETURN_RECEIPT_TO,
+			\MailSo\Mime\Enumerations\Header::DISPOSITION_NOTIFICATION_TO,
+			\MailSo\Mime\Enumerations\Header::X_CONFIRM_READING_TO,
+			\MailSo\Mime\Enumerations\Header::AUTHENTICATION_RESULTS,
+			\MailSo\Mime\Enumerations\Header::X_DKIM_AUTHENTICATION_RESULTS,
+		), true);
 //
-//		return \MailSo\Imap\Enumerations\FetchType::BuildBodyCustomHeaderRequest(array(
-//			\MailSo\Mime\Enumerations\Header::RETURN_PATH,
-//			\MailSo\Mime\Enumerations\Header::RECEIVED,
-//			\MailSo\Mime\Enumerations\Header::MIME_VERSION,
-//			\MailSo\Mime\Enumerations\Header::MESSAGE_ID,
-//			\MailSo\Mime\Enumerations\Header::FROM_,
-//			\MailSo\Mime\Enumerations\Header::TO_,
-//			\MailSo\Mime\Enumerations\Header::CC,
-//			\MailSo\Mime\Enumerations\Header::BCC,
-//			\MailSo\Mime\Enumerations\Header::SENDER,
-//			\MailSo\Mime\Enumerations\Header::REPLY_TO,
-//			\MailSo\Mime\Enumerations\Header::IN_REPLY_TO,
-//			\MailSo\Mime\Enumerations\Header::DATE,
-//			\MailSo\Mime\Enumerations\Header::SUBJECT,
-//			\MailSo\Mime\Enumerations\Header::X_MSMAIL_PRIORITY,
-//			\MailSo\Mime\Enumerations\Header::IMPORTANCE,
-//			\MailSo\Mime\Enumerations\Header::X_PRIORITY,
-//			\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
-//			\MailSo\Mime\Enumerations\Header::REFERENCES,
-//			\MailSo\Mime\Enumerations\Header::X_DRAFT_INFO,
-//			\MailSo\Mime\Enumerations\Header::RECEIVED_SPF,
-//			\MailSo\Mime\Enumerations\Header::AUTHENTICATION_RESULTS,
-//		), true);
+//		return \MailSo\Imap\Enumerations\FetchType::ENVELOPE;
 	}
 
 	/**
@@ -684,16 +692,25 @@ class MailClient
 	 * @param int $iCount
 	 * @param int $iUnseenCount
 	 * @param string $sUidNext
+	 * @param string $sHighestModSeq
 	 *
 	 * @return void
 	 */
-	protected function initFolderValues($sFolderName, &$iCount, &$iUnseenCount, &$sUidNext)
+	protected function initFolderValues($sFolderName, &$iCount, &$iUnseenCount,
+		&$sUidNext, &$sHighestModSeq = '')
 	{
-		$aFolderStatus = $this->oImapClient->FolderStatus($sFolderName, array(
+		$aTypes = array(
 			\MailSo\Imap\Enumerations\FolderResponseStatus::MESSAGES,
 			\MailSo\Imap\Enumerations\FolderResponseStatus::UNSEEN,
 			\MailSo\Imap\Enumerations\FolderResponseStatus::UIDNEXT
-		));
+		);
+
+		if ($this->oImapClient->IsSupported('CONDSTORE'))
+		{
+			$aTypes[] = \MailSo\Imap\Enumerations\FolderResponseStatus::HIGHESTMODSEQ;
+		}
+
+		$aFolderStatus = $this->oImapClient->FolderStatus($sFolderName, $aTypes);
 
 		$iCount = isset($aFolderStatus[\MailSo\Imap\Enumerations\FolderResponseStatus::MESSAGES])
 			? (int) $aFolderStatus[\MailSo\Imap\Enumerations\FolderResponseStatus::MESSAGES] : 0;
@@ -704,7 +721,11 @@ class MailClient
 		$sUidNext = isset($aFolderStatus[\MailSo\Imap\Enumerations\FolderResponseStatus::UIDNEXT])
 			? (string) $aFolderStatus[\MailSo\Imap\Enumerations\FolderResponseStatus::UIDNEXT] : '0';
 
-		if ($this->IsGmail())
+		$sHighestModSeq = isset($aFolderStatus[\MailSo\Imap\Enumerations\FolderResponseStatus::HIGHESTMODSEQ])
+			? (string) $aFolderStatus[\MailSo\Imap\Enumerations\FolderResponseStatus::HIGHESTMODSEQ] : '';
+
+		if ($this->IsGmail() &&
+			('INBOX' === $sFolderName || '[gmail]' === \strtolower(\substr($sFolderName, 0, 7))))
 		{
 			$oFolder = $this->oImapClient->FolderCurrentInformation();
 			if ($oFolder && null !== $oFolder->Exists && $oFolder->FolderName === $sFolderName)
@@ -735,14 +756,16 @@ class MailClient
 	 * @param int $iCount
 	 * @param int $iUnseenCount
 	 * @param string $sUidNext
+	 * @param string $sHighestModSeq = ''
 	 *
 	 * @return string
 	 */
-	public function GenerateFolderHash($sFolder, $iCount, $iUnseenCount, $sUidNext)
+	public function GenerateFolderHash($sFolder, $iCount, $iUnseenCount, $sUidNext, $sHighestModSeq = '')
 	{
 		$iUnseenCount = 0; // unneccessery
 		return \md5('FolderHash/'.$sFolder.'-'.$iCount.'-'.$iUnseenCount.'-'.$sUidNext.'-'.
-			$this->GenerateImapClientHash()
+			$sHighestModSeq.'-'.$this->GenerateImapClientHash().'-'.
+			\MailSo\Config::$MessageListPermanentFilter
 		);
 	}
 
@@ -833,7 +856,8 @@ class MailClient
 		$aFlags = array();
 
 		$bSelect = false;
-		if ($this->IsGmail())
+		if ($this->IsGmail() &&
+			('INBOX' === $sFolderName || '[gmail]' === \strtolower(\substr($sFolderName, 0, 7))))
 		{
 			$this->oImapClient->FolderSelect($sFolderName);
 			$bSelect = true;
@@ -866,16 +890,18 @@ class MailClient
 		$iCount = 0;
 		$iUnseenCount = 0;
 		$sUidNext = '0';
+		$sHighestModSeq = '';
 
-		$this->initFolderValues($sFolderName, $iCount, $iUnseenCount, $sUidNext);
+		$this->initFolderValues($sFolderName, $iCount, $iUnseenCount, $sUidNext, $sHighestModSeq);
 
 		$aResult = array(
 			'Folder' => $sFolderName,
-			'Hash' => $this->GenerateFolderHash($sFolderName, $iCount, $iUnseenCount, $sUidNext),
+			'Hash' => $this->GenerateFolderHash($sFolderName, $iCount, $iUnseenCount, $sUidNext, $sHighestModSeq),
 			'MessageCount' => $iCount,
 			'MessageUnseenCount' => $iUnseenCount,
 			'UidNext' => $sUidNext,
 			'Flags' => $aFlags,
+			'HighestModSeq' => $sHighestModSeq,
 			'NewMessages' => 'INBOX' === $sFolderName ?
 				$this->getFolderNextMessageInformation($sFolderName, $sPrevUidNext, $sUidNext) : array()
 		);
@@ -897,10 +923,11 @@ class MailClient
 		$iCount = 0;
 		$iUnseenCount = 0;
 		$sUidNext = '0';
+		$sHighestModSeq = '';
 
-		$this->initFolderValues($sFolderName, $iCount, $iUnseenCount, $sUidNext);
+		$this->initFolderValues($sFolderName, $iCount, $iUnseenCount, $sUidNext, $sHighestModSeq);
 
-		return $this->GenerateFolderHash($sFolderName, $iCount, $iUnseenCount, $sUidNext);
+		return $this->GenerateFolderHash($sFolderName, $iCount, $iUnseenCount, $sUidNext, $sHighestModSeq);
 	}
 
 	/**
@@ -1013,7 +1040,7 @@ class MailClient
 
 		$sReg = 'e?mail|from|to|subject|has|is|date|text|body|size|larger|bigger|smaller|maxsize|minsize';
 
-		$sSearch = \trim(\preg_replace('/[\s]+/', ' ', $sSearch));
+		$sSearch = \MailSo\Base\Utils::StripSpaces($sSearch);
 		$sSearch = \trim(\preg_replace('/('.$sReg.'): /i', '\\1:', $sSearch));
 
 		$mMatch = array();
@@ -1060,7 +1087,7 @@ class MailClient
 					$sSearch = \str_replace($sToken, '', $sSearch);
 				}
 
-				$sSearch = \trim(\preg_replace('/[\s]+/', ' ', $sSearch));
+				$sSearch = \MailSo\Base\Utils::StripSpaces($sSearch);
 			}
 
 			foreach ($mMatch[1] as $iIndex => $sName)
@@ -1124,12 +1151,13 @@ class MailClient
 
 	/**
 	 * @param string $sSearch
+	 * @param string $sFilter
 	 * @param int $iTimeZoneOffset = 0
 	 * @param bool $bUseCache = true
 	 *
 	 * @return string
 	 */
-	private function getImapSearchCriterias($sSearch, $iTimeZoneOffset = 0, &$bUseCache = true)
+	private function getImapSearchCriterias($sSearch, $sFilter, $iTimeZoneOffset = 0, &$bUseCache = true)
 	{
 		$bUseCache = true;
 		$iTimeFilter = 0;
@@ -1317,12 +1345,9 @@ class MailClient
 							{
 								$aCriteriasResult[] = 'SINCE';
 								$aCriteriasResult[] = \gmdate('j-M-Y', $iTimeFilter > $iDateStampFrom ?
-									$iDateStampFrom : $iTimeFilter);
+									$iTimeFilter : $iDateStampFrom);
 
-								if (0 < $iTimeFilter && $iTimeFilter > $iDateStampFrom)
-								{
-									$iTimeFilter = 0;
-								}
+								$iTimeFilter = 0;
 							}
 
 							if (0 < $iDateStampTo)
@@ -1336,7 +1361,7 @@ class MailClient
 
 				if ('' !== \trim($sMainText))
 				{
-					$sMainText = \trim(\trim(preg_replace('/[\s]+/', ' ', $sMainText)), '"');
+					$sMainText = \trim(\MailSo\Base\Utils::StripSpaces($sMainText), '"');
 					if ($bIsGmail)
 					{
 						$sGmailRawSearch .= ' '.$sMainText;
@@ -1370,6 +1395,21 @@ class MailClient
 			$sCriteriasResult .= ' SINCE '.\gmdate('j-M-Y', $iTimeFilter);
 		}
 
+		$sCriteriasResult = \trim($sCriteriasResult);
+		$sCriteriasResult .= ' NOT DELETED';
+
+		$sFilter = \trim($sFilter);
+		if ('' !== $sFilter)
+		{
+			$sCriteriasResult .= ' '.$sFilter;
+		}
+
+		$sCriteriasResult = \trim($sCriteriasResult);
+		if ('' !== \MailSo\Config::$MessageListPermanentFilter)
+		{
+			$sCriteriasResult .= ' '.\MailSo\Config::$MessageListPermanentFilter;
+		}
+
 		$sCriteriasResult = \trim($sCriteriasResult);
 		if ('' === $sCriteriasResult)
 		{
@@ -1658,7 +1698,8 @@ class MailClient
 				\MailSo\Imap\Enumerations\FetchType::INTERNALDATE,
 				\MailSo\Imap\Enumerations\FetchType::FLAGS,
 				\MailSo\Imap\Enumerations\FetchType::BODYSTRUCTURE,
-				$bSimple ? $this->getEnvelopeOrHeadersRequestStringForSimpleList() :
+				$bSimple ?
+					$this->getEnvelopeOrHeadersRequestStringForSimpleList() :
 					$this->getEnvelopeOrHeadersRequestString()
 			), \MailSo\Base\Utils::PrepearFetchSequence($aRequestIndexOrUids), $bIndexAsUid);
 
@@ -1701,31 +1742,66 @@ class MailClient
 	}
 
 	/**
-	 * @param string $sSearch
 	 * @param string $sFolderName
-	 * @param string|bool $sFolderHash
-	 * @param bool $bUseSortIfSupported = true
-	 * @param bool $bUseESearchOrESortRequest = false
-	 * @param \MailSo\Cache\CacheClient|null $oCacher = null
+	 * @param array $aUids
 	 *
-	 * @return Array|bool
+	 * @return \MailSo\Mail\MessageCollection
+	 *
+	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
+	 * @throws \MailSo\Net\Exceptions\Exception
+	 * @throws \MailSo\Imap\Exceptions\Exception
 	 */
-	private function getSearchUidsResult($sSearch, $sFolderName, $sFolderHash,
-		$bUseSortIfSupported = true, $bUseESearchOrESortRequest = false, $oCacher = null)
+	public function MessageListSimple($sFolderName, $aUids)
+	{
+		if (0 === \strlen($sFolderName) || !\MailSo\Base\Validator::NotEmptyArray($aUids))
+		{
+			throw new \MailSo\Base\Exceptions\InvalidArgumentException();
+		}
+
+		$this->oImapClient->FolderExamine($sFolderName);
+
+		$oMessageCollection = \MailSo\Mail\MessageCollection::NewInstance();
+		$oMessageCollection->FolderName = $sFolderName;
+
+		$this->MessageListByRequestIndexOrUids($oMessageCollection, $aUids, true, true);
+
+		return $oMessageCollection->GetAsArray();
+	}
+
+	/**
+	 * @param \MailSo\Cache\CacheClient|null $oCacher
+	 * @param string $sSearch
+	 * @param string $sFilter
+	 * @param string $sFolderName
+	 * @param string $sFolderHash
+	 * @param bool $bUseSortIfSupported = false
+	 *
+	 * @return array
+	 *
+	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
+	 * @throws \MailSo\Net\Exceptions\Exception
+	 * @throws \MailSo\Imap\Exceptions\Exception
+	 */
+	public function GetUids($oCacher, $sSearch, $sFilter, $sFolderName, $sFolderHash, $bUseSortIfSupported = false)
 	{
 		$aResultUids = false;
 		$bUidsFromCacher = false;
 		$bUseCacheAfterSearch = true;
+
 		$sSerializedHash = '';
+		$sSerializedLog = '';
 
-		$bESortSupported = $bUseSortIfSupported && $bUseESearchOrESortRequest ? $this->oImapClient->IsSupported('ESORT') : false;
-		$bESearchSupported = $bUseESearchOrESortRequest ? $this->oImapClient->IsSupported('ESEARCH') : false;
-		$bUseSortIfSupported = $bUseSortIfSupported ? $this->oImapClient->IsSupported('SORT') : false;
+		$bUseSortIfSupported = $bUseSortIfSupported ? !!$this->oImapClient->IsSupported('SORT') : false;
 
-		$sSearchCriterias = $this->getImapSearchCriterias($sSearch, 0, $bUseCacheAfterSearch);
+		if (0 < \strlen($sSearch))
+		{
+			$bUseSortIfSupported = false;
+		}
+
+		$sSearchCriterias = $this->getImapSearchCriterias($sSearch, $sFilter, 0, $bUseCacheAfterSearch);
 		if ($bUseCacheAfterSearch && $oCacher && $oCacher->IsInited())
 		{
-			$sSerializedHash = 'SearchSortUids/'.
+			$sSerializedHash = 'GetUids/'.
 				($bUseSortIfSupported ? 'S': 'N').'/'.
 				$this->GenerateImapClientHash().'/'.
 				$sFolderName.'/'.$sSearchCriterias;
@@ -1754,71 +1830,10 @@ class MailClient
 
 		if (!\is_array($aResultUids))
 		{
-			if ($bUseSortIfSupported)
-			{
-				if ($bESortSupported)
-				{
-					$aESorthData = $this->oImapClient->MessageSimpleESort(array('ARRIVAL'), $sSearchCriterias, array('ALL'), true, '');
-					if (isset($aESorthData['ALL']))
-					{
-						$aResultUids = \MailSo\Base\Utils::ParseFetchSequence($aESorthData['ALL']);
-						$aResultUids = \array_reverse($aResultUids);
-					}
-
-					unset($aESorthData);
-				}
-				else
-				{
-					$aResultUids = $this->oImapClient->MessageSimpleSort(array('REVERSE ARRIVAL'), $sSearchCriterias, true);
-				}
-			}
-			else
-			{
-				if (!\MailSo\Base\Utils::IsAscii($sSearch))
-				{
-					try
-					{
-						if ($bESearchSupported)
-						{
-							$aESearchData = $this->oImapClient->MessageSimpleESearch($sSearchCriterias, array('ALL'), true, '', 'UTF-8');
-							if (isset($aESearchData['ALL']))
-							{
-								$aResultUids = \MailSo\Base\Utils::ParseFetchSequence($aESearchData['ALL']);
-								$aResultUids = \array_reverse($aResultUids);
-							}
-							unset($aESearchData);
-						}
-						else
-						{
-							$aResultUids = $this->oImapClient->MessageSimpleSearch($sSearchCriterias, true, 'UTF-8');
-						}
-					}
-					catch (\MailSo\Imap\Exceptions\NegativeResponseException $oException)
-					{
-						$oException = null;
-						$aResultUids = false;
-					}
-				}
-
-				if (false === $aResultUids)
-				{
-					if ($bESearchSupported)
-					{
-						$aESearchData = $this->oImapClient->MessageSimpleESearch($sSearchCriterias, array('ALL'), true);
-						if (isset($aESearchData['ALL']))
-						{
-							$aResultUids = \MailSo\Base\Utils::ParseFetchSequence($aESearchData['ALL']);
-							$aResultUids = \array_reverse($aResultUids);
-						}
-
-						unset($aESearchData);
-					}
-					else
-					{
-						$aResultUids = $this->oImapClient->MessageSimpleSearch($sSearchCriterias, true);
-					}
-				}
-			}
+			$aResultUids = $bUseSortIfSupported ?
+				$this->oImapClient->MessageSimpleSort(array('REVERSE ARRIVAL'), $sSearchCriterias, true) :
+				$this->oImapClient->MessageSimpleSearch($sSearchCriterias, true)
+			;
 
 			if (!$bUidsFromCacher && $bUseCacheAfterSearch && \is_array($aResultUids) && $oCacher && $oCacher->IsInited() && 0 < \strlen($sSerializedHash))
 			{
@@ -1837,80 +1852,6 @@ class MailClient
 		return $aResultUids;
 	}
 
-	/**
-	 * @param string $sFolderName
-	 * @param string $sFolderHash
-	 * @param string $sUid
-	 * @param \MailSo\Cache\CacheClient|null $oCacher = null
-	 *
-	 * @return array
-	 */
-	public function MessageThreadUidsFromCache($sFolderName, $sFolderHash, $sUid, $oCacher = null)
-	{
-		$aResult = array();
-		if (0 < \strlen($sFolderName) && 0 < \strlen($sFolderHash)  && 0 < \strlen($sUid) && $oCacher && $oCacher->IsInited())
-		{
-			$mThreads = $this->MessageListThreadsMap($sFolderName, $sFolderHash, array(), $oCacher, true);
-
-			if (\is_array($mThreads))
-			{
-				$iUid = (int) $sUid;
-				foreach ($mThreads as $iSubUid => $aSubUids)
-				{
-					if ($iUid === $iSubUid)
-					{
-						$aResult = $aSubUids;
-						if (!\is_array($aResult))
-						{
-							$aResult = array();
-						}
-
-						\array_unshift($aResult, $iSubUid);
-						break;
-					}
-					else if (\is_array($aSubUids))
-					{
-						if (\in_array($iUid, $aSubUids))
-						{
-							$aResult = $aSubUids;
-							\array_unshift($aResult, $iSubUid);
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return \array_map('trim', $aResult);
-	}
-
-	/**
-	 * @param string $sFolderName
-	 * @param array $aUids
-	 *
-	 * @return \MailSo\Mail\MessageCollection
-	 *
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
-	 */
-	public function MessageListSimple($sFolderName, $aUids)
-	{
-		if (0 === \strlen($sFolderName) || !\MailSo\Base\Validator::NotEmptyArray($aUids))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException();
-		}
-
-		$this->oImapClient->FolderExamine($sFolderName);
-
-		$oMessageCollection = \MailSo\Mail\MessageCollection::NewInstance();
-		$oMessageCollection->FolderName = $sFolderName;
-
-		$this->MessageListByRequestIndexOrUids($oMessageCollection, $aUids, true, true);
-
-		return $oMessageCollection->GetAsArray();
-	}
-
 	/**
 	 * @param string $sFolderName
 	 * @param int $iOffset = 0
@@ -1921,6 +1862,8 @@ class MailClient
 	 * @param bool $bUseSortIfSupported = false
 	 * @param bool $bUseThreadSortIfSupported = false
 	 * @param bool $bUseESearchOrESortRequest = false
+	 * @param string $sThreadUid = ''
+	 * @param string $sFilter = ''
 	 *
 	 * @return \MailSo\Mail\MessageCollection
 	 *
@@ -1929,8 +1872,9 @@ class MailClient
 	 * @throws \MailSo\Imap\Exceptions\Exception
 	 */
 	public function MessageList($sFolderName, $iOffset = 0, $iLimit = 10, $sSearch = '', $sPrevUidNext = '', $oCacher = null,
-		$bUseSortIfSupported = false, $bUseThreadSortIfSupported = false, $bUseESearchOrESortRequest = false)
+		$bUseSortIfSupported = false, $bUseThreadSortIfSupported = false, $sThreadUid = '', $sFilter = '')
 	{
+		$sFilter = \trim($sFilter);
 		$sSearch = \trim($sSearch);
 		if (!\MailSo\Base\Validator::RangeInt($iOffset, 0) ||
 			!\MailSo\Base\Validator::RangeInt($iLimit, 0, 999))
@@ -1938,6 +1882,8 @@ class MailClient
 			throw new \MailSo\Base\Exceptions\InvalidArgumentException();
 		}
 
+		$bUseFilter = '' !== $sFilter;
+
 		$this->oImapClient->FolderSelect($sFolderName);
 
 		$oMessageCollection = MessageCollection::NewInstance();
@@ -1945,30 +1891,52 @@ class MailClient
 		$oMessageCollection->Offset = $iOffset;
 		$oMessageCollection->Limit = $iLimit;
 		$oMessageCollection->Search = $sSearch;
+		$oMessageCollection->ThreadUid = $sThreadUid;
+		$oMessageCollection->Filtered = '' !== \MailSo\Config::$MessageListPermanentFilter;
 
-		$aThreads = array();
+		$aUids = array();
+		$mAllSortedUids = null;
+		$mAllThreads = null;
+
+		$iThreadUid = empty($sThreadUid) ? 0 : (int) $sThreadUid;
 
-		$iMessageCount = 0;
 		$iMessageRealCount = 0;
 		$iMessageUnseenCount = 0;
 		$sUidNext = '0';
+		$sHighestModSeq = '';
 
 		$bUseSortIfSupported = $bUseSortIfSupported ? $this->oImapClient->IsSupported('SORT') : false;
 
 		$bUseThreadSortIfSupported = $bUseThreadSortIfSupported ?
 			($this->oImapClient->IsSupported('THREAD=REFS') || $this->oImapClient->IsSupported('THREAD=REFERENCES') || $this->oImapClient->IsSupported('THREAD=ORDEREDSUBJECT')) : false;
 
+		if (!empty($sThreadUid) && !$bUseThreadSortIfSupported)
+		{
+			throw new \MailSo\Base\Exceptions\InvalidArgumentException();
+		}
+
 		if (!$oCacher || !($oCacher instanceof \MailSo\Cache\CacheClient))
 		{
 			$oCacher = null;
 		}
 
-		$this->initFolderValues($sFolderName, $iMessageRealCount, $iMessageUnseenCount, $sUidNext);
-		$iMessageCount = $iMessageRealCount;
+		$this->initFolderValues($sFolderName, $iMessageRealCount, $iMessageUnseenCount, $sUidNext, $sHighestModSeq);
+
+		if ($bUseFilter)
+		{
+			$iMessageUnseenCount = 0;
+		}
+
+		$oMessageCollection->FolderHash = $this->GenerateFolderHash(
+			$sFolderName, $iMessageRealCount, $iMessageUnseenCount, $sUidNext, $sHighestModSeq);
 
-		$oMessageCollection->FolderHash = $this->GenerateFolderHash($sFolderName, $iMessageRealCount, $iMessageUnseenCount, $sUidNext);
 		$oMessageCollection->UidNext = $sUidNext;
-		$oMessageCollection->NewMessages = $this->getFolderNextMessageInformation($sFolderName, $sPrevUidNext, $sUidNext);
+
+		if (empty($sThreadUid) && 0 < \strlen($sPrevUidNext) && 'INBOX' === $sFolderName)
+		{
+			$oMessageCollection->NewMessages = $this->getFolderNextMessageInformation(
+				$sFolderName, $sPrevUidNext, $sUidNext);
+		}
 
 		$bSearch = false;
 		$bMessageListOptimization = 0 < \MailSo\Config::$MessageListCountLimitTrigger &&
@@ -1978,98 +1946,121 @@ class MailClient
 		{
 			$bUseSortIfSupported = false;
 			$bUseThreadSortIfSupported = false;
-			$bUseESearchOrESortRequest = false;
 		}
 
 		if (0 < $iMessageRealCount)
 		{
-			$bIndexAsUid = false;
-			$aIndexOrUids = array();
+			$mAllSortedUids = $this->GetUids($oCacher, '', $sFilter,
+				$oMessageCollection->FolderName, $oMessageCollection->FolderHash, $bUseSortIfSupported);
 
-			if (0 < \strlen($sSearch))
-			{
-				$aIndexOrUids = $this->getSearchUidsResult($sSearch,
-					$oMessageCollection->FolderName, $oMessageCollection->FolderHash,
-					$bUseSortIfSupported, $bUseESearchOrESortRequest, $oCacher);
+			$mAllThreads = $bUseThreadSortIfSupported ? $this->MessageListThreadsMap(
+				$oMessageCollection->FolderName, $oMessageCollection->FolderHash, $mAllSortedUids, $oCacher) : null;
 
-				$bIndexAsUid = true;
-			}
-			else
+			if ($bUseThreadSortIfSupported && 0 < $iThreadUid && \is_array($mAllThreads))
 			{
-				if ($bUseThreadSortIfSupported && 1 < $iMessageCount)
+				$aUids = array();
+				$iResultRootUid = 0;
+
+				if (isset($mAllThreads[$iThreadUid]))
 				{
-					$aIndexOrUids = $this->getSearchUidsResult('',
-						$oMessageCollection->FolderName, $oMessageCollection->FolderHash,
-						$bUseSortIfSupported, $bUseESearchOrESortRequest, $oCacher);
-
-					$aThreads = $this->MessageListThreadsMap(
-						$oMessageCollection->FolderName, $oMessageCollection->FolderHash,
-						$aIndexOrUids, $oCacher);
-
-					$aNewIndexOrUids = array();
-					foreach ($aIndexOrUids as $iUid)
+					$iResultRootUid = $iThreadUid;
+					if (\is_array($mAllThreads[$iThreadUid]))
 					{
-						if (isset($aThreads[$iUid]))
-						{
-							$aNewIndexOrUids[] = $iUid;
-						}
+						$aUids = $mAllThreads[$iThreadUid];
 					}
-
-					$aIndexOrUids = $aNewIndexOrUids;
-					unset($aNewIndexOrUids);
-
-					$iMessageCount = \count($aIndexOrUids);
-					$bIndexAsUid = true;
 				}
 				else
 				{
-					$aIndexOrUids = array(1);
-					$bIndexAsUid = false;
-
-					if (1 < $iMessageCount)
+					foreach ($mAllThreads as $iRootUid => $mSubUids)
 					{
-						if (0 === \MailSo\Config::$MessageListDateFilter &&
-							($bMessageListOptimization || !$bUseSortIfSupported))
+						if (\is_array($mSubUids) && \in_array($iThreadUid, $mSubUids))
 						{
-							$aIndexOrUids = \array_reverse(\range(1, $iMessageCount));
-						}
-						else
-						{
-							$aIndexOrUids = $this->getSearchUidsResult('',
-								$oMessageCollection->FolderName, $oMessageCollection->FolderHash,
-								$bUseSortIfSupported, $bUseESearchOrESortRequest, $oCacher);
-
-							$bIndexAsUid = true;
+							$iResultRootUid = $iRootUid;
+							$aUids = $mSubUids;
+							continue;
 						}
 					}
 				}
+
+				if (0 < $iResultRootUid && \in_array($iResultRootUid, $mAllSortedUids))
+				{
+					\array_unshift($aUids, $iResultRootUid);
+				}
+			}
+			else if ($bUseThreadSortIfSupported && \is_array($mAllThreads))
+			{
+				$aUids = \array_keys($mAllThreads);
+			}
+			else
+			{
+				$bUseThreadSortIfSupported = false;
+				$aUids = $mAllSortedUids;
 			}
 
-			if (\is_array($aIndexOrUids))
+			if (0 < \strlen($sSearch) && \is_array($aUids))
+			{
+				$aSearchedUids = $this->GetUids($oCacher, $sSearch, $sFilter,
+					$oMessageCollection->FolderName, $oMessageCollection->FolderHash);
+
+				if (\is_array($aSearchedUids) && 0 < \count($aSearchedUids))
+				{
+					$aFlippedSearchedUids = \array_flip($aSearchedUids);
+
+					$bSearch = true;
+					$aNewUids = array();
+
+					foreach ($aUids as $iUid)
+					{
+						if (isset($aFlippedSearchedUids[$iUid]))
+						{
+							$aNewUids[] = $iUid;
+						}
+						else if ($bUseThreadSortIfSupported && 0 === $iThreadUid && isset($mAllThreads[$iUid]) && \is_array($mAllThreads[$iUid]))
+						{
+							foreach ($mAllThreads[$iUid] as $iSubUid)
+							{
+								if (isset($aFlippedSearchedUids[$iSubUid]))
+								{
+									$aNewUids[] = $iUid;
+									continue;
+								}
+							}
+						}
+					}
+
+					$aUids = \array_unique($aNewUids);
+					unset($aNewUids);
+				}
+				else
+				{
+					$aUids = array();
+				}
+			}
+
+			if (\is_array($aUids))
 			{
 				$oMessageCollection->MessageCount = $iMessageRealCount;
 				$oMessageCollection->MessageUnseenCount = $iMessageUnseenCount;
-				$oMessageCollection->MessageResultCount = 0 === \strlen($sSearch)
-					? $iMessageCount : \count($aIndexOrUids);
+				$oMessageCollection->MessageResultCount = \count($aUids);
 
-				if (0 < \count($aIndexOrUids))
+				if (0 < \count($aUids))
 				{
 					$iOffset = (0 > $iOffset) ? 0 : $iOffset;
-					$aRequestIndexOrUids = \array_slice($aIndexOrUids, $iOffset, $iLimit);
+					$aRequestUids = \array_slice($aUids, $iOffset, $iLimit);
 
-					$this->MessageListByRequestIndexOrUids($oMessageCollection, $aRequestIndexOrUids, $bIndexAsUid);
+					$this->MessageListByRequestIndexOrUids($oMessageCollection, $aRequestUids, true);
 				}
 			}
 		}
 
-		if (!$bSearch && $bUseThreadSortIfSupported && 0 < \count($aThreads))
+		if ($bUseThreadSortIfSupported && 0 === $iThreadUid && \is_array($mAllThreads) && 0 < \count($mAllThreads))
 		{
-			$oMessageCollection->ForeachList(function (/* @var $oMessage \MailSo\Mail\Message */ $oMessage) use ($aThreads) {
+			$oMessageCollection->ForeachList(function (/* @var $oMessage \MailSo\Mail\Message */ $oMessage) use ($mAllThreads) {
 
 				$iUid = $oMessage->Uid();
-				if (isset($aThreads[$iUid]) && \is_array($aThreads[$iUid]) && 0 < \count($aThreads[$iUid]))
+				if (isset($mAllThreads[$iUid]) && \is_array($mAllThreads[$iUid]) && 0 < \count($mAllThreads[$iUid]))
 				{
-					$aSubThreads = $aThreads[$iUid];
+					$aSubThreads = $mAllThreads[$iUid];
 					\array_unshift($aSubThreads, $iUid);
 
 					$oMessage->SetThreads(\array_map('trim', $aSubThreads));
@@ -2263,7 +2254,10 @@ class MailClient
 			{
 				$aSubscribedFolders = $this->oImapClient->FolderSubscribeList($sParent, $sListPattern);
 			}
-			catch (\Exception $oException) {}
+			catch (\Exception $oException)
+			{
+				unset($oException);
+			}
 		}
 
 		$aImapSubscribedFoldersHelper = null;
@@ -2336,7 +2330,6 @@ class MailClient
 			$oFolderCollection->IsThreadsSupported = $this->IsThreadsSupported();
 		}
 
-
 		return $oFolderCollection;
 	}
 
@@ -2554,7 +2547,7 @@ class MailClient
 		$this->oImapClient->FolderSelect($sFolderFullNameRaw);
 
 		$oFolderInformation = $this->oImapClient->FolderCurrentInformation();
-		if ($oFolderInformation && 0 < $oFolderInformation->Exists) // STATUS?
+		if ($oFolderInformation && $oFolderInformation->Exists && 0 < $oFolderInformation->Exists) // STATUS?
 		{
 			$this->oImapClient->MessageStoreFlag('1:*', false,
 				array(\MailSo\Imap\Enumerations\MessageFlag::DELETED),
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/Message.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/Message.php
index 7424f1bbf..029b5b748 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/Message.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/Message.php
@@ -620,8 +620,8 @@ class Message
 			$this->oDeliveredTo = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::DELIVERED_TO, $bCharsetAutoDetect);
 
 			$this->sInReplyTo = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::IN_REPLY_TO);
-			$this->sReferences = \trim(\preg_replace('/[\s]+/', ' ',
-				$oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::REFERENCES)));
+			$this->sReferences = \MailSo\Base\Utils::StripSpaces(
+				$oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::REFERENCES));
 
 			$sHeaderDate = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::DATE);
 			$this->sHeaderDate = $sHeaderDate;
@@ -751,8 +751,8 @@ class Message
 				$sCharset = \MailSo\Base\Enumerations\Charset::UTF_8;
 			}
 
-			$sHtmlParts = array();
-			$sPlainParts = array();
+			$aHtmlParts = array();
+			$aPlainParts = array();
 
 			foreach ($aTextParts as $oPart)
 			{
@@ -782,22 +782,27 @@ class Message
 
 					if ('text/html' === $oPart->ContentType())
 					{
-						$sHtmlParts[] = $sText;
+						$aHtmlParts[] = $sText;
 					}
 					else
 					{
-						$sPlainParts[] = $sText;
+						if ($oPart->IsFlowedFormat())
+						{
+							$sText = \MailSo\Base\Utils::DecodeFlowedFormat($sText);
+						}
+
+						$aPlainParts[] = $sText;
 					}
 				}
 			}
 
-			if (0 < \count($sHtmlParts))
+			if (0 < \count($aHtmlParts))
 			{
-				$this->sHtml = \implode('
', $sHtmlParts);
+				$this->sHtml = \implode('
', $aHtmlParts);
 			}
 			else
 			{
-				$this->sPlain = \trim(\implode("\n", $sPlainParts));
+				$this->sPlain = \trim(\implode("\n", $aPlainParts));
 			}
 
 			$aMatch = array();
@@ -813,7 +818,7 @@ class Message
 				$this->bPgpEncrypted = true;
 			}
 
-			unset($sHtmlParts, $sPlainParts, $aMatch);
+			unset($aHtmlParts, $aPlainParts, $aMatch);
 		}
 
 //		if (empty($this->sPgpSignature) && 'multipart/signed' === \strtolower($this->sContentType) &&
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php
index 34c8cf884..427a18cac 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php
@@ -62,15 +62,20 @@ class MessageCollection extends \MailSo\Base\Collection
 	 */
 	public $UidNext;
 
+	/**
+	 * @var string
+	 */
+	public $ThreadUid;
+
 	/**
 	 * @var array
 	 */
 	public $NewMessages;
 
 	/**
-	 * @var array
+	 * @var bool
 	 */
-	public $LastCollapsedThreadUids;
+	public $Filtered;
 
 	/**
 	 * @access protected
@@ -108,9 +113,10 @@ class MessageCollection extends \MailSo\Base\Collection
 		$this->Limit = 0;
 		$this->Search = '';
 		$this->UidNext = '';
+		$this->ThreadUid = '';
 		$this->NewMessages = array();
-		
-		$this->LastCollapsedThreadUids = array();
+
+		$this->Filtered = false;
 
 		return $this;
 	}
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Email.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Email.php
index 5e1b8ad68..ee03c6720 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Email.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Email.php
@@ -201,6 +201,8 @@ class Email
 		}
 
 		$sEmail = \trim(\trim($sEmail), '<>');
+		$sEmail = \rtrim(\trim($sEmail), '.');
+		$sEmail = \trim($sEmail);
 
 		$sName = \trim(\trim($sName), '"');
 		$sName = \trim($sName, '\'');
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Parameter.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Parameter.php
index 8facb3ecd..c175df43d 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Parameter.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Parameter.php
@@ -21,6 +21,7 @@ class Parameter
 	const CHARSET = 'charset';
 	const NAME = 'name';
 	const FILENAME = 'filename';
+	const FORMAT = 'format';
 	const BOUNDARY = 'boundary';
 	const PROTOCOL = 'protocol';
 }
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Message.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Message.php
index 7bfaec046..44dfa80b4 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Message.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Message.php
@@ -257,7 +257,7 @@ class Message
 	public function SetReferences($sReferences)
 	{
 		$this->aHeadersValue[\MailSo\Mime\Enumerations\Header::REFERENCES] =
-			\trim(\preg_replace('/[\s]+/', ' ', $sReferences));
+			\MailSo\Base\Utils::StripSpaces($sReferences);
 
 		return $this;
 	}
@@ -511,7 +511,8 @@ class Message
 	 */
 	private function generateNewBoundary()
 	{
-		return '----=_Part_'.rand(100, 999).'_'.rand(100000000, 999999999).'.'.time();
+		return '--='.\MailSo\Config::$BoundaryPrefix.
+			\rand(100, 999).'_'.rand(100000000, 999999999).'.'.\time();
 	}
 
 	/**
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Part.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Part.php
index 9ae9c3aa5..2e19af03f 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Part.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Part.php
@@ -210,6 +210,27 @@ class Part
 			\MailSo\Mime\Enumerations\Header::CONTENT_LOCATION)) : '';
 	}
 
+	/**
+	 * @return bool
+	 */
+	public function IsFlowedFormat()
+	{
+		$bResult = false;
+		if ($this->Headers)
+		{
+			$bResult = 'flowed' === \trim(\strtolower($this->Headers->ParameterValue(
+				\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
+				\MailSo\Mime\Enumerations\Parameter::FORMAT)));
+
+			if ($bResult && \in_array(\strtolower($this->MailEncodingName()), array('base64', 'quoted-printable')))
+			{
+				$bResult = false;
+			}
+		}
+
+		return $bResult;
+	}
+
 	/**
 	 * @return string
 	 */
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Net/NetClient.php b/rainloop/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
index 1eec18afe..3812b6911 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
@@ -557,11 +557,11 @@ abstract class NetClient
 	 *
 	 * @return void
 	 */
-	protected function writeLog($sDesc, $iDescType = \MailSo\Log\Enumerations\Type::INFO)
+	protected function writeLog($sDesc, $iDescType = \MailSo\Log\Enumerations\Type::INFO, $bDiplayCrLf = false)
 	{
 		if ($this->oLogger)
 		{
-			$this->oLogger->Write($sDesc, $iDescType, $this->getLogName());
+			$this->oLogger->Write($sDesc, $iDescType, $this->getLogName(), true, $bDiplayCrLf);
 		}
 	}
 
@@ -573,7 +573,7 @@ abstract class NetClient
 	 */
 	protected function writeLogWithCrlf($sDesc, $iDescType = \MailSo\Log\Enumerations\Type::INFO)
 	{
-		$this->writeLog(\strtr($sDesc, array("\r" => '\r', "\n" => '\n')), $iDescType);
+		$this->writeLog($sDesc, $iDescType, true);
 	}
 
 	/**
diff --git a/rainloop/v/0.0.0/app/libraries/PHPThumb/GD.php b/rainloop/v/0.0.0/app/libraries/PHPThumb/GD.php
index 190d8a0ad..733fe476c 100644
--- a/rainloop/v/0.0.0/app/libraries/PHPThumb/GD.php
+++ b/rainloop/v/0.0.0/app/libraries/PHPThumb/GD.php
@@ -1353,13 +1353,13 @@ class GD extends PHPThumb
 
         switch ($this->format) {
             case 'GIF':
-                $isCompatible = $gdInfo['GIF Create Support'];
+                $isCompatible = isset($gdInfo['GIF Create Support']);
                 break;
             case 'JPG':
                 $isCompatible = (isset($gdInfo['JPG Support']) || isset($gdInfo['JPEG Support'])) ? true : false;
                 break;
             case 'PNG':
-                $isCompatible = $gdInfo[$this->format . ' Support'];
+                $isCompatible = isset($gdInfo[$this->format . ' Support']);
                 break;
             default:
                 $isCompatible = false;
@@ -1367,7 +1367,7 @@ class GD extends PHPThumb
 
         if (!$isCompatible) {
             // one last check for "JPEG" instead
-            $isCompatible = $gdInfo['JPEG Support'];
+            $isCompatible = isset($gdInfo['JPEG Support']);
 
             if (!$isCompatible) {
                 throw new \Exception("Your GD installation does not support {$this->format} image types");
diff --git a/rainloop/v/0.0.0/app/libraries/PHPThumb/PHPThumb.php b/rainloop/v/0.0.0/app/libraries/PHPThumb/PHPThumb.php
index 7521b9d90..a86c8c91e 100644
--- a/rainloop/v/0.0.0/app/libraries/PHPThumb/PHPThumb.php
+++ b/rainloop/v/0.0.0/app/libraries/PHPThumb/PHPThumb.php
@@ -27,11 +27,6 @@ abstract class PHPThumb
      */
     protected $fileName;
 
-    /**
-     * @var \Symfony\Component\Filesystem\Filesystem
-     */
-    protected $filesystem;
-
     /**
      * What the file format is (mime-type)
      *
@@ -59,7 +54,6 @@ abstract class PHPThumb
      */
     public function __construct($fileName, array $options = array(), array $plugins = array())
     {
-        $this->filesystem = new \Symfony\Component\Filesystem\Filesystem();
         $this->fileName    = $fileName;
         $this->remoteImage = false;
 
@@ -89,9 +83,9 @@ abstract class PHPThumb
             return true;
         }
 
-        if($this->filesystem->exists($filename)) {
-            return true;
-        }
+		if (file_exists($filename)) {
+			return true;
+		}
 
         return false;
     }
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/.gitignore b/rainloop/v/0.0.0/app/libraries/RainLoop/.gitignore
new file mode 100644
index 000000000..416618dd3
--- /dev/null
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/.gitignore
@@ -0,0 +1,2 @@
+/Prem/**
+/_Prem/**
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index 713062acf..88759c1b5 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -110,6 +110,11 @@ class Actions
 	 */
 	private $oTwoFactorAuthProvider;
 
+	/**
+	 * @var \RainLoop\Providers\Prem
+	 */
+	private $oPremProvider;
+
 	/**
 	 * @var \RainLoop\Config\Application
 	 */
@@ -146,6 +151,7 @@ class Actions
 		$this->oSuggestionsProvider = null;
 		$this->oChangePasswordProvider = null;
 		$this->oTwoFactorAuthProvider = null;
+		$this->oPremProvider = null;
 
 		$this->sSpecAuthToken = '';
 
@@ -188,9 +194,8 @@ class Actions
 	 */
 	public function GetShortLifeSpecAuthToken($iLife = 60)
 	{
-		$sToken = $this->getAuthToken();
-		$aAccountHash = \RainLoop\Utils::DecodeKeyValues($sToken);
-		if (!empty($aAccountHash[0]) && 'token' === $aAccountHash[0] && is_array($aAccountHash))
+		$aAccountHash = \RainLoop\Utils::DecodeKeyValues($this->getLocalAuthToken());
+		if (!empty($aAccountHash[0]) && 'token' === $aAccountHash[0] && \is_array($aAccountHash))
 		{
 			$aAccountHash[10] = \time() + $iLife;
 			return \RainLoop\Utils::EncodeKeyValues($aAccountHash);
@@ -235,74 +240,77 @@ class Actions
 	 */
 	private function fabrica($sName, $oAccount = null)
 	{
-		$oResult = null;
+		$mResult = null;
 		$this->Plugins()
-			->RunHook('main.fabrica', array($sName, &$oResult), false)
-			->RunHook('main.fabrica[2]', array($sName, &$oResult, $oAccount), false)
+			->RunHook('main.fabrica', array($sName, &$mResult), false)
+			->RunHook('main.fabrica[2]', array($sName, &$mResult, $oAccount), false)
 		;
 
-		if (null === $oResult)
+		if (null === $mResult)
 		{
 			switch ($sName)
 			{
 				case 'files':
 					// RainLoop\Providers\Files\IFiles
-					$oResult = new \RainLoop\Providers\Files\FileStorage(APP_PRIVATE_DATA.'storage/files');
+					$mResult = new \RainLoop\Providers\Files\FileStorage(APP_PRIVATE_DATA.'storage/files');
 					break;
 				case 'storage':
 				case 'storage-local':
 					// RainLoop\Providers\Storage\IStorage
-					$oResult = new \RainLoop\Providers\Storage\FileStorage(
+					$mResult = new \RainLoop\Providers\Storage\FileStorage(
 						APP_PRIVATE_DATA.'storage', 'storage-local' === $sName);
 					break;
 				case 'settings':
 				case 'settings-local':
 					// RainLoop\Providers\Settings\ISettings
-					$oResult = new \RainLoop\Providers\Settings\DefaultSettings(
+					$mResult = new \RainLoop\Providers\Settings\DefaultSettings(
 						$this->StorageProvider('settings-local' === $sName));
 					break;
 				case 'login':
 					// \RainLoop\Providers\Login\LoginInterface
-					$oResult = new \RainLoop\Providers\Login\DefaultLogin();
+					$mResult = new \RainLoop\Providers\Login\DefaultLogin();
 					break;
 				case 'domain':
 					// \RainLoop\Providers\Domain\DomainAdminInterface
-					$oResult = new \RainLoop\Providers\Domain\DefaultDomain(APP_PRIVATE_DATA.'domains', $this->Cacher());
+					$mResult = new \RainLoop\Providers\Domain\DefaultDomain(APP_PRIVATE_DATA.'domains', $this->Cacher());
 					break;
 				case 'filters':
 					// \RainLoop\Providers\Filters\FiltersInterface
-					$oResult = new \RainLoop\Providers\Filters\SieveStorage(
+					$mResult = new \RainLoop\Providers\Filters\SieveStorage(
 						$this->Plugins(), $this->Config()
 					);
 					break;
 				case 'address-book':
 					// \RainLoop\Providers\AddressBook\AddressBookInterface
 
-					if (!\RainLoop\Utils::IsOwnCloud()) // disabled for ownCloud
-					{
-						$sDsn = \trim($this->Config()->Get('contacts', 'pdo_dsn', ''));
-						$sUser = \trim($this->Config()->Get('contacts', 'pdo_user', ''));
-						$sPassword = (string) $this->Config()->Get('contacts', 'pdo_password', '');
+					$sDsn = \trim($this->Config()->Get('contacts', 'pdo_dsn', ''));
+					$sUser = \trim($this->Config()->Get('contacts', 'pdo_user', ''));
+					$sPassword = (string) $this->Config()->Get('contacts', 'pdo_password', '');
 
-						$sDsnType = $this->ValidateContactPdoType(\trim($this->Config()->Get('contacts', 'type', 'sqlite')));
-						if ('sqlite' === $sDsnType)
-						{
-							$oResult = new \RainLoop\Providers\AddressBook\PdoAddressBook(
-								'sqlite:'.APP_PRIVATE_DATA.'AddressBook.sqlite', '', '', 'sqlite');
-						}
-						else
-						{
-							$oResult = new \RainLoop\Providers\AddressBook\PdoAddressBook($sDsn, $sUser, $sPassword, $sDsnType);
-						}
+					$sDsnType = $this->ValidateContactPdoType(\trim($this->Config()->Get('contacts', 'type', 'sqlite')));
+					if ('sqlite' === $sDsnType)
+					{
+						$mResult = new \RainLoop\Providers\AddressBook\PdoAddressBook(
+							'sqlite:'.APP_PRIVATE_DATA.'AddressBook.sqlite', '', '', 'sqlite');
+					}
+					else
+					{
+						$mResult = new \RainLoop\Providers\AddressBook\PdoAddressBook($sDsn, $sUser, $sPassword, $sDsnType);
 					}
 					break;
 				case 'suggestions':
-					// \RainLoop\Providers\Suggestions\ISuggestions
-//					$oResult = new \RainLoop\Providers\Suggestions\TestSuggestions();
 
-					if (\RainLoop\Utils::IsOwnCloud())
+					if (null === $mResult)
 					{
-						$oResult = new \RainLoop\Providers\Suggestions\OwnCloudSuggestions();
+						$mResult = array();
+					}
+
+					// \RainLoop\Providers\Suggestions\ISuggestions
+//					$mResult[] = new \RainLoop\Providers\Suggestions\TestSuggestions();
+
+					if (\is_array($mResult) && \RainLoop\Utils::IsOwnCloud())
+					{
+						$mResult[] = new \RainLoop\Providers\Suggestions\OwnCloudSuggestions();
 					}
 
 					break;
@@ -311,19 +319,22 @@ class Actions
 					break;
 				case 'two-factor-auth':
 					// \RainLoop\Providers\TwoFactorAuth\TwoFactorAuthInterface
-					$oResult = new \RainLoop\Providers\TwoFactorAuth\GoogleTwoFactorAuth();
+					$mResult = new \RainLoop\Providers\TwoFactorAuth\GoogleTwoFactorAuth();
 					break;
 			}
 		}
 
-		if ($oResult && \method_exists($oResult, 'SetLogger'))
+		foreach (\is_array($mResult) ? $mResult : array($mResult) as $oItem)
 		{
-			$oResult->SetLogger($this->Logger());
+			if ($oItem && \method_exists($oItem, 'SetLogger'))
+			{
+				$oItem->SetLogger($this->Logger());
+			}
 		}
 
-		$this->Plugins()->RunHook('filter.fabrica', array($sName, &$oResult, $oAccount), false);
+		$this->Plugins()->RunHook('filter.fabrica', array($sName, &$mResult, $oAccount), false);
 
-		return $oResult;
+		return $mResult;
 	}
 
 	/**
@@ -400,15 +411,17 @@ class Actions
 	/**
 	 * @param string $sLine
 	 * @param \RainLoop\Model\Account $oAccount = null
+	 * @param bool $bUrlEncode = false
 	 *
 	 * @return string
 	 */
-	private function compileLogParams($sLine, $oAccount = null)
+	private function compileLogParams($sLine, $oAccount = null, $bUrlEncode = false)
 	{
 		if (false !== \strpos($sLine, '{date:'))
 		{
-			$sLine = \preg_replace_callback('/\{date:([^}]+)\}/', function ($aMatch) {
-				return \gmdate($aMatch[1]);
+			$iTimeOffset = (int) $this->Config()->Get('logs', 'time_offset', 0);
+			$sLine = \preg_replace_callback('/\{date:([^}]+)\}/', function ($aMatch) use ($iTimeOffset, $bUrlEncode) {
+				return \RainLoop\Utils::UrlEncode(\MailSo\Log\Logger::DateHelper($aMatch[1], $iTimeOffset), $bUrlEncode);
 			}, $sLine);
 
 			$sLine = \preg_replace('/\{date:([^}]*)\}/', 'date', $sLine);
@@ -424,25 +437,38 @@ class Actions
 
 			if ($oAccount)
 			{
-				$sLine = \str_replace('{imap:login}', $oAccount->IncLogin(), $sLine);
-				$sLine = \str_replace('{imap:host}', $oAccount->DomainIncHost(), $sLine);
-				$sLine = \str_replace('{imap:port}', $oAccount->DomainIncPort(), $sLine);
+				$sLine = \str_replace('{imap:login}', \RainLoop\Utils::UrlEncode($oAccount->IncLogin(), $bUrlEncode), $sLine);
+				$sLine = \str_replace('{imap:host}', \RainLoop\Utils::UrlEncode($oAccount->DomainIncHost(), $bUrlEncode), $sLine);
+				$sLine = \str_replace('{imap:port}', \RainLoop\Utils::UrlEncode($oAccount->DomainIncPort(), $bUrlEncode), $sLine);
 
-				$sLine = \str_replace('{smtp:login}', $oAccount->OutLogin(), $sLine);
-				$sLine = \str_replace('{smtp:host}', $oAccount->DomainOutHost(), $sLine);
-				$sLine = \str_replace('{smtp:port}', $oAccount->DomainOutPort(), $sLine);
+				$sLine = \str_replace('{smtp:login}', \RainLoop\Utils::UrlEncode($oAccount->OutLogin(), $bUrlEncode), $sLine);
+				$sLine = \str_replace('{smtp:host}', \RainLoop\Utils::UrlEncode($oAccount->DomainOutHost(), $bUrlEncode), $sLine);
+				$sLine = \str_replace('{smtp:port}', \RainLoop\Utils::UrlEncode($oAccount->DomainOutPort(), $bUrlEncode), $sLine);
 			}
 
 			$sLine = \preg_replace('/\{imap:([^}]*)\}/i', 'imap', $sLine);
-			$sLine = \preg_replace('/\{smtp:([^}]*)\}/i', 'imap', $sLine);
+			$sLine = \preg_replace('/\{smtp:([^}]*)\}/i', 'smtp', $sLine);
 		}
 
 		if (false !== \strpos($sLine, '{request:'))
 		{
 			if (false !== \strpos($sLine, '{request:ip}'))
 			{
-				$sLine = \str_replace('{request:ip}', $this->Http()->GetClientIp(
-					$this->Config()->Get('labs', 'http_client_ip_check_proxy', false)), $sLine);
+				$sLine = \str_replace('{request:ip}', \RainLoop\Utils::UrlEncode($this->Http()->GetClientIp(
+					$this->Config()->Get('labs', 'http_client_ip_check_proxy', false)), $bUrlEncode), $sLine);
+			}
+
+			if (false !== \strpos($sLine, '{request:domain}'))
+			{
+				$sLine = \str_replace('{request:domain}',
+					\RainLoop\Utils::UrlEncode($this->Http()->GetHost(false, true, true), $bUrlEncode), $sLine);
+			}
+
+			if (false !== \strpos($sLine, '{request:domain-clear}'))
+			{
+				$sLine = \str_replace('{request:domain-clear}',
+					\RainLoop\Utils::UrlEncode(
+						\MailSo\Base\Utils::GetClearDomainName($this->Http()->GetHost(false, true, true)), $bUrlEncode), $sLine);
 			}
 
 			$sLine = \preg_replace('/\{request:([^}]*)\}/i', 'request', $sLine);
@@ -453,15 +479,16 @@ class Actions
 			if (false !== \strpos($sLine, '{user:uid}'))
 			{
 				$sLine = \str_replace('{user:uid}',
-					\base_convert(\sprintf('%u', \crc32(\md5(\RainLoop\Utils::GetConnectionToken()))), 10, 32),
+					\RainLoop\Utils::UrlEncode(\base_convert(\sprintf('%u',
+						\crc32(\md5(\RainLoop\Utils::GetConnectionToken()))), 10, 32), $bUrlEncode),
 					$sLine
 				);
 			}
 
 			if (false !== \strpos($sLine, '{user:ip}'))
 			{
-				$sLine = \str_replace('{user:ip}', $this->Http()->GetClientIp(
-					$this->Config()->Get('labs', 'http_client_ip_check_proxy', false)), $sLine);
+				$sLine = \str_replace('{user:ip}', \RainLoop\Utils::UrlEncode($this->Http()->GetClientIp(
+					$this->Config()->Get('labs', 'http_client_ip_check_proxy', false)), $bUrlEncode), $sLine);
 			}
 
 			if (\preg_match('/\{user:(email|login|domain)\}/i', $sLine))
@@ -475,9 +502,15 @@ class Actions
 				if ($oAccount)
 				{
 					$sEmail = $oAccount->Email();
-					$sLine = \str_replace('{user:email}', $sEmail, $sLine);
-					$sLine = \str_replace('{user:login}', \MailSo\Base\Utils::GetAccountNameFromEmail($sEmail), $sLine);
-					$sLine = \str_replace('{user:domain}', \MailSo\Base\Utils::GetDomainFromEmail($sEmail), $sLine);
+
+					$sLine = \str_replace('{user:email}', \RainLoop\Utils::UrlEncode($sEmail, $bUrlEncode), $sLine);
+					$sLine = \str_replace('{user:login}', \RainLoop\Utils::UrlEncode(
+						\MailSo\Base\Utils::GetAccountNameFromEmail($sEmail), $bUrlEncode), $sLine);
+					$sLine = \str_replace('{user:domain}', \RainLoop\Utils::UrlEncode(
+						\MailSo\Base\Utils::GetDomainFromEmail($sEmail), $bUrlEncode), $sLine);
+					$sLine = \str_replace('{user:domain-clear}', \RainLoop\Utils::UrlEncode(
+						\MailSo\Base\Utils::GetClearDomainName(
+							\MailSo\Base\Utils::GetDomainFromEmail($sEmail)), $bUrlEncode), $sLine);
 				}
 			}
 
@@ -527,7 +560,7 @@ class Actions
 	public function SetAuthLogoutToken()
 	{
 		@\header('X-RainLoop-Action: Logout');
-		\RainLoop\Utils::SetCookie(self::AUTH_SPEC_LOGOUT_TOKEN_KEY, \md5(APP_START_TIME), 0, '/', null, null, true);
+		\RainLoop\Utils::SetCookie(self::AUTH_SPEC_LOGOUT_TOKEN_KEY, \md5(APP_START_TIME), 0);
 	}
 
 	/**
@@ -539,26 +572,26 @@ class Actions
 	{
 		if ($oAccount)
 		{
-			$sSpecAuthToken = '_'.$oAccount->GetAuthToken();
+			$sSpecAuthToken = '_'.$oAccount->GetAuthTokenQ();
 
 			$this->SetSpecAuthToken($sSpecAuthToken);
-			\RainLoop\Utils::SetCookie(self::AUTH_SPEC_TOKEN_KEY, $sSpecAuthToken, 0, '/', null, null, true);
+			\RainLoop\Utils::SetCookie(self::AUTH_SPEC_TOKEN_KEY, $sSpecAuthToken, 0);
 
 			if ($oAccount->SignMe() && 0 < \strlen($oAccount->SignMeToken()))
 			{
 				\RainLoop\Utils::SetCookie(self::AUTH_SIGN_ME_TOKEN_KEY,
-					\RainLoop\Utils::EncodeKeyValues(array(
+					\RainLoop\Utils::EncodeKeyValuesQ(array(
 						'e' => $oAccount->Email(),
 						't' => $oAccount->SignMeToken()
 					)),
-					\time() + 60 * 60 * 24 * 30, '/', null, null, true);
+					\time() + 60 * 60 * 24 * 30);
 
 				$this->StorageProvider()->Put($oAccount,
 					\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
 					'sign_me',
-					\RainLoop\Utils::EncodeKeyValues(array(
+					\RainLoop\Utils::EncodeKeyValuesQ(array(
 						'Time' => \time(),
-						'AuthToken' => $oAccount->GetAuthToken(),
+						'AuthToken' => $oAccount->GetAuthTokenQ(),
 						'SignMetToken' => $oAccount->SignMeToken()
 					))
 				);
@@ -599,13 +632,13 @@ class Actions
 	 */
 	private function setAdminAuthToken($sToken)
 	{
-		\RainLoop\Utils::SetCookie(self::AUTH_ADMIN_TOKEN_KEY, $sToken, 0, '/', null, null, true);
+		\RainLoop\Utils::SetCookie(self::AUTH_ADMIN_TOKEN_KEY, $sToken, 0);
 	}
 
 	/**
 	 * @return string
 	 */
-	private function getAuthToken()
+	private function getLocalAuthToken()
 	{
 		$sToken = $this->GetSpecAuthToken();
 		return !empty($sToken) && '_' === \substr($sToken, 0, 1) ? \substr($sToken, 1) : '';
@@ -624,7 +657,7 @@ class Actions
 	 */
 	public function ClearAdminAuthToken()
 	{
-		$aAdminHash = \RainLoop\Utils::DecodeKeyValues($this->getAdminAuthToken());
+		$aAdminHash = \RainLoop\Utils::DecodeKeyValuesQ($this->getAdminAuthToken());
 		if (
 			!empty($aAdminHash[0]) && !empty($aAdminHash[1]) && !empty($aAdminHash[2]) &&
 			'token' === $aAdminHash[0] && \md5(APP_SALT) === $aAdminHash[1]
@@ -731,6 +764,28 @@ class Actions
 		return $this->oTwoFactorAuthProvider;
 	}
 
+	/**
+	 * @return \RainLoop\Providers\Prem
+	 */
+	public function PremProvider()
+	{
+		if (null === $this->oPremProvider)
+		{
+			if (\file_exists(APP_VERSION_ROOT_PATH.'app/libraries/RainLoop/Prem/Provider.php'))
+			{
+				$this->oPremProvider = new \RainLoop\Prem\Provider(
+					$this->Config(), $this->Logger(), $this->Cacher(null, true)
+				);
+			}
+			else
+			{
+				$this->oPremProvider = false;
+			}
+		}
+
+		return $this->oPremProvider;
+	}
+
 	/**
 	 * @param bool $bLocal = false
 	 *
@@ -826,7 +881,8 @@ class Actions
 	{
 		if (null === $this->oSuggestionsProvider)
 		{
-			$this->oSuggestionsProvider = new \RainLoop\Providers\Suggestions($this->fabrica('suggestions'));
+			$this->oSuggestionsProvider = new \RainLoop\Providers\Suggestions(
+				$this->fabrica('suggestions'));
 		}
 
 		return $this->oSuggestionsProvider;
@@ -842,9 +898,16 @@ class Actions
 	{
 		if (null === $this->oAddressBookProvider)
 		{
-			$this->oAddressBookProvider = new \RainLoop\Providers\AddressBook(
-				$this->Config()->Get('contacts', 'enable', false) || $bForceEnable ? $this->fabrica('address-book', $oAccount) : null);
+			$oDriver = null;
+			if ($this->GetCapa(false, \RainLoop\Enumerations\Capa::CONTACTS, $oAccount))
+			{
+				if ($this->Config()->Get('contacts', 'enable', false) || $bForceEnable)
+				{
+					$oDriver = $this->fabrica('address-book', $oAccount);
+				}
+			}
 
+			$this->oAddressBookProvider = new \RainLoop\Providers\AddressBook($oDriver);
 			$this->oAddressBookProvider->SetLogger($this->Logger());
 		}
 
@@ -939,6 +1002,20 @@ class Actions
 
 			if (!!$this->Config()->Get('logs', 'enable', false))
 			{
+				$sSessionFilter = (string) $this->Config()->Get('logs', 'session_filter', '');
+				if (!empty($sSessionFilter))
+				{
+					$aSessionParts = \explode(':', $sSessionFilter, 2);
+
+					if (empty($aSessionParts[0]) || empty($aSessionParts[1]) ||
+						(string) $aSessionParts[1] !== (string) \RainLoop\Utils::GetCookie($aSessionParts[0], ''))
+					{
+						return $this->oLogger;
+					}
+				}
+
+				$iTimeOffset = (int) $this->Config()->Get('logs', 'time_offset', 0);
+
 				$this->oLogger->SetShowSecter(!$this->Config()->Get('logs', 'hide_passwords', true));
 
 				$sLogFileFullPath = \APP_PRIVATE_DATA.'logs/'.$this->compileLogFileName(
@@ -956,6 +1033,7 @@ class Actions
 						->WriteOnErrorOnly($this->Config()->Get('logs', 'write_on_error_only', false))
 						->WriteOnPhpErrorOnly($this->Config()->Get('logs', 'write_on_php_error_only', false))
 						->WriteOnTimeoutOnly($this->Config()->Get('logs', 'write_on_timeout_only', 0))
+						->SetTimeOffset($iTimeOffset)
 				);
 
 				if (!$this->Config()->Get('debug', 'enable', false))
@@ -967,7 +1045,10 @@ class Actions
 
 				$oHttp = $this->Http();
 
-				$this->oLogger->Write('[DATE:'.\gmdate('d.m.y').'][RL:'.APP_VERSION.'][PHP:'.PHP_VERSION.'][IP:'.
+				$this->oLogger->Write('[DATE:'.\MailSo\Log\Logger::DateHelper('d.m.y', $iTimeOffset).
+					(0 !== $iTimeOffset ? '][OFFSET:'.(0 < $iTimeOffset ? '+' : '-').
+						\str_pad((string) \abs($iTimeOffset), 2, '0', STR_PAD_LEFT) : '').
+					'][RL:'.APP_VERSION.'][PHP:'.PHP_VERSION.'][IP:'.
 					$oHttp->GetClientIp($this->Config()->Get('labs', 'http_client_ip_check_proxy', false)).'][PID:'.
 					(\MailSo\Base\Utils::FunctionExistsAndEnabled('getmypid') ? \getmypid() : 'unknown').']['.
 					$oHttp->GetServer('SERVER_SOFTWARE', '~').']['.
@@ -1020,9 +1101,13 @@ class Actions
 				$this->oLoggerAuth->AddForbiddenType(\MailSo\Log\Enumerations\Type::TIME);
 				$this->oLoggerAuth->AddForbiddenType(\MailSo\Log\Enumerations\Type::TIME_DELTA);
 
-				$this->oLoggerAuth->Add(
-					\MailSo\Log\Drivers\File::NewInstance($sAuthLogFileFullPath)
-				);
+				$oDriver = \MailSo\Log\Drivers\File::NewInstance($sAuthLogFileFullPath);
+
+				$oDriver->DisableTimePrefix();
+				$oDriver->DisableGuidPrefix();
+				$oDriver->DisableTypedPrefix();
+
+				$this->oLoggerAuth->Add($oDriver);
 			}
 		}
 
@@ -1043,7 +1128,7 @@ class Actions
 			$sRand = '';
 		}
 
-		return '' === $sRand ? '' : \RainLoop\Utils::EncodeKeyValues(array('token', \md5(APP_SALT), $sRand));
+		return '' === $sRand ? '' : \RainLoop\Utils::EncodeKeyValuesQ(array('token', \md5(APP_SALT), $sRand));
 	}
 
 	/**
@@ -1056,7 +1141,7 @@ class Actions
 		$bResult = false;
 		if ($this->Config()->Get('security', 'allow_admin_panel', true))
 		{
-			$aAdminHash = \RainLoop\Utils::DecodeKeyValues($this->getAdminAuthToken());
+			$aAdminHash = \RainLoop\Utils::DecodeKeyValuesQ($this->getAdminAuthToken());
 			if (!empty($aAdminHash[0]) && !empty($aAdminHash[1]) && !empty($aAdminHash[2]) &&
 				'token' === $aAdminHash[0] && \md5(APP_SALT) === $aAdminHash[1] &&
 				'' !== $this->Cacher(null, true)->Get(\RainLoop\KeyPathHelper::SessionAdminKey($aAdminHash[2]), '')
@@ -1082,11 +1167,11 @@ class Actions
 		if (!empty($sTo))
 		{
 			\RainLoop\Utils::SetCookie(self::AUTH_MAILTO_TOKEN_KEY,
-				\RainLoop\Utils::EncodeKeyValues(array(
+				\RainLoop\Utils::EncodeKeyValuesQ(array(
 					'Time' => \microtime(true),
 					'MailTo' => 'MailTo',
 					'To' => $sTo
-				)), 0, '/', null, null, true);
+				)), 0);
 		}
 	}
 
@@ -1135,16 +1220,17 @@ class Actions
 	 * @param string $sToken
 	 * @param bool $bThrowExceptionOnFalse = true
 	 * @param bool $bValidateShortToken = true
+	 * @param bool $bQ = false
 	 *
 	 * @return \RainLoop\Model\Account|bool
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	public function GetAccountFromCustomToken($sToken, $bThrowExceptionOnFalse = true, $bValidateShortToken = true)
+	public function GetAccountFromCustomToken($sToken, $bThrowExceptionOnFalse = true, $bValidateShortToken = true, $bQ = false)
 	{
 		$oResult = false;
 		if (!empty($sToken))
 		{
-			$aAccountHash = \RainLoop\Utils::DecodeKeyValues($sToken);
+			$aAccountHash = $bQ ? \RainLoop\Utils::DecodeKeyValuesQ($sToken) : \RainLoop\Utils::DecodeKeyValues($sToken);
 			if (!empty($aAccountHash[0]) && 'token' === $aAccountHash[0] && // simple token validation
 				8 <= \count($aAccountHash) && // length checking
 				!empty($aAccountHash[7]) && // does short token exist
@@ -1194,7 +1280,7 @@ class Actions
 		$sSignMeToken = \RainLoop\Utils::GetCookie(\RainLoop\Actions::AUTH_SIGN_ME_TOKEN_KEY, '');
 		if (!empty($sSignMeToken))
 		{
-			$aTokenData = \RainLoop\Utils::DecodeKeyValues($sSignMeToken);
+			$aTokenData = \RainLoop\Utils::DecodeKeyValuesQ($sSignMeToken);
 			if (\is_array($aTokenData) && !empty($aTokenData['e']) && !empty($aTokenData['t']))
 			{
 				$sTokenSettings = $this->StorageProvider()->Get($aTokenData['e'],
@@ -1204,13 +1290,13 @@ class Actions
 
 				if (!empty($sTokenSettings))
 				{
-					$aSignMeData = \RainLoop\Utils::DecodeKeyValues($sTokenSettings);
+					$aSignMeData = \RainLoop\Utils::DecodeKeyValuesQ($sTokenSettings);
 					if (\is_array($aSignMeData) &&
 						!empty($aSignMeData['AuthToken']) &&
 						!empty($aSignMeData['SignMetToken']) &&
 						$aSignMeData['SignMetToken'] === $aTokenData['t'])
 					{
-						$oAccount = $this->GetAccountFromCustomToken($aSignMeData['AuthToken'], false, false);
+						$oAccount = $this->GetAccountFromCustomToken($aSignMeData['AuthToken'], false, false, true);
 					}
 				}
 			}
@@ -1229,23 +1315,17 @@ class Actions
 	 * @return \RainLoop\Model\Account|bool
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	private function getAccountFromToken($bThrowExceptionOnFalse = true)
+	public function getAccountFromToken($bThrowExceptionOnFalse = true)
 	{
-		return $this->GetAccountFromCustomToken($this->getAuthToken(), $bThrowExceptionOnFalse);
+		return $this->GetAccountFromCustomToken($this->getLocalAuthToken(), $bThrowExceptionOnFalse, true, true);
 	}
 
 	/**
 	 * @return bool
 	 */
-	private function PremType()
+	public function IsOpen()
 	{
-		static $bResult = null;
-		if (null === $bResult)
-		{
-			$bResult = $this->licenseParser($this->licenseHelper(false, true));
-		}
-
-		return $bResult;
+		return !$this->PremProvider();
 	}
 
 	/**
@@ -1264,6 +1344,8 @@ class Actions
 		$oAccount = null;
 		$oConfig = $this->Config();
 
+		$oPremProvider = $this->PremProvider();
+
 		$aResult = array(
 			'Version' => APP_VERSION,
 			'Auth' => false,
@@ -1285,6 +1367,8 @@ class Actions
 			'LoginBackground' => '',
 			'LoginCss' => '',
 			'UserLogo' => '',
+			'UserLogoTitle' => '',
+			'UserLogoMessage' => '',
 			'UserCss' => '',
 			'WelcomePageUrl' => '',
 			'WelcomePageDisplay' => 'none',
@@ -1298,12 +1382,12 @@ class Actions
 			'AllowCtrlEnterOnCompose' => (bool) $oConfig->Get('labs', 'allow_ctrl_enter_on_compose', false),
 			'UseRsaEncryption' => (bool) $oConfig->Get('security', 'use_rsa_encryption', false),
 			'RsaPublicKey' => '',
-			'HideDangerousActions' => $oConfig->Get('labs', 'hide_dangerous_actions', false),
 			'CustomLoginLink' => $oConfig->Get('labs', 'custom_login_link', ''),
 			'CustomLogoutLink' => $oConfig->Get('labs', 'custom_logout_link', ''),
 			'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''),
 			'DetermineUserLanguage' => (bool) $oConfig->Get('login', 'determine_user_language', true),
 			'DetermineUserDomain' => (bool) $oConfig->Get('login', 'determine_user_domain', false),
+			'UseLoginWelcomePage' => (bool) $oConfig->Get('login', 'welcome_page', false),
 			'ForgotPasswordLinkUrl' => \trim($oConfig->Get('login', 'forgot_password_link_url', '')),
 			'RegistrationLinkUrl' => \trim($oConfig->Get('login', 'registration_link_url', '')),
 			'ContactsIsAllowed' => false,
@@ -1314,13 +1398,39 @@ class Actions
 			'UseImapSubscribe' => (bool) $oConfig->Get('labs', 'use_imap_list_subscribe', true),
 			'AllowAppendMessage' => (bool) $oConfig->Get('labs', 'allow_message_append', false),
 			'MaterialDesign' => (bool) $oConfig->Get('labs', 'use_material_design', true),
-			'PremType' => $this->PremType(),
-			'ZipSupported' => !!\class_exists('ZipArchive'),
+			'FolderSpecLimit' => (int) $oConfig->Get('labs', 'folders_spec_limit', 50),
+			'StartupUrl' => \trim(\ltrim(\trim($oConfig->Get('labs', 'startup_url', '')), '#/')),
+			'FaviconStatus' => (bool) $oConfig->Get('labs', 'favicon_status', true),
+			'Filtered' => '' !== \trim(\RainLoop\Api::Config()->Get('labs', 'imap_message_list_permanent_filter', '')),
+			'Community' => true,
+			'PremType' => false,
 			'Admin' => array(),
 			'Capa' => array(),
+			'AttachmentsActions' => array(),
 			'Plugins' => array()
 		);
 
+		if ($this->GetCapa(false, \RainLoop\Enumerations\Capa::ATTACHMENTS_ACTIONS))
+		{
+			if (!!\class_exists('ZipArchive'))
+			{
+				$aResult['AttachmentsActions'][] = 'zip';
+			}
+
+			if (\RainLoop\Utils::IsOwnCloudLoggedIn() && \class_exists('OCP\Files'))
+			{
+				$aResult['AttachmentsActions'][] = 'owncloud';
+			}
+
+			if ($oConfig->Get('social', 'dropbox_enable', false) && 0 < \strlen(\trim($oConfig->Get('social', 'dropbox_api_key', ''))))
+			{
+				$aResult['AttachmentsActions'][] = 'dropbox';
+			}
+		}
+
+		$aResult['AllowDropboxSocial'] = (bool) $oConfig->Get('social', 'dropbox_enable', false);
+			$aResult['DropboxApiKey'] = \trim($oConfig->Get('social', 'dropbox_api_key', ''));
+
 		if ($aResult['UseRsaEncryption'] &&
 			\file_exists(APP_PRIVATE_DATA.'rsa/public') && \file_exists(APP_PRIVATE_DATA.'rsa/private'))
 		{
@@ -1333,7 +1443,7 @@ class Actions
 			}
 		}
 
-		if (0 === strlen($aResult['RsaPublicKey']))
+		if (0 === \strlen($aResult['RsaPublicKey']))
 		{
 			$aResult['UseRsaEncryption'] = false;
 		}
@@ -1346,23 +1456,17 @@ class Actions
 		$aResult['Title'] = $oConfig->Get('webmail', 'title', '');
 		$aResult['LoadingDescription'] = $oConfig->Get('webmail', 'loading_description', '');
 
-		if ($this->PremType())
+		if ($oPremProvider)
 		{
-			$aResult['LoginLogo'] = $oConfig->Get('branding', 'login_logo', '');
-			$aResult['LoginBackground'] = $oConfig->Get('branding', 'login_background', '');
-			$aResult['LoginCss'] = $oConfig->Get('branding', 'login_css', '');
-			$aResult['LoginDescription'] = $oConfig->Get('branding', 'login_desc', '');
-			$aResult['LoginPowered'] = !!$oConfig->Get('branding', 'login_powered', true);
-			$aResult['UserLogo'] = $oConfig->Get('branding', 'user_logo', '');
-			$aResult['UserCss'] = $oConfig->Get('branding', 'user_css', '');
-			$aResult['WelcomePageUrl'] = $oConfig->Get('branding', 'welcome_page_url', '');
-			$aResult['WelcomePageDisplay'] = \strtolower($oConfig->Get('branding', 'welcome_page_display', 'none'));
+			$oPremProvider->PopulateAppData($aResult);
 		}
 
-		$aResult['LoadingDescriptionEsc'] = \htmlspecialchars($aResult['LoadingDescription'], ENT_QUOTES|ENT_IGNORE, 'UTF-8');
+		if ('' !== $aResult['LoadingDescription'] && 'RainLoop' !== $aResult['LoadingDescription'])
+		{
+			$aResult['LoadingDescriptionEsc'] = @\htmlspecialchars($aResult['LoadingDescription'], ENT_QUOTES|ENT_IGNORE, 'UTF-8');
+		}
 
 		$oSettings = null;
-		$oSettingsLocal = null;
 
 		if (!$bAdmin)
 		{
@@ -1408,9 +1512,10 @@ class Actions
 					if (null !== $sToken)
 					{
 						\RainLoop\Utils::ClearCookie(self::AUTH_MAILTO_TOKEN_KEY);
-						$mMailToData = \RainLoop\Utils::DecodeKeyValues($sToken);
-						if (\is_array($mMailToData) && !empty($mMailToData['MailTo']) && 'MailTo' === $mMailToData['MailTo'] &&
-							!empty($mMailToData['To']))
+
+						$mMailToData = \RainLoop\Utils::DecodeKeyValuesQ($sToken);
+						if (\is_array($mMailToData) && !empty($mMailToData['MailTo']) &&
+							'MailTo' === $mMailToData['MailTo'] && !empty($mMailToData['To']))
 						{
 							$aResult['MailToEmail'] = $mMailToData['To'];
 						}
@@ -1418,7 +1523,7 @@ class Actions
 				}
 
 				$oSettings = $this->SettingsProvider()->Load($oAccount);
-				$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
+
 
 				if (!$oAccount->IsAdditionalAccount() && !empty($aResult['WelcomePageUrl']) &&
 					('once' === $aResult['WelcomePageDisplay'] || 'always' === $aResult['WelcomePageDisplay']))
@@ -1437,6 +1542,16 @@ class Actions
 					$aResult['WelcomePageUrl'] = '';
 					$aResult['WelcomePageDisplay'] = '';
 				}
+
+				if (!empty($aResult['StartupUrl']))
+				{
+					$aResult['StartupUrl'] = $this->compileLogParams($aResult['StartupUrl'], $oAccount, true);
+				}
+
+				if (!empty($aResult['UserIframeMessage']))
+				{
+					$aResult['UserIframeMessage'] = $this->compileLogParams($aResult['UserIframeMessage'], $oAccount, true);
+				}
 			}
 			else
 			{
@@ -1450,10 +1565,13 @@ class Actions
 
 				$aResult['WelcomePageUrl'] = '';
 				$aResult['WelcomePageDisplay'] = '';
+
+				$aResult['StartupUrl'] = '';
 			}
 
 			$aResult['AllowGoogleSocial'] = (bool) $oConfig->Get('social', 'google_enable', false);
 			$aResult['AllowGoogleSocialAuth'] = (bool) $oConfig->Get('social', 'google_enable_auth', true);
+			$aResult['AllowGoogleSocialAuthFast'] = (bool) $oConfig->Get('social', 'google_enable_auth_fast', true);
 			$aResult['AllowGoogleSocialDrive'] = (bool) $oConfig->Get('social', 'google_enable_drive', true);
 			$aResult['AllowGoogleSocialPreview'] = (bool) $oConfig->Get('social', 'google_enable_preview', true);
 
@@ -1464,6 +1582,7 @@ class Actions
 				'' === \trim($oConfig->Get('social', 'google_client_id', '')) || '' === \trim($oConfig->Get('social', 'google_client_secret', '')))))
 			{
 				$aResult['AllowGoogleSocialAuth'] = false;
+				$aResult['AllowGoogleSocialAuthFast'] = false;
 				$aResult['AllowGoogleSocialDrive'] = false;
 				$aResult['GoogleClientID'] = '';
 				$aResult['GoogleApiKey'] = '';
@@ -1474,7 +1593,9 @@ class Actions
 				$aResult['AllowGoogleSocialPreview'] = false;
 			}
 
-			if ($aResult['AllowGoogleSocial'] && !$aResult['AllowGoogleSocialAuth'] && !$aResult['AllowGoogleSocialDrive'] && !$aResult['AllowGoogleSocialPreview'])
+			if ($aResult['AllowGoogleSocial'] &&
+				!$aResult['AllowGoogleSocialAuth'] && !$aResult['AllowGoogleSocialAuthFast'] &&
+				!$aResult['AllowGoogleSocialDrive'] && !$aResult['AllowGoogleSocialPreview'])
 			{
 				$aResult['AllowGoogleSocial'] = false;
 			}
@@ -1526,15 +1647,15 @@ class Actions
 			$aResult['Auth'] = $this->IsAdminLoggined(false);
 			if ($aResult['Auth'])
 			{
-				$aResult['AdminLogin'] = $oConfig->Get('security', 'admin_login', '');
 				$aResult['AdminDomain'] = APP_SITE;
+				$aResult['AdminLogin'] = (string) $oConfig->Get('security', 'admin_login', '');
 				$aResult['UseTokenProtection'] = (bool) $oConfig->Get('security', 'csrf_protection', true);
 				$aResult['EnabledPlugins'] = (bool) $oConfig->Get('plugins', 'enable', false);
 
-				$aResult['VerifySslCertificate'] = !!$oConfig->Get('ssl', 'verify_certificate', false);
-				$aResult['AllowSelfSigned'] = !!$oConfig->Get('ssl', 'allow_self_signed', true);
+				$aResult['VerifySslCertificate'] = (bool) $oConfig->Get('ssl', 'verify_certificate', false);
+				$aResult['AllowSelfSigned'] = (bool) $oConfig->Get('ssl', 'allow_self_signed', true);
 
-				$aDrivers = \class_exists('PDO') ? \PDO::getAvailableDrivers() : array();
+				$aDrivers = \class_exists('PDO') ? \PDO::getAvailableDrivers() : null;
 				$aResult['MySqlIsSupported'] = \is_array($aDrivers) ? \in_array('mysql', $aDrivers) : false;
 				$aResult['SQLiteIsSupported'] = \is_array($aDrivers) ? \in_array('sqlite', $aDrivers) : false;
 				$aResult['PostgreSqlIsSupported'] = \is_array($aDrivers) ? \in_array('pgsql', $aDrivers) : false;
@@ -1542,14 +1663,15 @@ class Actions
 				$aResult['ContactsEnable'] = (bool) $oConfig->Get('contacts', 'enable', false);
 				$aResult['ContactsSharing'] = (bool) $oConfig->Get('contacts', 'allow_sharing', false);
 				$aResult['ContactsSync'] = (bool) $oConfig->Get('contacts', 'allow_sync', false);
-				$aResult['ContactsPdoType'] = $this->ValidateContactPdoType(\trim($this->Config()->Get('contacts', 'type', 'sqlite')));
+				$aResult['ContactsPdoType'] = (string) $this->ValidateContactPdoType(\trim($this->Config()->Get('contacts', 'type', 'sqlite')));
 				$aResult['ContactsPdoDsn'] = (string) $oConfig->Get('contacts', 'pdo_dsn', '');
 				$aResult['ContactsPdoType'] = (string) $oConfig->Get('contacts', 'type', '');
 				$aResult['ContactsPdoUser'] = (string) $oConfig->Get('contacts', 'pdo_user', '');
-				$aResult['ContactsPdoPassword'] = APP_DUMMY;
+				$aResult['ContactsPdoPassword'] = (string) APP_DUMMY;
 
 				$aResult['AllowGoogleSocial'] = (bool) $oConfig->Get('social', 'google_enable', false);
 				$aResult['AllowGoogleSocialAuth'] = (bool) $oConfig->Get('social', 'google_enable_auth', true);
+				$aResult['AllowGoogleSocialAuthFast'] = (bool) $oConfig->Get('social', 'google_enable_auth_fast', true);
 				$aResult['AllowGoogleSocialDrive'] = (bool) $oConfig->Get('social', 'google_enable_drive', true);
 				$aResult['AllowGoogleSocialPreview'] = (bool) $oConfig->Get('social', 'google_enable_preview', true);
 
@@ -1568,11 +1690,11 @@ class Actions
 				$aResult['AllowDropboxSocial'] = (bool) $oConfig->Get('social', 'dropbox_enable', false);
 				$aResult['DropboxApiKey'] = (string) $oConfig->Get('social', 'dropbox_api_key', '');
 
-				$aResult['SubscriptionEnabled'] = \MailSo\Base\Utils::ValidateDomain($aResult['AdminDomain']);
+				$aResult['SubscriptionEnabled'] = (bool) \MailSo\Base\Utils::ValidateDomain($aResult['AdminDomain']);
 //					|| \MailSo\Base\Utils::ValidateIP($aResult['AdminDomain']);
 
-				$aResult['WeakPassword'] = $oConfig->ValidatePassword('12345');
-				$aResult['CoreAccess'] = $this->rainLoopCoreAccess();
+				$aResult['WeakPassword'] = (bool) $oConfig->ValidatePassword('12345');
+				$aResult['CoreAccess'] = (bool) $this->rainLoopCoreAccess();
 
 				$aResult['PhpUploadSizes'] = array(
 					'upload_max_filesize' => \ini_get('upload_max_filesize'),
@@ -1600,6 +1722,7 @@ class Actions
 		$aResult['Themes'] = $this->GetThemes();
 		$aResult['Languages'] = $this->GetLanguages(false);
 		$aResult['LanguagesAdmin'] = $this->GetLanguages(true);
+
 		$aResult['AllowLanguagesOnSettings'] = (bool) $oConfig->Get('webmail', 'allow_languages_on_settings', true);
 		$aResult['AllowLanguagesOnLogin'] = (bool) $oConfig->Get('login', 'allow_languages_on_login', true);
 		$aResult['AttachmentLimit'] = ((int) $oConfig->Get('webmail', 'attachment_size_limit', 10)) * 1024 * 1024;
@@ -1624,58 +1747,73 @@ class Actions
 		$aResult['UserBackgroundName'] = '';
 		$aResult['UserBackgroundHash'] = '';
 
-		if (!$bAdmin && $oSettings instanceof \RainLoop\Settings &&
-			$oSettingsLocal instanceof \RainLoop\Settings)
+		if (!$bAdmin && $oAccount instanceof \RainLoop\Model\Account)
 		{
-			if ($oConfig->Get('webmail', 'allow_languages_on_settings', true))
-			{
-				$sLanguage = $oSettings->GetConf('Language', $sLanguage);
-			}
-
-			if ($this->GetCapa(false, \RainLoop\Enumerations\Capa::THEMES, $oAccount))
-			{
-				$sTheme = $oSettingsLocal->GetConf('Theme', $sTheme);
-			}
-
-			$aResult['SentFolder'] = $oSettingsLocal->GetConf('SentFolder', '');
-			$aResult['DraftFolder'] = $oSettingsLocal->GetConf('DraftFolder', '');
-			$aResult['SpamFolder'] = $oSettingsLocal->GetConf('SpamFolder', '');
-			$aResult['TrashFolder'] = $oSettingsLocal->GetConf('TrashFolder', '');
-			$aResult['ArchiveFolder'] = $oSettingsLocal->GetConf('ArchiveFolder', '');
-			$aResult['NullFolder'] = $oSettingsLocal->GetConf('NullFolder', '');
-
-			$aResult['EditorDefaultType'] = $oSettings->GetConf('EditorDefaultType', $aResult['EditorDefaultType']);
-			$aResult['ShowImages'] = (bool) $oSettings->GetConf('ShowImages', $aResult['ShowImages']);
-			$aResult['ContactsAutosave'] = (bool) $oSettings->GetConf('ContactsAutosave', $aResult['ContactsAutosave']);
-			$aResult['MPP'] = (int) $oSettings->GetConf('MPP', $aResult['MPP']);
-			$aResult['SoundNotification'] = (bool) $oSettings->GetConf('SoundNotification', $aResult['SoundNotification']);
-			$aResult['DesktopNotifications'] = (bool) $oSettings->GetConf('DesktopNotifications', $aResult['DesktopNotifications']);
-			$aResult['UseCheckboxesInList'] = (bool) $oSettings->GetConf('UseCheckboxesInList', $aResult['UseCheckboxesInList']);
-			$aResult['AutoLogout'] = (int) $oSettings->GetConf('AutoLogout', $aResult['AutoLogout']);
-			$aResult['Layout'] = (int) $oSettings->GetConf('Layout', $aResult['Layout']);
-
-			$aResult['UseThreads'] = (bool) $oSettingsLocal->GetConf('UseThreads', $aResult['UseThreads']);
-			$aResult['ReplySameFolder'] = (bool) $oSettingsLocal->GetConf('ReplySameFolder', $aResult['ReplySameFolder']);
-
-			if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::AUTOLOGOUT, $oAccount))
-			{
-				$aResult['AutoLogout'] = 0;
-			}
-
-			if ($this->GetCapa(false, \RainLoop\Enumerations\Capa::USER_BACKGROUND, $oAccount))
-			{
-				$aResult['UserBackgroundName'] = (string) $oSettings->GetConf('UserBackgroundName', $aResult['UserBackgroundName']);
-				$aResult['UserBackgroundHash'] = (string) $oSettings->GetConf('UserBackgroundHash', $aResult['UserBackgroundHash']);
-//				if (!empty($aResult['UserBackgroundName']) && !empty($aResult['UserBackgroundHash']))
-//				{
-//					$aResult['IncludeBackground'] = './?/Raw/&q[]=/{{USER}}/UserBackground/&q[]=/'.
-//						$aResult['UserBackgroundHash'].'/';
-//				}
-			}
-
-			$aResult['EnableTwoFactor'] = !!$oSettings->GetConf('EnableTwoFactor', $aResult['EnableTwoFactor']);
-
 			$aResult['ParentEmail'] = $oAccount->ParentEmail();
+
+			$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
+
+			if ($oSettingsLocal instanceof \RainLoop\Settings)
+			{
+				// if ($this->GetCapa(false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount))
+
+				$aResult['SentFolder'] = (string) $oSettingsLocal->GetConf('SentFolder', '');
+				$aResult['DraftFolder'] = (string) $oSettingsLocal->GetConf('DraftFolder', '');
+				$aResult['SpamFolder'] = (string) $oSettingsLocal->GetConf('SpamFolder', '');
+				$aResult['TrashFolder'] = (string) $oSettingsLocal->GetConf('TrashFolder', '');
+				$aResult['ArchiveFolder'] = (string) $oSettingsLocal->GetConf('ArchiveFolder', '');
+				$aResult['NullFolder'] = (string) $oSettingsLocal->GetConf('NullFolder', '');
+			}
+
+			if ($this->GetCapa(false, \RainLoop\Enumerations\Capa::SETTINGS, $oAccount))
+			{
+				if ($oSettings instanceof \RainLoop\Settings)
+				{
+					if ($oConfig->Get('webmail', 'allow_languages_on_settings', true))
+					{
+						$sLanguage = (string) $oSettings->GetConf('Language', $sLanguage);
+					}
+
+					$aResult['EditorDefaultType'] = (string) $oSettings->GetConf('EditorDefaultType', $aResult['EditorDefaultType']);
+					$aResult['ShowImages'] = (bool) $oSettings->GetConf('ShowImages', $aResult['ShowImages']);
+					$aResult['ContactsAutosave'] = (bool) $oSettings->GetConf('ContactsAutosave', $aResult['ContactsAutosave']);
+					$aResult['MPP'] = (int) $oSettings->GetConf('MPP', $aResult['MPP']);
+					$aResult['SoundNotification'] = (bool) $oSettings->GetConf('SoundNotification', $aResult['SoundNotification']);
+					$aResult['DesktopNotifications'] = (bool) $oSettings->GetConf('DesktopNotifications', $aResult['DesktopNotifications']);
+					$aResult['UseCheckboxesInList'] = (bool) $oSettings->GetConf('UseCheckboxesInList', $aResult['UseCheckboxesInList']);
+					$aResult['AutoLogout'] = (int) $oSettings->GetConf('AutoLogout', $aResult['AutoLogout']);
+					$aResult['Layout'] = (int) $oSettings->GetConf('Layout', $aResult['Layout']);
+
+					if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::AUTOLOGOUT, $oAccount))
+					{
+						$aResult['AutoLogout'] = 0;
+					}
+
+					if ($this->GetCapa(false, \RainLoop\Enumerations\Capa::USER_BACKGROUND, $oAccount))
+					{
+						$aResult['UserBackgroundName'] = (string) $oSettings->GetConf('UserBackgroundName', $aResult['UserBackgroundName']);
+						$aResult['UserBackgroundHash'] = (string) $oSettings->GetConf('UserBackgroundHash', $aResult['UserBackgroundHash']);
+	//					if (!empty($aResult['UserBackgroundName']) && !empty($aResult['UserBackgroundHash']))
+	//					{
+	//						$aResult['IncludeBackground'] = './?/Raw/&q[]=/{{USER}}/UserBackground/&q[]=/'.
+	//							$aResult['UserBackgroundHash'].'/';
+	//					}
+					}
+
+					$aResult['EnableTwoFactor'] = (bool) $oSettings->GetConf('EnableTwoFactor', $aResult['EnableTwoFactor']);
+				}
+
+				if ($oSettingsLocal instanceof \RainLoop\Settings)
+				{
+					$aResult['UseThreads'] = (bool) $oSettingsLocal->GetConf('UseThreads', $aResult['UseThreads']);
+					$aResult['ReplySameFolder'] = (bool) $oSettingsLocal->GetConf('ReplySameFolder', $aResult['ReplySameFolder']);
+
+					if ($this->GetCapa(false, \RainLoop\Enumerations\Capa::THEMES, $oAccount))
+					{
+						$sTheme = (string) $oSettingsLocal->GetConf('Theme', $sTheme);
+					}
+				}
+			}
 		}
 
 		$sStaticCache = \md5(APP_VERSION.$this->Plugins()->Hash());
@@ -1709,8 +1847,9 @@ class Actions
 		$aResult['LanguageAdmin'] = $this->ValidateLanguage($sLanguageAdmin, '', true);
 
 		$aResult['UserLanguageRaw'] = $this->detectUserLanguage();
-		$aResult['UserLanguage'] = $this->ValidateLanguage($aResult['UserLanguageRaw'], $aResult['Language'], false);
-		$aResult['UserLanguageAdmin'] = $this->ValidateLanguage($aResult['UserLanguageRaw'], $aResult['LanguageAdmin'], true);
+
+		$aResult['UserLanguage'] = $this->ValidateLanguage($aResult['UserLanguageRaw'], '', false, true, true);
+		$aResult['UserLanguageAdmin'] = $this->ValidateLanguage($aResult['UserLanguageRaw'], '', true, true, true);
 
 		$aResult['LangLink'] = './?/Lang/0/'.($bAdmin ? 'Admin' : 'App').'/'.
 			($bAdmin ? $aResult['LanguageAdmin'] : $aResult['Language']).'/'.$sStaticCache.'/';
@@ -1741,7 +1880,7 @@ class Actions
 		if (false !== \strpos($sAcceptLang, ','))
 		{
 			$aParts = \explode(',', $sAcceptLang, 2);
-			$sLang = !empty($aParts[0]) ? \trim(\strtolower($aParts[0])) : '';
+			$sLang = empty($aParts[0]) ? '' : \trim(\strtolower($aParts[0]));
 		}
 
 		return $sLang;
@@ -1755,14 +1894,30 @@ class Actions
 		return \preg_replace('/[^a-zA-Z0-9]+/', '-', $this->getUserLanguageFromHeader());
 	}
 
+	/**
+	 * @param int $iWait = 1
+	 * @param int $iDelay = 1
+	 */
+	private function requestSleep($iWait = 1, $iDelay = 1)
+	{
+		if (0 < $iDelay && 0 < $iWait)
+		{
+			if ($iWait > \time() - APP_START_TIME)
+			{
+				\sleep($iDelay);
+			}
+		}
+	}
+
 	private function loginErrorDelay()
 	{
 		$iDelay = (int) $this->Config()->Get('labs', 'login_fault_delay', 0);
 		if (0 < $iDelay)
 		{
-			\sleep($iDelay);
+			$this->requestSleep(1, $iDelay);
 		}
 	}
+
 	/**
 	 * @param \RainLoop\Model\Account $oAccount
 	 */
@@ -1866,7 +2021,7 @@ class Actions
 				{
 					$sLine = \trim(\implode('.', $aDomainParts), '. ');
 
-					$oDomain = $oDomainProvider->Load($sLine);
+					$oDomain = $oDomainProvider->Load($sLine, false);
 					if ($oDomain && $oDomain instanceof \RainLoop\Model\Domain)
 					{
 						$bAdded = true;
@@ -1885,6 +2040,24 @@ class Actions
 					$iLimit--;
 				}
 
+				if (!$bAdded)
+				{
+					$sLine = $sUserHost;
+					$oDomain = $oDomainProvider->Load($sLine, true);
+					if ($oDomain && $oDomain instanceof \RainLoop\Model\Domain)
+					{
+						$bAdded = true;
+						$this->Logger()->Write('Check "'.$sLine.'" with wildcard: OK ('.$sEmail.' > '.$sEmail.'@'.$sLine.')',
+							\MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
+
+						$sEmail = $sEmail.'@'.$sLine;
+					}
+					else
+					{
+						$this->Logger()->Write('Check "'.$sLine.'" with wildcard: NO', \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
+					}
+				}
+
 				if (!$bAdded)
 				{
 					$this->Logger()->Write('Domain was not found!', \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
@@ -1979,7 +2152,7 @@ class Actions
 						if ($bAdditionalCodeSignMe)
 						{
 							\RainLoop\Utils::SetCookie(self::AUTH_TFA_SIGN_ME_TOKEN_KEY, $sSecretHash,
-								\time() + 60 * 60 * 24 * 14, '/', null, null, true);
+								\time() + 60 * 60 * 24 * 14);
 						}
 
 						if (!$bGood && !$this->TwoFactorAuthProvider()->VerifyCode($aData['Secret'], $sAdditionalCode))
@@ -2014,51 +2187,27 @@ class Actions
 	 */
 	private function clientRsaDecryptHelper($sEncryptedData)
 	{
-		$aMatch = array();
-		if ('rsa:xxx:' === substr($sEncryptedData, 0, 8) && $this->Config()->Get('security', 'use_rsa_encryption', false))
-		{
-			$oLogger = $this->Logger();
-			$oLogger->Write('Trying to decode encrypted data', \MailSo\Log\Enumerations\Type::INFO, 'RSA');
-
-			$sPrivateKey = file_exists(APP_PRIVATE_DATA.'rsa/private') ?
-				\file_get_contents(APP_PRIVATE_DATA.'rsa/private') : '';
-
-			if (!empty($sPrivateKey))
-			{
-				$sData = \trim(\substr($sEncryptedData, 8));
-
-				if (!\class_exists('Crypt_RSA'))
-				{
-					\set_include_path(\get_include_path().PATH_SEPARATOR.APP_VERSION_ROOT_PATH.'app/libraries/phpseclib');
-					include_once 'Crypt/RSA.php';
-					\defined('CRYPT_RSA_MODE') || \define('CRYPT_RSA_MODE', CRYPT_RSA_MODE_INTERNAL);
-				}
-
-				$oLogger->HideErrorNotices(true);
-
-				$oRsa = new \Crypt_RSA();
-				$oRsa->setEncryptionMode(CRYPT_RSA_ENCRYPTION_PKCS1);
-				$oRsa->setPrivateKeyFormat(CRYPT_RSA_PRIVATE_FORMAT_PKCS1);
-				$oRsa->setPrivateKeyFormat(CRYPT_RSA_PUBLIC_FORMAT_PKCS1);
-				$oRsa->loadKey($sPrivateKey, CRYPT_RSA_PRIVATE_FORMAT_PKCS1);
-
-				$sData = $oRsa->decrypt(\base64_decode($sData));
-				if (\preg_match('/^[a-z0-9]{32}:(.+):[a-z0-9]{32}$/', $sData, $aMatch) && isset($aMatch[1]))
-				{
-					$sEncryptedData = $aMatch[1];
-				}
-				else
-				{
-					$oLogger->Write('Invalid decrypted data', \MailSo\Log\Enumerations\Type::WARNING, 'RSA');
-				}
-
-				$oLogger->HideErrorNotices(false);
-			}
-			else
-			{
-				$oLogger->Write('Private key is not found', \MailSo\Log\Enumerations\Type::WARNING, 'RSA');
-			}
-		}
+//		$aMatch = array();
+//		if ('rsa:xxx:' === \substr($sEncryptedData, 0, 8) && $this->Config()->Get('security', 'use_rsa_encryption', false))
+//		{
+//			$oLogger = $this->Logger();
+//			$oLogger->Write('Trying to decode encrypted data', \MailSo\Log\Enumerations\Type::INFO, 'RSA');
+//			$oLogger->HideErrorNotices(true);
+//
+//			$sData = \trim(\substr($sEncryptedData, 8));
+//			$sData = \RainLoop\Utils::DecryptStringRSA(\base64_decode($sData));
+//
+//			if (false !== $sData && \preg_match('/^[a-z0-9]{32}:(.+):[a-z0-9]{32}$/', $sData, $aMatch) && isset($aMatch[1]))
+//			{
+//				$sEncryptedData = $aMatch[1];
+//			}
+//			else
+//			{
+//				$oLogger->Write('Invalid decrypted data', \MailSo\Log\Enumerations\Type::WARNING, 'RSA');
+//			}
+//
+//			$oLogger->HideErrorNotices(false);
+//		}
 
 		return $sEncryptedData;
 	}
@@ -2195,6 +2344,7 @@ class Actions
 						1 < \count($aOrder['Accounts']))
 					{
 						$aAccounts = \array_merge(\array_flip($aOrder['Accounts']), $aAccounts);
+
 						$aAccounts = \array_filter($aAccounts, function ($sHash) {
 							return 5 < \strlen($sHash);
 						});
@@ -2300,6 +2450,9 @@ class Actions
 	 */
 	public function GetIdentities($oAccount)
 	{
+		$bAllowIdentities = $this->GetCapa(false,
+			\RainLoop\Enumerations\Capa::IDENTITIES, $oAccount);
+
 		$aIdentities = array();
 		if ($oAccount)
 		{
@@ -2326,14 +2479,14 @@ class Actions
 
 					if ($oItem && $oItem->Validate())
 					{
-						if ('' === $oItem->Id())
+						if ($oItem->IsAccountIdentities())
 						{
 							$oItem->SetEmail($oAccount->Email());
 							$bHasAccountIdentity = true;
 
-							\array_unshift($aIdentities, $oItem);
+							\array_push($aIdentities, $oItem);
 						}
-						else
+						else if ($bAllowIdentities)
 						{
 							\array_push($aIdentities, $oItem);
 						}
@@ -2347,7 +2500,7 @@ class Actions
 					\RainLoop\Model\Identity::NewInstanceFromAccount($oAccount));
 			}
 
-			if (1 < \count($aIdentities))
+			if (1 < \count($aIdentities) && $bAllowIdentities)
 			{
 				$sOrder = $this->StorageProvider()->Get($oAccount,
 					\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
@@ -2359,8 +2512,16 @@ class Actions
 					1 < \count($aOrder['Identities']))
 				{
 					$aList = $aOrder['Identities'];
+					foreach ($aList as $iIndex => $sItem)
+					{
+						if ('' === $sItem)
+						{
+							$aList[$iIndex] = '---';
+						}
+					}
+
 					\usort($aIdentities, function ($a, $b) use ($aList) {
-						return \array_search($a->Id(), $aList) < \array_search($b->Id(), $aList) ? -1 : 1;
+						return \array_search($a->Id(true), $aList) < \array_search($b->Id(true), $aList) ? -1 : 1;
 					});
 				}
 			}
@@ -2379,6 +2540,7 @@ class Actions
 	public function GetIdentityByID($oAccount, $sID, $bFirstOnEmpty = false)
 	{
 		$aIdentities = $this->GetIdentities($oAccount);
+
 		if (\is_array($aIdentities))
 		{
 			foreach ($aIdentities as $oIdentity)
@@ -2437,9 +2599,16 @@ class Actions
 	 */
 	public function SetIdentities($oAccount, $aIdentities = array())
 	{
+		$bAllowIdentities = $this->GetCapa(false, \RainLoop\Enumerations\Capa::IDENTITIES, $oAccount);
+
 		$aResult = array();
 		foreach ($aIdentities as $oItem)
 		{
+			if (!$bAllowIdentities && $oItem && !$oItem->IsAccountIdentities())
+			{
+				continue;
+			}
+
 			$aResult[] = $oItem->ToSimpleJSON(false);
 		}
 
@@ -2580,7 +2749,7 @@ class Actions
 		$oNewAccount->SetParentEmail($sParentEmail);
 
 		$aAccounts[$oNewAccount->Email()] = $oNewAccount->GetAuthToken();
-		if (0 === \strlen($oAccount->ParentEmail()))
+		if (!$oAccount->IsAdditionalAccount())
 		{
 			$aAccounts[$oAccount->Email()] = $oAccount->GetAuthToken();
 		}
@@ -2637,10 +2806,202 @@ class Actions
 	 */
 	public function DoAttachmentsActions()
 	{
-		\sleep(1);
-		return $this->TrueResponse(__FUNCTION__);
+		if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::ATTACHMENTS_ACTIONS))
+		{
+			return $this->FalseResponse(__FUNCTION__);
+		}
+
+		$oAccount = $this->initMailClientConnection();
+
+		$sAction = $this->GetActionParam('Do', '');
+		$aHashes = $this->GetActionParam('Hashes', null);
+
+		$mResult = false;
+		$bError = false;
+		$aData = false;
+
+		if (\is_array($aHashes) && 0 < \count($aHashes))
+		{
+			$aData = array();
+			foreach ($aHashes as $sZipHash)
+			{
+				$aResult = $this->getMimeFileByHash($oAccount, $sZipHash);
+				if (\is_array($aResult) && !empty($aResult['FileHash']))
+				{
+					$aData[] = $aResult;
+				}
+				else
+				{
+					$bError = true;
+					break;
+				}
+			}
+		}
+
+		$oFilesProvider = $this->FilesProvider();
+		if (!empty($sAction) && !$bError && \is_array($aData) && 0 < \count($aData) &&
+			$oFilesProvider && $oFilesProvider->IsActive())
+		{
+
+			$bError = false;
+			switch (\strtolower($sAction))
+			{
+				case 'zip':
+
+					if (\class_exists('ZipArchive'))
+					{
+						$sZipHash = \MailSo\Base\Utils::Md5Rand();
+						$sZipFileName = $oFilesProvider->GenerateLocalFullFileName($oAccount, $sZipHash);
+
+						if (!empty($sZipFileName))
+						{
+							$oZip = new \ZipArchive();
+							$oZip->open($sZipFileName, \ZIPARCHIVE::CREATE | \ZIPARCHIVE::OVERWRITE);
+							$oZip->setArchiveComment('RainLoop/'.APP_VERSION);
+
+							foreach ($aData as $aItem)
+							{
+								$sFileName = (string) (isset($aItem['FileName']) ? $aItem['FileName'] : 'file.dat');
+								$sFileHash = (string) (isset($aItem['FileHash']) ? $aItem['FileHash'] : '');
+
+								if (!empty($sFileHash))
+								{
+									$sFullFileNameHash = $oFilesProvider->GetFileName($oAccount, $sFileHash);
+									if (!$oZip->addFile($sFullFileNameHash, $sFileName))
+									{
+										$bError = true;
+									}
+								}
+							}
+
+							if (!$bError)
+							{
+								$bError = !$oZip->close();
+							}
+							else
+							{
+								$oZip->close();
+							}
+						}
+
+						foreach ($aData as $aItem)
+						{
+							$sFileHash = (string) (isset($aItem['FileHash']) ? $aItem['FileHash'] : '');
+							if (!empty($sFileHash))
+							{
+								$oFilesProvider->Clear($oAccount, $sFileHash);
+							}
+						}
+
+						if (!$bError)
+						{
+							$mResult = array(
+								'Files' => array(array(
+									'FileName' => 'attachments.zip',
+									'Hash' => \RainLoop\Utils::EncodeKeyValuesQ(array(
+										'V' => APP_VERSION,
+										'Account' => $oAccount ? \md5($oAccount->Hash()) : '',
+										'FileName' => 'attachments.zip',
+										'MimeType' => 'application/zip',
+										'FileHash' => $sZipHash
+									))
+								))
+							);
+						}
+					}
+					break;
+
+				case 'owncloud':
+
+					$mResult = false;
+
+					if (\RainLoop\Utils::IsOwnCloudLoggedIn() && \class_exists('OCP\Files'))
+					{
+						$sSaveFolder = $this->Config()->Get('labs', 'owncloud_save_folder', '');
+						if (empty($sSaveFolder))
+						{
+							$sSaveFolder = 'Attachments';
+						}
+
+						$oFiles = \OCP\Files::getStorage('files');
+
+						if ($oFilesProvider && $oFiles && $oFilesProvider->IsActive() &&
+							\method_exists($oFiles, 'file_put_contents'))
+						{
+							if (!$oFiles->is_dir($sSaveFolder))
+							{
+								$oFiles->mkdir($sSaveFolder);
+							}
+
+							$mResult = true;
+							foreach ($aData as $aItem)
+							{
+								$sSavedFileName = isset($aItem['FileName']) ? $aItem['FileName'] : 'file.dat';
+								$sSavedFileHash = !empty($aItem['FileHash']) ? $aItem['FileHash'] : '';
+
+								if (!empty($sSavedFileHash))
+								{
+									$fFile = $oFilesProvider->GetFile($oAccount, $sSavedFileHash, 'rb');
+									if (\is_resource($fFile))
+									{
+										$sSavedFileNameFull = \MailSo\Base\Utils::SmartFileExists($sSaveFolder.'/'.$sSavedFileName, function ($sPath) use ($oFiles) {
+											return $oFiles->file_exists($sPath);
+										});
+
+										if (!$oFiles->file_put_contents($sSavedFileNameFull, $fFile))
+										{
+											$mResult = false;
+										}
+
+										if (\is_resource($fFile))
+										{
+											@\fclose($fFile);
+										}
+									}
+								}
+							}
+						}
+					}
+
+					foreach ($aData as $aItem)
+					{
+						$sFileHash = (string) (isset($aItem['FileHash']) ? $aItem['FileHash'] : '');
+						if (!empty($sFileHash))
+						{
+							$oFilesProvider->Clear($oAccount, $sFileHash);
+						}
+					}
+
+					break;
+
+				case 'dropbox':
+
+					$mResult = array(
+						'ShortLife' => '_'.$this->GetShortLifeSpecAuthToken(),
+						'Url' => \preg_replace('/\?(.*)$/', '', $this->Http()->GetFullUrl()),
+						'Files' => array()
+					);
+
+					foreach ($aData as $aItem)
+					{
+						$mResult['Files'][] = array(
+							'FileName' => isset($aItem['FileName']) ? $aItem['FileName'] : 'file.dat',
+							'Hash' => \RainLoop\Utils::EncodeKeyValuesQ($aItem)
+						);
+					}
+
+					break;
+			}
+		}
+		else
+		{
+			$bError = true;
+		}
+
+		$this->requestSleep();
+		return $this->DefaultResponse(__FUNCTION__, $bError ? false : $mResult);
 	}
-	
+
 	/**
 	 * @return array
 	 *
@@ -2656,18 +3017,30 @@ class Actions
 			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::InvalidInputArgument);
 		}
 
-		$aIdentitiesForSave = array();
-
 		$aIdentities = $this->GetIdentities($oAccount);
+
+		$bAdded = false;
+		$aIdentitiesForSave = array();
 		foreach ($aIdentities as $oItem)
 		{
-			if ($oItem && $oItem->Id() !== $oIdentity->Id())
+			if ($oItem)
 			{
-				$aIdentitiesForSave[] = $oItem;
+				if ($oItem->Id() === $oIdentity->Id())
+				{
+					$aIdentitiesForSave[] = $oIdentity;
+					$bAdded = true;
+				}
+				else
+				{
+					$aIdentitiesForSave[] = $oItem;
+				}
 			}
 		}
 
-		$aIdentitiesForSave[] = $oIdentity;
+		if (!$bAdded)
+		{
+			$aIdentitiesForSave[] = $oIdentity;
+		}
 
 		return $this->DefaultResponse(__FUNCTION__, $this->SetIdentities($oAccount, $aIdentitiesForSave));
 	}
@@ -2681,6 +3054,11 @@ class Actions
 	{
 		$oAccount = $this->getAccountFromToken();
 
+		if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::IDENTITIES, $oAccount))
+		{
+			return $this->FalseResponse(__FUNCTION__);
+		}
+
 		$sId = \trim($this->GetActionParam('IdToDelete', ''));
 		if (empty($sId))
 		{
@@ -2689,6 +3067,7 @@ class Actions
 
 		$aNew = array();
 		$aIdentities = $this->GetIdentities($oAccount);
+
 		foreach ($aIdentities as $oItem)
 		{
 			if ($oItem && $sId !== $oItem->Id())
@@ -2823,7 +3202,7 @@ class Actions
 		$aAccounts = $this->GetActionParam('Accounts', null);
 		$aIdentities = $this->GetActionParam('Identities', null);
 
-		if (!\is_array($aAccounts) || !\is_array($aIdentities))
+		if (!\is_array($aAccounts) && !\is_array($aIdentities))
 		{
 			return $this->FalseResponse(__FUNCTION__);
 		}
@@ -2831,8 +3210,8 @@ class Actions
 		return $this->DefaultResponse(__FUNCTION__, $this->StorageProvider()->Put($oAccount,
 			\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG, 'accounts_identities_order',
 			\json_encode(array(
-				'Accounts' => $aAccounts,
-				'Identities' => $aIdentities
+				'Accounts' => \is_array($aAccounts) ? $aAccounts : array(),
+				'Identities' => \is_array($aIdentities) ? $aIdentities : array()
 			))
 		));
 	}
@@ -2847,6 +3226,7 @@ class Actions
 		$oAccount = $this->getAccountFromToken();
 
 		$mAccounts = false;
+
 		if ($this->GetCapa(false, \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS, $oAccount))
 		{
 			$mAccounts = $this->GetAccounts($oAccount);
@@ -3071,7 +3451,11 @@ class Actions
 		}
 		else if ($bVersionsCache)
 		{
-			$this->removeOldVersion();
+			$oPremProvider = $this->PremProvider();
+			if ($oPremProvider)
+			{
+				$oPremProvider->ClearOldVersion();
+			}
 		}
 
 		$this->Plugins()->RunHook('service.app-delay-start-end');
@@ -3107,7 +3491,7 @@ class Actions
 	 * @param string $sType = 'string'
 	 * @param callable|null $mStringCallback = null
 	 */
-	private function setConfigFromParams(&$oConfig, $sParamName, $sConfigSector, $sConfigName, $sType = 'string', $mStringCallback = null)
+	public function setConfigFromParams(&$oConfig, $sParamName, $sConfigSector, $sConfigName, $sType = 'string', $mStringCallback = null)
 	{
 		$sValue = $this->GetActionParam($sParamName, '');
 		if ($this->HasActionParam($sParamName))
@@ -3157,8 +3541,11 @@ class Actions
 			case \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS:
 				$this->setConfigFromParams($oConfig, $sParamName, 'webmail', 'allow_additional_accounts', 'bool');
 				break;
+			case \RainLoop\Enumerations\Capa::IDENTITIES:
+				$this->setConfigFromParams($oConfig, $sParamName, 'webmail', 'allow_additional_identities', 'bool');
+				break;
 			case \RainLoop\Enumerations\Capa::TEMPLATES:
-				$this->setConfigFromParams($oConfig, $sParamName, 'capa', 'templates', 'bool');
+				$this->setConfigFromParams($oConfig, $sParamName, 'capa', 'x-templates', 'bool');
 				break;
 			case \RainLoop\Enumerations\Capa::TWO_FACTOR:
 				$this->setConfigFromParams($oConfig, $sParamName, 'security', 'allow_two_factor_auth', 'bool');
@@ -3269,6 +3656,7 @@ class Actions
 		});
 
 		$this->setCapaFromParams($oConfig, 'CapaAdditionalAccounts', \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS);
+		$this->setCapaFromParams($oConfig, 'CapaIdentities', \RainLoop\Enumerations\Capa::IDENTITIES);
 		$this->setCapaFromParams($oConfig, 'CapaTemplates', \RainLoop\Enumerations\Capa::TEMPLATES);
 		$this->setCapaFromParams($oConfig, 'CapaTwoFactorAuth', \RainLoop\Enumerations\Capa::TWO_FACTOR);
 		$this->setCapaFromParams($oConfig, 'CapaTwoFactorAuthForce', \RainLoop\Enumerations\Capa::TWO_FACTOR_FORCE);
@@ -3284,30 +3672,12 @@ class Actions
 		$this->setConfigFromParams($oConfig, 'Title', 'webmail', 'title', 'string');
 		$this->setConfigFromParams($oConfig, 'LoadingDescription', 'webmail', 'loading_description', 'string');
 
-		if ($this->HasOneOfActionParams(array(
-			'LoginLogo', 'LoginBackground', 'LoginDescription', 'LoginCss', 'LoginPowered',
-			'UserLogo', 'UserCss',
-			'WelcomePageUrl', 'WelcomePageDisplay'
-		)) && $this->PremType())
-		{
-			$this->setConfigFromParams($oConfig, 'LoginLogo', 'branding', 'login_logo', 'string');
-			$this->setConfigFromParams($oConfig, 'LoginBackground', 'branding', 'login_background', 'string');
-			$this->setConfigFromParams($oConfig, 'LoginDescription', 'branding', 'login_desc', 'string');
-			$this->setConfigFromParams($oConfig, 'LoginCss', 'branding', 'login_css', 'string');
-			$this->setConfigFromParams($oConfig, 'LoginPowered', 'branding', 'login_powered', 'bool');
-
-			$this->setConfigFromParams($oConfig, 'UserLogo', 'branding', 'user_logo', 'string');
-			$this->setConfigFromParams($oConfig, 'UserCss', 'branding', 'user_css', 'string');
-
-			$this->setConfigFromParams($oConfig, 'WelcomePageUrl', 'branding', 'welcome_page_url', 'string');
-			$this->setConfigFromParams($oConfig, 'WelcomePageDisplay', 'branding', 'welcome_page_display', 'string');
-		}
-
 		$this->setConfigFromParams($oConfig, 'TokenProtection', 'security', 'csrf_protection', 'bool');
 		$this->setConfigFromParams($oConfig, 'EnabledPlugins', 'plugins', 'enable', 'bool');
 
 		$this->setConfigFromParams($oConfig, 'GoogleEnable', 'social', 'google_enable', 'bool');
 		$this->setConfigFromParams($oConfig, 'GoogleEnableAuth', 'social', 'google_enable_auth', 'bool');
+		$this->setConfigFromParams($oConfig, 'GoogleEnableAuthFast', 'social', 'google_enable_auth_fast', 'bool');
 		$this->setConfigFromParams($oConfig, 'GoogleEnableDrive', 'social', 'google_enable_drive', 'bool');
 		$this->setConfigFromParams($oConfig, 'GoogleEnablePreview', 'social', 'google_enable_preview', 'bool');
 		$this->setConfigFromParams($oConfig, 'GoogleClientID', 'social', 'google_client_id', 'string');
@@ -3325,6 +3695,12 @@ class Actions
 		$this->setConfigFromParams($oConfig, 'DropboxEnable', 'social', 'dropbox_enable', 'bool');
 		$this->setConfigFromParams($oConfig, 'DropboxApiKey', 'social', 'dropbox_api_key', 'string');
 
+		$oPremProvider = $this->PremProvider();
+		if ($oPremProvider)
+		{
+			$oPremProvider->PremSection($this, $oConfig);
+		}
+
 		return $this->DefaultResponse(__FUNCTION__, $oConfig->Save());
 	}
 
@@ -3399,150 +3775,11 @@ class Actions
 		));
 	}
 
-	/**
-	 * @param string $sDomain
-	 *
-	 * @return string
-	 */
-//	public function domainPathHelper($sDomain)
-//	{
-//		$sDomain = \strtolower(\trim($sDomain));
-//
-//		$sTempDomain = \preg_replace('/^(webmail|email|mail)\./', '', $sDomain);
-//		if (false === \strpos($sTempDomain, '.'))
-//		{
-//			$sTempDomain = $sDomain;
-//		}
-//
-//		$sDomainPrefix = $sTempDomain;
-//		if (false === \strpos($sDomainPrefix, '.'))
-//		{
-//			$sDomainPrefix = $sTempDomain;
-//		}
-//
-//		$sDomainPrefix = \substr(\preg_replace('/[^a-z0-9]+/', '', $sDomainPrefix), 0, 2);
-//		$sDomainPrefix = \str_pad($sDomainPrefix, 2, '_');
-//
-//		return 'd/'.\substr($sDomainPrefix, 0, 1).'/'.$sDomainPrefix.'/'.\urlencode($sTempDomain);
-//	}
-
-	/**
-	 * @return string
-	 */
-	public function licenseHelper($sForce = false, $bLongCache = false, $iFastCacheTimeInMin = 10, $iLongCacheTimeInDays = 3)
-	{
-		$sDomain = \trim(APP_SITE);
-
-		$oCacher = $this->Cacher(null, true);
-		$oHttp = \MailSo\Base\Http::SingletonInstance();
-
-		if (0 === \strlen($sDomain) || $oHttp->CheckLocalhost($sDomain) || !$oCacher || !$oCacher->Verify(true))
-		{
-			return 'NO';
-		}
-
-		$sDomainKeyValue = \RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain);
-		$sDomainLongKeyValue = \RainLoop\KeyPathHelper::LicensingDomainKeyOtherValue($sDomain);
-
-		$sValue = '';
-		if (!$sForce)
-		{
-			if ($bLongCache)
-			{
-				$bLock = $oCacher->GetLock($sDomainLongKeyValue);
-				$iTime = $bLock ? 0 : $oCacher->GetTimer($sDomainLongKeyValue);
-
-				if ($bLock || (0 < $iTime && \time() < $iTime + (60 * 60 * 24) * $iLongCacheTimeInDays))
-				{
-					$sValue = $oCacher->Get($sDomainLongKeyValue);
-				}
-			}
-			else
-			{
-				$iTime = $oCacher->GetTimer($sDomainKeyValue);
-				if (0 < $iTime && \time() < $iTime + 60 * $iFastCacheTimeInMin)
-				{
-					$sValue = $oCacher->Get($sDomainKeyValue);
-				}
-			}
-		}
-
-		if (0 === \strlen($sValue))
-		{
-			if ($bLongCache)
-			{
-				if (!$oCacher->SetTimer($sDomainLongKeyValue))
-				{
-					return 'NO';
-				}
-
-				$oCacher->SetLock($sDomainLongKeyValue);
-			}
-
-			$iCode = 0;
-			$sContentType = '';
-
-//			$sValue = $oHttp->GetUrlAsString(APP_STATUS_PATH.$this->domainPathHelper($sDomain),
-//				'RainLoop/'.APP_VERSION, $sContentType, $iCode, $this->Logger(), 5,
-//				$this->Config()->Get('labs', 'curl_proxy', ''), $this->Config()->Get('labs', 'curl_proxy_auth', ''),
-//				array(), false
-//			);
-
-			$sValue = $oHttp->GetUrlAsString(APP_API_PATH.'status/'.\urlencode($sDomain),
-				'RainLoop/'.APP_VERSION, $sContentType, $iCode, $this->Logger(), 5,
-				$this->Config()->Get('labs', 'curl_proxy', ''), $this->Config()->Get('labs', 'curl_proxy_auth', ''),
-				array(), false
-			);
-
-			$this->Logger()->Write($sValue);
-
-			/*if (404 === $iCode)
-			{
-				$sValue = 'NO';
-			}
-			else */if (200 !== $iCode)
-			{
-				$sValue = '';
-			}
-
-			$oCacher->SetTimer($sDomainKeyValue);
-
-			$oCacher->Set($sDomainKeyValue, $sValue);
-			$oCacher->Set($sDomainLongKeyValue, $sValue);
-
-			if ($bLongCache)
-			{
-				$oCacher->RemoveLock($sDomainLongKeyValue);
-			}
-		}
-
-		return $sValue;
-	}
-
-	/**
-	 * @param string $sInput
-	 * @param int $iExpired = 0
-	 *
-	 * @return bool
-	 */
-	public function licenseParser($sInput, &$iExpired = 0)
-	{
-		$aMatch = array();
-		if (\preg_match('/^EXPIRED:([\d]+)$/', $sInput, $aMatch))
-		{
-			$iExpired = (int) $aMatch[1];
-			return \time() < $iExpired;
-		}
-
-		return false;
-	}
-
 	/**
 	 * @return array
 	 */
 	public function DoAdminLicensing()
 	{
-		$iStart = \time();
 		$this->IsAdminLoggined();
 
 		$bForce = '1' === (string) $this->GetActionParam('Force', '0');
@@ -3550,17 +3787,16 @@ class Actions
 		$mResult = false;
 		$iErrorCode = -1;
 
-		if (2 < \strlen(APP_SITE))
-		{
-			$sValue = $this->licenseHelper($bForce);
+		$oPremProvider = $this->PremProvider();
 
-			if ($iStart === \time())
-			{
-				\sleep(1);
-			}
+		if ($oPremProvider && 2 < \strlen(APP_SITE))
+		{
+			$sValue = $oPremProvider->Fetcher($bForce);
+
+			$this->requestSleep();
 
 			$iExpired = 0;
-			if ($this->licenseParser($sValue, $iExpired))
+			if ($oPremProvider->Parser($sValue, $iExpired))
 			{
 				$mResult = array(
 					'Banned' => false,
@@ -3594,7 +3830,6 @@ class Actions
 	 */
 	public function DoAdminLicensingActivate()
 	{
-		$iStart = \time();
 		$this->IsAdminLoggined();
 
 		$sDomain = (string) $this->GetActionParam('Domain', '');
@@ -3603,29 +3838,14 @@ class Actions
 		$mResult = false;
 		$iErrorCode = -1;
 
-		if (2 < \strlen($sDomain) && 2 < \strlen($sKey) && $sDomain === APP_SITE)
+		$oPrem = $this->PremProvider();
+
+		if ($oPrem && 2 < \strlen($sDomain) && 2 < \strlen($sKey) && $sDomain === APP_SITE)
 		{
 			$iCode = 0;
-			$sContentType = '';
+			$sValue = $oPrem->Activate($sDomain, $sKey, $iCode);
 
-			$oHttp = \MailSo\Base\Http::SingletonInstance();
-
-			\sleep(1);
-			$sValue = $oHttp->GetUrlAsString(APP_API_PATH.'activate/'.\urlencode($sDomain).'/'.\urlencode($sKey),
-				'RainLoop/'.APP_VERSION, $sContentType, $iCode, $this->Logger(), 10,
-				$this->Config()->Get('labs', 'curl_proxy', ''), $this->Config()->Get('labs', 'curl_proxy_auth', ''),
-				array(), false
-			);
-
-			if (200 !== $iCode)
-			{
-				$sValue = '';
-			}
-
-			if ($iStart + 2 > \time())
-			{
-				\sleep(1);
-			}
+			$this->requestSleep();
 
 			$aMatch = array();
 			if ('OK' === $sValue)
@@ -3639,6 +3859,7 @@ class Actions
 			else if (\preg_match('/^ERROR:(.+)$/', $sValue, $aMatch) && !empty($aMatch[1]))
 			{
 				$mResult = trim($aMatch[1]);
+
 				$this->Logger()->Write('Activation error for: '.$sKey.' ('.$sDomain.')', \MailSo\Log\Enumerations\Type::ERROR);
 				$this->Logger()->Write($mResult, \MailSo\Log\Enumerations\Type::ERROR);
 			}
@@ -3905,9 +4126,9 @@ class Actions
 	/**
 	 * @return string
 	 */
-	private function rainloopRepo()
+	private function rainLoopRepo()
 	{
-		$sUrl = APP_REP_PATH;
+		$sUrl = APP_REPOSITORY_PATH;
 		if ('' !== $sUrl)
 		{
 			$sUrl = rtrim($sUrl, '\\/').'/';
@@ -4094,7 +4315,7 @@ class Actions
 	{
 		$bRainLoopUpdatable = $this->rainLoopUpdatable();
 
-		$aResult = $this->getRepositoryDataByUrl($this->rainloopRepo(), $bReal);
+		$aResult = $this->getRepositoryDataByUrl($this->rainLoopRepo(), $bReal);
 
 		$aSub = array();
 		if (\is_array($aResult))
@@ -4240,10 +4461,10 @@ class Actions
 		$this->IsAdminLoggined();
 
 		$bReal = false;
-		$sNewVersion = '';
 
 		$bRainLoopUpdatable = $this->rainLoopUpdatable();
 		$bRainLoopAccess = $this->rainLoopCoreAccess();
+		$oPremProvider = $this->PremProvider();
 
 		$aData = array();
 		if ($bRainLoopUpdatable && $bRainLoopAccess)
@@ -4252,132 +4473,14 @@ class Actions
 		}
 
 		$bResult = false;
-		if ($bReal && !empty($aData['file']))
+		if ($bReal && $oPremProvider && !empty($aData['file']))
 		{
-			$sTmp = $this->downloadRemotePackageByUrl($aData['file']);
-			if (!empty($sTmp))
-			{
-				include_once APP_VERSION_ROOT_PATH.'app/libraries/pclzip/pclzip.lib.php';
-
-				$oArchive = new \PclZip($sTmp);
-				$sTmpFolder = APP_PRIVATE_DATA.\md5($sTmp);
-
-				\mkdir($sTmpFolder);
-				if (\is_dir($sTmpFolder))
-				{
-					$bResult = 0 !== $oArchive->extract(PCLZIP_OPT_PATH, $sTmpFolder);
-					if (!$bResult)
-					{
-						$this->Logger()->Write('Cannot extract package files: '.$oArchive->errorInfo(), \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER');
-					}
-
-					if ($bResult && \file_exists($sTmpFolder.'/index.php') &&
-						\is_writable(APP_INDEX_ROOT_PATH.'rainloop/') &&
-						\is_writable(APP_INDEX_ROOT_PATH.'index.php') &&
-						\is_dir($sTmpFolder.'/rainloop/'))
-					{
-						$aMatch = array();
-						$sIndexFile = \file_get_contents($sTmpFolder.'/index.php');
-						if (\preg_match('/\'APP_VERSION\', \'([^\']+)\'/', $sIndexFile, $aMatch) && !empty($aMatch[1]))
-						{
-							$sNewVersion = \trim($aMatch[1]);
-						}
-
-						if (empty($sNewVersion))
-						{
-							$this->Logger()->Write('Unknown version', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER');
-						}
-						else if (!\is_dir(APP_INDEX_ROOT_PATH.'rainloop/v/'.$sNewVersion))
-						{
-							\MailSo\Base\Utils::CopyDir($sTmpFolder.'/rainloop/', APP_INDEX_ROOT_PATH.'rainloop/');
-
-							if (\is_dir(APP_INDEX_ROOT_PATH.'rainloop/v/'.$sNewVersion) &&
-								\is_file(APP_INDEX_ROOT_PATH.'rainloop/v/'.$sNewVersion.'/index.php'))
-							{
-								$bResult = \copy($sTmpFolder.'/index.php', APP_INDEX_ROOT_PATH.'index.php');
-
-								if ($bResult)
-								{
-									if (\MailSo\Base\Utils::FunctionExistsAndEnabled('opcache_invalidate'))
-									{
-										@\opcache_invalidate(APP_INDEX_ROOT_PATH.'index.php', true);
-									}
-
-									if (\MailSo\Base\Utils::FunctionExistsAndEnabled('apc_delete_file'))
-									{
-										@\apc_delete_file(APP_INDEX_ROOT_PATH.'index.php');
-									}
-								}
-							}
-							else
-							{
-								$this->Logger()->Write('Cannot copy new package files', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER');
-								$this->Logger()->Write($sTmpFolder.'/rainloop/ -> '.APP_INDEX_ROOT_PATH.'rainloop/', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER');
-							}
-						}
-						else if (!empty($sNewVersion))
-						{
-							$this->Logger()->Write('"'.$sNewVersion.'" version already installed', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER');
-						}
-					}
-					else if ($bResult)
-					{
-						$this->Logger()->Write('Cannot validate package files', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER');
-					}
-
-					\MailSo\Base\Utils::RecRmDir($sTmpFolder);
-				}
-				else
-				{
-					$this->Logger()->Write('Cannot create tmp folder: '.$sTmpFolder, \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER');
-				}
-
-				@\unlink($sTmp);
-			}
+			$bResult = $oPremProvider->UpdateCore($this, $aData['file']);
 		}
 
 		return $this->DefaultResponse(__FUNCTION__, $bResult);
 	}
 
-	public function removeOldVersion()
-	{
-		$sVPath = APP_INDEX_ROOT_PATH.'rainloop/v/';
-
-		$this->Logger()->Write('Versions GC: Begin');
-
-		$aDirs = @\array_map('basename', @\array_filter(@\glob($sVPath.'*'), 'is_dir'));
-
-		$this->Logger()->Write('Versions GC: Count:'.(\is_array($aDirs) ? \count($aDirs) : 0));
-
-		if (\is_array($aDirs) && 5 < \count($aDirs))
-		{
-			\uasort($aDirs, 'version_compare');
-
-			foreach ($aDirs as $sName)
-			{
-				if (APP_DEV_VERSION !== $sName && APP_VERSION !== $sName)
-				{
-					$this->Logger()->Write('Versions GC: Begin to remove  "'.$sVPath.$sName.'" version');
-
-					if (@\unlink($sVPath.$sName.'/index.php'))
-					{
-						@\MailSo\Base\Utils::RecRmDir($sVPath.$sName);
-					}
-					else
-					{
-						$this->Logger()->Write('Versions GC (Error): index file cant be removed from"'.$sVPath.$sName.'"',
-							\MailSo\Log\Enumerations\Type::ERROR);
-					}
-
-					$this->Logger()->Write('Versions GC: End to remove  "'.$sVPath.$sName.'" version');
-					break;
-				}
-			}
-		}
-
-		$this->Logger()->Write('Versions GC: End');
-	}
-
 	/**
 	 * @return array
 	 */
@@ -4419,7 +4522,7 @@ class Actions
 	 *
 	 * @return string
 	 */
-	private function downloadRemotePackageByUrl($sUrl)
+	public function downloadRemotePackageByUrl($sUrl)
 	{
 		$bResult = false;
 		$sTmp = APP_PRIVATE_DATA.\md5(\microtime(true).$sUrl).'.zip';
@@ -4486,7 +4589,7 @@ class Actions
 		$bResult = false;
 		if ('' !== $sRealFile)
 		{
-			$sUrl = $this->rainloopRepo().$sRealFile;
+			$sUrl = $this->rainLoopRepo().$sRealFile;
 			$sTmp = $this->downloadRemotePackageByUrl($sUrl);
 		}
 
@@ -4737,11 +4840,15 @@ class Actions
 	 */
 	public function DoSettingsUpdate()
 	{
+		$oAccount = $this->getAccountFromToken();
+		if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::SETTINGS, $oAccount))
+		{
+			return $this->FalseResponse(__FUNCTION__);
+		}
+
 		$self = $this;
 		$oConfig = $this->Config();
 
-		$oAccount = $this->getAccountFromToken();
-
 		$oSettings = $this->SettingsProvider()->Load($oAccount);
 		$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
 
@@ -4817,12 +4924,14 @@ class Actions
 	 */
 	public function DoChangePassword()
 	{
+		$mResult = false;
+
 		$oAccount = $this->getAccountFromToken();
 		if ($oAccount)
 		{
 			try
 			{
-				$this->ChangePasswordProvider()->ChangePassword(
+				$mResult = $this->ChangePasswordProvider()->ChangePassword(
 					$oAccount,
 					$this->GetActionParam('PrevPassword', ''),
 					$this->GetActionParam('NewPassword', '')
@@ -4837,7 +4946,7 @@ class Actions
 			}
 		}
 
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->DefaultResponse(__FUNCTION__, $mResult);
 	}
 
 	/**
@@ -5076,15 +5185,6 @@ class Actions
 	 */
 	public function DoFolders()
 	{
-//		\sleep(1);
-//		throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::MailServerError);
-
-		$sRawKey = (string) $this->GetActionParam('RawKey', '');
-		if (0 < \strlen($sRawKey))
-		{
-			$this->verifyCacheByKey($sRawKey);
-		}
-
 		$oAccount = $this->initMailClientConnection();
 
 		$oFolderCollection = null;
@@ -5092,7 +5192,8 @@ class Actions
 
 		if (null === $oFolderCollection)
 		{
-			$oFolderCollection = $this->MailClient()->Folders('', '*',
+			$oFolderCollection = $this->MailClient()->Folders('',
+				$this->GetCapa(false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount) ? '*' : 'INBOX',
 				!!$this->Config()->Get('labs', 'use_imap_list_subscribe', true),
 				(int) $this->Config()->Get('labs', 'imap_folder_list_limit', 200)
 			);
@@ -5102,14 +5203,17 @@ class Actions
 
 		if ($oFolderCollection instanceof \MailSo\Mail\FolderCollection)
 		{
-			$aSystemFolders = array();
+			$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
 
+			$aSystemFolders = array();
 			$this->recFoldersTypes($oAccount, $oFolderCollection, $aSystemFolders);
 			$oFolderCollection->SystemFolders = $aSystemFolders;
 
-			if ($this->Config()->Get('labs', 'autocreate_system_folders', true))
+			if ($this->GetCapa(false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount) &&
+				$this->Config()->Get('labs', 'autocreate_system_folders', true))
 			{
 				$bDoItAgain = false;
+
 				$sNamespace = $oFolderCollection->GetNamespace();
 				$sParent = empty($sNamespace) ? '' : \substr($sNamespace, 0, -1);
 
@@ -5117,23 +5221,28 @@ class Actions
 
 				$aList = array();
 				$aMap = $this->systemFoldersNames($oAccount);
-				if ('' === $this->GetActionParam('SentFolder', ''))
+
+				if ('' === $oSettingsLocal->GetConf('SentFolder', ''))
 				{
 					$aList[] = \MailSo\Imap\Enumerations\FolderType::SENT;
 				}
-				if ('' === $this->GetActionParam('DraftFolder', ''))
+
+				if ('' === $oSettingsLocal->GetConf('DraftFolder', ''))
 				{
 					$aList[] = \MailSo\Imap\Enumerations\FolderType::DRAFTS;
 				}
-				if ('' === $this->GetActionParam('SpamFolder', ''))
+
+				if ('' === $oSettingsLocal->GetConf('SpamFolder', ''))
 				{
 					$aList[] = \MailSo\Imap\Enumerations\FolderType::JUNK;
 				}
-				if ('' === $this->GetActionParam('TrashFolder', ''))
+
+				if ('' === $oSettingsLocal->GetConf('TrashFolder', ''))
 				{
 					$aList[] = \MailSo\Imap\Enumerations\FolderType::TRASH;
 				}
-				if ('' === $this->GetActionParam('ArchiveFolder', ''))
+
+				if ('' === $oSettingsLocal->GetConf('ArchiveFolder', ''))
 				{
 					$aList[] = \MailSo\Imap\Enumerations\FolderType::ALL;
 				}
@@ -5208,8 +5317,6 @@ class Actions
 			if ($oFolderCollection)
 			{
 				$oFolderCollection->FoldersHash = \md5(\implode("\x0", $this->recFoldersNames($oFolderCollection)));
-
-				$this->cacheByKey($sRawKey);
 			}
 		}
 
@@ -5223,10 +5330,12 @@ class Actions
 	 */
 	public function DoFolderCreate()
 	{
-//		\sleep(1);
-//		throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantCreateFolder);
+		$oAccount = $this->initMailClientConnection();
 
-		$this->initMailClientConnection();
+		if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount))
+		{
+			return $this->FalseResponse(__FUNCTION__);
+		}
 
 		try
 		{
@@ -5249,14 +5358,19 @@ class Actions
 	 */
 	public function DoFolderSubscribe()
 	{
-		$this->initMailClientConnection();
+		$oAccount = $this->initMailClientConnection();
 
-		$sFolderNameInUtf = $this->GetActionParam('Folder', '');
+		if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount))
+		{
+			return $this->FalseResponse(__FUNCTION__);
+		}
+
+		$sFolderFullNameRaw = $this->GetActionParam('Folder', '');
 		$bSubscribe = '1' === (string) $this->GetActionParam('Subscribe', '0');
 
 		try
 		{
-			$this->MailClient()->FolderSubscribe($sFolderNameInUtf, !!$bSubscribe);
+			$this->MailClient()->FolderSubscribe($sFolderFullNameRaw, !!$bSubscribe);
 		}
 		catch (\Exception $oException)
 		{
@@ -5273,6 +5387,56 @@ class Actions
 		return $this->TrueResponse(__FUNCTION__);
 	}
 
+	/**
+	 * @return array
+	 */
+	public function DoFolderCheckable()
+	{
+		$oAccount = $this->getAccountFromToken();
+
+		if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount))
+		{
+			return $this->FalseResponse(__FUNCTION__);
+		}
+
+		$sFolderFullNameRaw = $this->GetActionParam('Folder', '');
+		$bCheckable = '1' === (string) $this->GetActionParam('Checkable', '0');
+
+		$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
+
+		$sCheckableFolder = $oSettingsLocal->GetConf('CheckableFolder', '[]');
+		$aCheckableFolder = @\json_decode($sCheckableFolder);
+
+		if (!\is_array($aCheckableFolder))
+		{
+			$aCheckableFolder = array();
+		}
+
+		if ($bCheckable)
+		{
+			$aCheckableFolder[] = $sFolderFullNameRaw;
+		}
+		else
+		{
+			$aCheckableFolderNew = array();
+			foreach ($aCheckableFolder as $sFolder)
+			{
+				if ($sFolder !== $sFolderFullNameRaw)
+				{
+					$aCheckableFolderNew[] = $sFolder;
+				}
+			}
+			$aCheckableFolder = $aCheckableFolderNew;
+		}
+
+		$aCheckableFolder = \array_unique($aCheckableFolder);
+
+		$oSettingsLocal->SetConf('CheckableFolder', @\json_encode($aCheckableFolder));
+
+		return $this->DefaultResponse(__FUNCTION__,
+			$this->SettingsProvider(true)->Save($oAccount, $oSettingsLocal));
+	}
+
 	/**
 	 * @return array
 	 *
@@ -5280,7 +5444,12 @@ class Actions
 	 */
 	public function DoFolderRename()
 	{
-		$this->initMailClientConnection();
+		$oAccount = $this->initMailClientConnection();
+
+		if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount))
+		{
+			return $this->FalseResponse(__FUNCTION__);
+		}
 
 		$sPrevFolderFullNameRaw = $this->GetActionParam('Folder', '');
 		$sNewTopFolderNameInUtf = $this->GetActionParam('NewFolderName', '');
@@ -5305,10 +5474,12 @@ class Actions
 	 */
 	public function DoFolderDelete()
 	{
-//		\sleep(1);
-//		throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantRenameFolder);
+		$oAccount = $this->initMailClientConnection();
 
-		$this->initMailClientConnection();
+		if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::FOLDERS, $oAccount))
+		{
+			return $this->FalseResponse(__FUNCTION__);
+		}
 
 		$sFolderFullNameRaw = $this->GetActionParam('Folder', '');
 
@@ -5454,45 +5625,6 @@ class Actions
 		return $this->DefaultResponse(__FUNCTION__, $aResult);
 	}
 
-	/**
-	 * @return array
-	 *
-	 * @throws \MailSo\Base\Exceptions\Exception
-	 */
-	public function DoMessageThreadsFromCache()
-	{
-		$sFolder = $this->GetActionParam('Folder', '');
-		$sFolderHash = $this->GetActionParam('FolderHash', '');
-		$sUid = (string) $this->GetActionParam('Uid', '');
-
-		if (0 === \strlen($sFolder) || 0 === \strlen($sUid))
-		{
-			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::InvalidInputArgument);
-		}
-
-		$aResult = array(
-			'Folder' => $sFolder,
-			'Uid' => $sUid,
-			'FolderHash' => $sFolderHash,
-			'ThreadUids' => null
-		);
-
-		$oCache = $this->cacherForUids();
-		if ($oCache && $this->Config()->Get('labs', 'use_imap_thread', false))
-		{
-			$aThreadUids = $this->MailClient()->MessageThreadUidsFromCache(
-				$sFolder, $sFolderHash, $sUid, $oCache
-			);
-
-			if (\is_array($aThreadUids) && 1 < \count($aThreadUids))
-			{
-				$aResult['ThreadUids'] = $aThreadUids;
-			}
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, $aResult);
-	}
-
 	/**
 	 * @return array
 	 *
@@ -5509,11 +5641,12 @@ class Actions
 		$sSearch = '';
 		$sUidNext = '';
 		$bUseThreads = false;
+		$sThreadUid = '';
 
 		$sRawKey = $this->GetActionParam('RawKey', '');
 		$aValues = $this->getDecodedClientRawKeyValue($sRawKey, 9);
 
-		if (\is_array($aValues) && 9 === \count($aValues))
+		if (\is_array($aValues) && 7 < \count($aValues))
 		{
 			$sFolder =(string) $aValues[0];
 			$iOffset = (int) $aValues[1];
@@ -5522,6 +5655,11 @@ class Actions
 			$sUidNext = (string) $aValues[6];
 			$bUseThreads = (bool) $aValues[7];
 
+			if ($bUseThreads)
+			{
+				$sThreadUid = isset($aValues[8]) ? (string) $aValues[8] : '';
+			}
+
 			$this->verifyCacheByKey($sRawKey);
 		}
 		else
@@ -5532,6 +5670,11 @@ class Actions
 			$sSearch = $this->GetActionParam('Search', '');
 			$sUidNext = $this->GetActionParam('UidNext', '');
 			$bUseThreads = '1' === (string) $this->GetActionParam('UseThreads', '0');
+
+			if ($bUseThreads)
+			{
+				$sThreadUid = (string) $this->GetActionParam('ThreadUid', '');
+			}
 		}
 
 		if (0 === strlen($sFolder))
@@ -5553,7 +5696,8 @@ class Actions
 				$this->cacherForUids(),
 				!!$this->Config()->Get('labs', 'use_imap_sort', false),
 				$bUseThreads,
-				!!$this->Config()->Get('labs', 'use_imap_esearch_esort', false)
+				$sThreadUid,
+				''
 			);
 		}
 		catch (\Exception $oException)
@@ -5569,40 +5713,6 @@ class Actions
 		return $this->DefaultResponse(__FUNCTION__, $oMessageList);
 	}
 
-	/**
-	 * @return array
-	 *
-	 * @throws \MailSo\Base\Exceptions\Exception
-	 */
-	public function DoMessageListSimple()
-	{
-//		\sleep(2);
-//		throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList);
-
-		$sFolder = $this->GetActionParam('Folder', '');
-		$aUids = $this->GetActionParam('Uids', null);
-
-		if (0 === \strlen($sFolder) || !\is_array($aUids))
-		{
-			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::InvalidInputArgument);
-		}
-
-		$this->initMailClientConnection();
-
-		$aMessageList = array();
-
-		try
-		{
-			$aMessageList = $this->MailClient()->MessageListSimple($sFolder, $aUids);
-		}
-		catch (\Exception $oException)
-		{
-			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList, $oException);
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, $aMessageList);
-	}
-
 	/**
 	 * @param \RainLoop\Model\Account $oAccount
 	 * @param bool $bWithDraftInfo = true
@@ -5854,6 +5964,11 @@ class Actions
 	{
 		$oAccount = $this->initMailClientConnection();
 
+		if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::COMPOSER, $oAccount))
+		{
+			return $this->FalseResponse(__FUNCTION__);
+		}
+
 		$sMessageFolder = $this->GetActionParam('MessageFolder', '');
 		$sMessageUid = $this->GetActionParam('MessageUid', '');
 
@@ -5976,11 +6091,26 @@ class Actions
 								list($sMailHeaders, $sMailBody) = \explode("\r\n\r\n", $sRawBody, 2);
 								unset($sRawBody);
 
-//								$this->Logger()->WriteDump(array(
-//									$sMailTo, $sMailSubject, $sMailBody, $sMailHeaders
-//								));
+								if ($this->Config()->Get('labs', 'mail_func_clear_headers', true))
+								{
+									$sMailHeaders = \MailSo\Base\Utils::RemoveHeaderFromHeaders($sMailHeaders, array(
+										\MailSo\Mime\Enumerations\Header::TO_,
+										\MailSo\Mime\Enumerations\Header::SUBJECT
+									));
+								}
 
-								if (!\mail($sMailTo, $sMailSubject, $sMailBody, $sMailHeaders/*, '-f'.$oFrom->GetEmail()*/))
+								if ($this->Config()->Get('debug', 'enable', false))
+								{
+									$this->Logger()->WriteDump(array(
+										$sMailTo, $sMailSubject, $sMailBody, $sMailHeaders
+									));
+								}
+
+								$bR = $this->Config()->Get('labs', 'mail_func_additional_parameters', false) ?
+									\mail($sMailTo, $sMailSubject, $sMailBody, $sMailHeaders, '-f'.$oFrom->GetEmail()) :
+									\mail($sMailTo, $sMailSubject, $sMailBody, $sMailHeaders);
+
+								if (!$bR)
 								{
 									throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage);
 								}
@@ -6066,6 +6196,11 @@ class Actions
 	{
 		$oAccount = $this->initMailClientConnection();
 
+		if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::COMPOSER, $oAccount))
+		{
+			return $this->FalseResponse(__FUNCTION__);
+		}
+
 		$oConfig = $this->Config();
 
 		$sDraftFolder = $this->GetActionParam('MessageFolder', '');
@@ -6251,6 +6386,11 @@ class Actions
 	{
 		$oAccount = $this->initMailClientConnection();
 
+		if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::COMPOSER, $oAccount))
+		{
+			return $this->FalseResponse(__FUNCTION__);
+		}
+
 		$oMessage = $this->buildReadReceiptMessage($oAccount);
 
 		$this->Plugins()->RunHook('filter.send-read-receipt-message', array(&$oMessage, $oAccount));
@@ -6318,7 +6458,12 @@ class Actions
 	 */
 	public function DoQuota()
 	{
-		$this->initMailClientConnection();
+		$oAccount = $this->initMailClientConnection();
+
+		if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::QUOTA, $oAccount))
+		{
+			return $this->DefaultResponse(__FUNCTION__, array(0, 0, 0, 0));
+		}
 
 		try
 		{
@@ -6576,7 +6721,8 @@ class Actions
 			))
 		);
 
-		\sleep(1);
+		$this->requestSleep();
+
 		return $this->DefaultResponse(__FUNCTION__,
 			$this->getTwoFactorInfo($oAccount));
 	}
@@ -6660,7 +6806,8 @@ class Actions
 //			$this->TwoFactorAuthProvider()->VerifyCode($sSecret, $sCode)
 //		));
 
-		\sleep(1);
+		$this->requestSleep();
+
 		return $this->DefaultResponse(__FUNCTION__,
 			$this->TwoFactorAuthProvider()->VerifyCode($sSecret, $sCode));
 	}
@@ -6795,6 +6942,8 @@ class Actions
 				$oContact->Etag = \md5($oContact->ToVCard());
 			}
 
+			$oContact->PopulateDisplayAndFullNameValue(true);
+
 			$bResult = $oAddressBookProvider->ContactSave($oAccount->ParentEmailHelper(), $oContact);
 		}
 
@@ -6857,8 +7006,7 @@ class Actions
 			$oSuggestionsProvider = $this->SuggestionsProvider();
 			if ($oSuggestionsProvider && $oSuggestionsProvider->IsActive())
 			{
-				$iSuggestionLimit = $iLimit - \count($aResult);
-				$aSuggestionsProviderResult = $oSuggestionsProvider->Process($oAccount, $sQuery, $iSuggestionLimit);
+				$aSuggestionsProviderResult = $oSuggestionsProvider->Process($oAccount, $sQuery, $iLimit);
 				if (\is_array($aSuggestionsProviderResult) && 0 < \count($aSuggestionsProviderResult))
 				{
 					$aResult = \array_merge($aResult, $aSuggestionsProviderResult);
@@ -7043,12 +7191,25 @@ class Actions
 		$sFromFolder = $this->GetActionParam('FromFolder', '');
 		$sToFolder = $this->GetActionParam('ToFolder', '');
 		$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
+		$bMarkAsRead = '1' === (string) $this->GetActionParam('MarkAsRead', '0');
 
 		$aFilteredUids = \array_filter($aUids, function (&$mUid) {
 			$mUid = (int) \trim($mUid);
 			return 0 < $mUid;
 		});
 
+		if ($bMarkAsRead)
+		{
+			try
+			{
+				$this->MailClient()->MessageSetSeen($sFromFolder, $aFilteredUids, true, true);
+			}
+			catch (\Exception $oException)
+			{
+				unset($oException);
+			}
+		}
+
 		try
 		{
 			$this->MailClient()->MessageMove($sFromFolder, $sToFolder, $aFilteredUids, true,
@@ -7112,7 +7273,7 @@ class Actions
 	public function MainClearFileName($sFileName, $sContentType, $sMimeIndex, $iMaxLength = 250)
 	{
 		$sFileName = 0 === \strlen($sFileName) ? \preg_replace('/[^a-zA-Z0-9]/', '.', (empty($sMimeIndex) ? '' : $sMimeIndex.'.').$sContentType) : $sFileName;
-		$sClearedFileName = \preg_replace('/[\s]+/', ' ', \preg_replace('/[\.]+/', '.', $sFileName));
+		$sClearedFileName = \MailSo\Base\Utils::StripSpaces(\preg_replace('/[\.]+/', '.', $sFileName));
 		$sExt = \MailSo\Base\Utils::GetFileExtension($sClearedFileName);
 
 		if (10 < $iMaxLength && $iMaxLength < \strlen($sClearedFileName) - \strlen($sExt))
@@ -7136,19 +7297,19 @@ class Actions
 		try
 		{
 			$aAttachments = $this->GetActionParam('Attachments', array());
-			if (is_array($aAttachments) && 0 < count($aAttachments))
+			if (\is_array($aAttachments) && 0 < \count($aAttachments))
 			{
 				$mResult = array();
 				foreach ($aAttachments as $sAttachment)
 				{
-					$aValues = \RainLoop\Utils::DecodeKeyValues($sAttachment);
-					if (is_array($aValues))
+					$aValues = \RainLoop\Utils::DecodeKeyValuesQ($sAttachment);
+					if (\is_array($aValues))
 					{
 						$sFolder = isset($aValues['Folder']) ? $aValues['Folder'] : '';
 						$iUid = (int) isset($aValues['Uid']) ? $aValues['Uid'] : 0;
 						$sMimeIndex = (string) isset($aValues['MimeIndex']) ? $aValues['MimeIndex'] : '';
 
-						$sTempName = md5($sAttachment);
+						$sTempName = \md5($sAttachment);
 						if (!$this->FilesProvider()->FileExists($oAccount, $sTempName))
 						{
 							$this->MailClient()->MessageMimeStream(
@@ -7724,10 +7885,10 @@ class Actions
 		$iUid = (int) (isset($aValues['Uid']) ? $aValues['Uid'] : 0);
 		$sMimeIndex = (string) (isset($aValues['MimeIndex']) ? $aValues['MimeIndex'] : '');
 
-		header('Content-Type: text/plain', true);
+		\header('Content-Type: text/plain', true);
 
 		return $this->MailClient()->MessageMimeStream(function ($rResource) {
-			if (is_resource($rResource))
+			if (\is_resource($rResource))
 			{
 				\MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource);
 			}
@@ -7746,7 +7907,7 @@ class Actions
 			$aParams = $this->GetActionParam('Params', null);
 			$this->Http()->ServerNoCache();
 
-			$aData = \RainLoop\Utils::DecodeKeyValues($sRawKey);
+			$aData = \RainLoop\Utils::DecodeKeyValuesQ($sRawKey);
 			if (isset($aParams[0], $aParams[1], $aParams[2]) &&
 				'Raw' === $aParams[0] && 'FramedView' === $aParams[2] && isset($aData['Framed']) && $aData['Framed'] && $aData['FileName'])
 			{
@@ -7831,23 +7992,73 @@ class Actions
 
 		$aResult = array();
 
-		if ($oConfig->Get('capa', 'filters', false))
+		if ($oConfig->Get('capa', 'folders', true))
 		{
-			$aResult[] = \RainLoop\Enumerations\Capa::FILTERS;
-			if ($bAdmin || ($oAccount && $oAccount->Domain()->UseSieve()))
+			$aResult[] = \RainLoop\Enumerations\Capa::FOLDERS;
+
+			if ($oConfig->Get('capa', 'messagelist_actions', true))
 			{
-				$aResult[] = \RainLoop\Enumerations\Capa::SIEVE;
+				$aResult[] = \RainLoop\Enumerations\Capa::MESSAGELIST_ACTIONS;
+
+				if ($oConfig->Get('capa', 'dangerous_actions', true))
+				{
+					$aResult[] = \RainLoop\Enumerations\Capa::DANGEROUS_ACTIONS;
+				}
 			}
 		}
 
-//		if ($oConfig->Get('capa', 'templates', true))
-//		{
-//			$aResult[] = \RainLoop\Enumerations\Capa::TEMPLATES;
-//		}
-
-		if ($oConfig->Get('webmail', 'allow_additional_accounts', false))
+		if ($oConfig->Get('capa', 'reload', true))
 		{
-			$aResult[] = \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS;
+			$aResult[] = \RainLoop\Enumerations\Capa::RELOAD;
+		}
+
+		if ($oConfig->Get('capa', 'quota', true))
+		{
+			$aResult[] = \RainLoop\Enumerations\Capa::QUOTA;
+		}
+
+		if ($oConfig->Get('capa', 'settings', true))
+		{
+			$aResult[] = \RainLoop\Enumerations\Capa::SETTINGS;
+
+			if ($oConfig->Get('webmail', 'allow_additional_accounts', false))
+			{
+				$aResult[] = \RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS;
+			}
+
+			if ($oConfig->Get('webmail', 'allow_additional_identities', false))
+			{
+				$aResult[] = \RainLoop\Enumerations\Capa::IDENTITIES;
+			}
+
+			if ($oConfig->Get('capa', 'x-templates', true))
+			{
+				$aResult[] = \RainLoop\Enumerations\Capa::TEMPLATES;
+			}
+
+			if ($oConfig->Get('webmail', 'allow_themes', false))
+			{
+				$aResult[] = \RainLoop\Enumerations\Capa::THEMES;
+			}
+
+			if ($oConfig->Get('webmail', 'allow_user_background', false))
+			{
+				$aResult[] = \RainLoop\Enumerations\Capa::USER_BACKGROUND;
+			}
+
+			if ($oConfig->Get('security', 'openpgp', false))
+			{
+				$aResult[] = \RainLoop\Enumerations\Capa::OPEN_PGP;
+			}
+
+			if ($oConfig->Get('capa', 'filters', false))
+			{
+				$aResult[] = \RainLoop\Enumerations\Capa::FILTERS;
+				if ($bAdmin || ($oAccount && $oAccount->Domain()->UseSieve()))
+				{
+					$aResult[] = \RainLoop\Enumerations\Capa::SIEVE;
+				}
+			}
 		}
 
 		if ($oConfig->Get('security', 'allow_two_factor_auth', false) &&
@@ -7862,6 +8073,41 @@ class Actions
 			}
 		}
 
+		if ($oConfig->Get('capa', 'help', true))
+		{
+			$aResult[] = \RainLoop\Enumerations\Capa::HELP;
+		}
+
+		if ($oConfig->Get('capa', 'attachments_actions', false))
+		{
+			$aResult[] = \RainLoop\Enumerations\Capa::ATTACHMENTS_ACTIONS;
+		}
+
+		if ($oConfig->Get('capa', 'message_actions', true))
+		{
+			$aResult[] = \RainLoop\Enumerations\Capa::MESSAGE_ACTIONS;
+		}
+
+		if ($oConfig->Get('capa', 'composer', true))
+		{
+			$aResult[] = \RainLoop\Enumerations\Capa::COMPOSER;
+
+			if ($oConfig->Get('capa', 'contacts', true))
+			{
+				$aResult[] = \RainLoop\Enumerations\Capa::CONTACTS;
+			}
+		}
+
+		if ($oConfig->Get('capa', 'search', true))
+		{
+			$aResult[] = \RainLoop\Enumerations\Capa::SEARCH;
+
+			if ($oConfig->Get('capa', 'search_adv', true))
+			{
+				$aResult[] = \RainLoop\Enumerations\Capa::SEARCH_ADV;
+			}
+		}
+
 		if ($oConfig->Get('labs', 'allow_gravatar', false))
 		{
 			$aResult[] = \RainLoop\Enumerations\Capa::GRAVATAR;
@@ -7877,21 +8123,6 @@ class Actions
 			$aResult[] = \RainLoop\Enumerations\Capa::PREFETCH;
 		}
 
-		if ($oConfig->Get('webmail', 'allow_themes', false))
-		{
-			$aResult[] = \RainLoop\Enumerations\Capa::THEMES;
-		}
-
-		if ($oConfig->Get('webmail', 'allow_user_background', false))
-		{
-			$aResult[] = \RainLoop\Enumerations\Capa::USER_BACKGROUND;
-		}
-
-		if ($oConfig->Get('security', 'openpgp', false))
-		{
-			$aResult[] = \RainLoop\Enumerations\Capa::OPEN_PGP;
-		}
-
 		if (!\RainLoop\Utils::IsOwnCloud())
 		{
 			$aResult[] = \RainLoop\Enumerations\Capa::AUTOLOGOUT;
@@ -7955,6 +8186,57 @@ class Actions
 		}
 	}
 
+	/**
+	 * @param \RainLoop\Model\Account $oAccount
+	 * @param string $sHash
+	 *
+	 * @return array
+	 */
+	private function getMimeFileByHash($oAccount, $sHash)
+	{
+		$aValues = $this->getDecodedRawKeyValue($sHash);
+
+		$sFolder = isset($aValues['Folder']) ? $aValues['Folder'] : '';
+		$iUid = (int) isset($aValues['Uid']) ? $aValues['Uid'] : 0;
+		$sMimeIndex = (string) isset($aValues['MimeIndex']) ? $aValues['MimeIndex'] : '';
+
+		$sContentTypeIn = (string) isset($aValues['MimeType']) ? $aValues['MimeType'] : '';
+		$sFileNameIn = (string) isset($aValues['FileName']) ? $aValues['FileName'] : '';
+
+		$oFileProvider = $this->FilesProvider();
+
+		$sResultHash = '';
+
+		$mResult = $this->MailClient()->MessageMimeStream(function($rResource, $sContentType, $sFileName, $sMimeIndex = '')
+			use ($oAccount, $oFileProvider, $sFileNameIn, $sContentTypeIn, &$sResultHash) {
+
+				if ($oAccount && \is_resource($rResource))
+				{
+					$sHash = \MailSo\Base\Utils::Md5Rand($sFileNameIn.'~'.$sContentTypeIn);
+					$rTempResource = $oFileProvider->GetFile($oAccount, $sHash, 'wb+');
+
+					if (@\is_resource($rTempResource))
+					{
+						if (false !== \MailSo\Base\Utils::MultipleStreamWriter($rResource, array($rTempResource)))
+						{
+							$sResultHash = $sHash;
+						}
+
+						@\fclose($rTempResource);
+					}
+				}
+
+			}, $sFolder, $iUid, true, $sMimeIndex);
+
+		$aValues['FileHash'] = '';
+		if ($mResult)
+		{
+			$aValues['FileHash'] = $sResultHash;
+		}
+
+		return $aValues;
+	}
+
 	/**
 	 * @param bool $bDownload
 	 * @param bool $bThumbnail = false
@@ -7967,15 +8249,50 @@ class Actions
 		$aValues = $this->getDecodedRawKeyValue($sRawKey);
 
 		$sFolder = isset($aValues['Folder']) ? $aValues['Folder'] : '';
-		$iUid = (int) isset($aValues['Uid']) ? $aValues['Uid'] : 0;
-		$sMimeIndex = (string) isset($aValues['MimeIndex']) ? $aValues['MimeIndex'] : '';
+		$iUid = isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0;
+		$sMimeIndex = isset($aValues['MimeIndex']) ? (string) $aValues['MimeIndex'] : '';
 
-		$sContentTypeIn = (string) isset($aValues['MimeType']) ? $aValues['MimeType'] : '';
-		$sFileNameIn = (string) isset($aValues['FileName']) ? $aValues['FileName'] : '';
+		$sContentTypeIn = isset($aValues['MimeType']) ? (string) $aValues['MimeType'] : '';
+		$sFileNameIn = isset($aValues['FileName']) ? (string) $aValues['FileName'] : '';
+		$sFileHashIn = isset($aValues['FileHash']) ? (string) $aValues['FileHash'] : '';
 
-		if (!empty($sFolder) && 0 < $iUid)
+		if (!empty($sFileHashIn))
 		{
 			$this->verifyCacheByKey($sRawKey);
+
+			$oAccount = $this->getAccountFromToken();
+
+			$sContentTypeOut = empty($sContentTypeIn) ?
+				\MailSo\Base\Utils::MimeContentType($sFileNameIn) : $sContentTypeIn;
+
+			$sFileNameOut = $this->MainClearFileName($sFileNameIn, $sContentTypeIn, $sMimeIndex);
+
+			$rResource = $this->FilesProvider()->GetFile($oAccount, $sFileHashIn);
+			if (\is_resource($rResource))
+			{
+				$sFileNameOut = \MailSo\Base\Utils::ConvertEncoding(
+					$sFileNameOut, \MailSo\Base\Enumerations\Charset::UTF_8,
+						\MailSo\Base\Enumerations\Charset::CP858);
+
+				\header('Content-Type: '.$sContentTypeOut);
+				\header('Content-Disposition: attachment; '.
+					\trim(\MailSo\Base\Utils::EncodeHeaderUtf8AttributeValue('filename', $sFileNameOut)), true);
+
+				\header('Accept-Ranges: none', true);
+				\header('Content-Transfer-Encoding: binary');
+
+				\MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource);
+				return true;
+			}
+
+			return false;
+		}
+		else
+		{
+			if (!empty($sFolder) && 0 < $iUid)
+			{
+				$this->verifyCacheByKey($sRawKey);
+			}
 		}
 
 		$oAccount = $this->initMailClientConnection();
@@ -8008,21 +8325,28 @@ class Actions
 					$bDone = false;
 					if ($bThumbnail && !$bDownload)
 					{
-						\MailSo\Base\StreamWrappers\TempFile::Reg();
+						$sFileName = '';
+						$rTempResource = \MailSo\Base\StreamWrappers\TempFile::CreateStream(
+							\MailSo\Base\Utils::Md5Rand($sFileNameOut), $sFileName);
 
-						$sFileName = 'mailsotempfile://'.\MailSo\Base\Utils::Md5Rand($sFileNameOut);
-
-						$rTempResource = @\fopen($sFileName, 'r+b');
 						if (@\is_resource($rTempResource))
 						{
+							$bDone = true;
+
 							\MailSo\Base\Utils::MultipleStreamWriter($rResource, array($rTempResource));
 							@\fclose($rTempResource);
 
-							$oThumb =@ new \PHPThumb\GD($sFileName);
-							if ($oThumb)
+							try
 							{
-								$oThumb->adaptiveResize(60, 60)->show();
-								$bDone = true;
+								$oThumb = new \PHPThumb\GD($sFileName);
+								if ($oThumb)
+								{
+									$oThumb->adaptiveResize(60, 60)->show();
+								}
+							}
+							catch (\Exception $oException)
+							{
+								$self->Logger()->WriteExceptionShort($oException);
 							}
 						}
 					}
@@ -8321,7 +8645,7 @@ class Actions
 		$bResult = false;
 		if (!empty($sRawKey))
 		{
-			$aValues = \RainLoop\Utils::DecodeKeyValues($sRawKey);
+			$aValues = \RainLoop\Utils::DecodeKeyValuesQ($sRawKey);
 			if (is_array($aValues))
 			{
 				$bResult = $aValues;
@@ -8369,10 +8693,11 @@ class Actions
 	 * @param string  $sDefault = ''
 	 * @param bool $bAdmin = false
 	 * @param bool $bSearchShortName = false
+	 * @param bool $bAllowEmptyResult = false
 	 *
 	 * @return string
 	 */
-	public function ValidateLanguage($sLanguage, $sDefault = '', $bAdmin = false, $bSearchShortName = false)
+	public function ValidateLanguage($sLanguage, $sDefault = '', $bAdmin = false, $bSearchShortName = false, $bAllowEmptyResult = false)
 	{
 		$sResult = '';
 		$aLang = $this->GetLanguages($bAdmin);
@@ -8398,7 +8723,7 @@ class Actions
 				$sResult = $sDefault;
 			}
 
-			if (empty($sResult))
+			if (empty($sResult) && !$bAllowEmptyResult)
 			{
 				$sResult = $this->Config()->Get('webmail', $bAdmin ? 'language_admin' : 'language', 'en');
 				$sResult = \in_array($sResult, $aLang) ? $sResult : 'en';
@@ -9050,17 +9375,59 @@ class Actions
 		if (\is_object($mResponse))
 		{
 			$bHook = true;
+			$self = $this;
 			$sClassName = \get_class($mResponse);
 			$bHasSimpleJsonFunc = \method_exists($mResponse, 'ToSimpleJSON');
 			$bThumb = $this->GetCapa(false, \RainLoop\Enumerations\Capa::ATTACHMENT_THUMBNAILS);
 
+			$oAccountCache = null;
+			$fGetAccount = function () use ($self, &$oAccountCache) {
+				if (null === $oAccountCache)
+				{
+					$oAccount = $self->getAccountFromToken(false);
+					$oAccountCache = $oAccount;
+				}
+
+				return $oAccountCache;
+			};
+
+			$aCheckableFoldersCache = null;
+			$fGetCheckableFolder = function () use ($self, &$aCheckableFoldersCache) {
+				if (null === $aCheckableFoldersCache)
+				{
+					$oAccount = $self->getAccountFromToken(false);
+
+					$oSettingsLocal = $self->SettingsProvider(true)->Load($oAccount);
+					$sCheckable = $oSettingsLocal->GetConf('CheckableFolder', '[]');
+					$aCheckable = @\json_decode($sCheckable);
+					if (!\is_array($aCheckable))
+					{
+						$aCheckable = array();
+					}
+
+					$aCheckableFoldersCache = $aCheckable;
+				}
+
+				return $aCheckableFoldersCache;
+			};
+
 			if ($bHasSimpleJsonFunc)
 			{
 				$mResult = \array_merge($this->objectData($mResponse, $sParent, $aParameters), $mResponse->ToSimpleJSON(true));
 			}
 			else if ('MailSo\Mail\Message' === $sClassName)
 			{
-				$oAccount = $this->getAccountFromToken(false);
+				$oAccount = \call_user_func($fGetAccount);
+
+				$iDateTimeStampInUTC = $mResponse->InternalTimeStampInUTC();
+				if (0 === $iDateTimeStampInUTC || !!$this->Config()->Get('labs', 'date_from_headers', false))
+				{
+					$iDateTimeStampInUTC = $mResponse->HeaderTimeStampInUTC();
+					if (0 === $iDateTimeStampInUTC)
+					{
+						$iDateTimeStampInUTC = $mResponse->InternalTimeStampInUTC();
+					}
+				}
 
 				$mResult = \array_merge($this->objectData($mResponse, $sParent, $aParameters), array(
 					'Folder' => $mResponse->Folder(),
@@ -9068,8 +9435,7 @@ class Actions
 					'Subject' => \trim(\MailSo\Base\Utils::Utf8Clear($mResponse->Subject())),
 					'MessageId' => $mResponse->MessageId(),
 					'Size' => $mResponse->Size(),
-					'DateTimeStampInUTC' => !!$this->Config()->Get('labs', 'date_from_headers', false)
-						? $mResponse->HeaderTimeStampInUTC() : $mResponse->InternalTimeStampInUTC(),
+					'DateTimeStampInUTC' => $iDateTimeStampInUTC,
 					'ReplyTo' => $this->responseObject($mResponse->ReplyTo(), $sParent, $aParameters),
 					'From' => $this->responseObject($mResponse->From(), $sParent, $aParameters),
 					'To' => $this->responseObject($mResponse->To(), $sParent, $aParameters),
@@ -9094,7 +9460,7 @@ class Actions
 
 				$sSubject = $mResult['Subject'];
 				$mResult['Hash'] = \md5($mResult['Folder'].$mResult['Uid']);
-				$mResult['RequestHash'] = \RainLoop\Utils::EncodeKeyValues(array(
+				$mResult['RequestHash'] = \RainLoop\Utils::EncodeKeyValuesQ(array(
 					'V' => APP_VERSION,
 					'Account' => $oAccount ? \md5($oAccount->Hash()) : '',
 					'Folder' => $mResult['Folder'],
@@ -9116,6 +9482,11 @@ class Actions
 				$mResult['IsForwarded'] = 0 < \strlen($sForwardedFlag) && \in_array(\strtolower($sForwardedFlag), $aFlags);
 				$mResult['IsReadReceipt'] = 0 < \strlen($sReadReceiptFlag) && \in_array(\strtolower($sReadReceiptFlag), $aFlags);
 
+				if (!$this->GetCapa(false, \RainLoop\Enumerations\Capa::COMPOSER, $oAccount))
+				{
+					$mResult['IsReadReceipt'] = true;
+				}
+
 				$mResult['TextPartIsTrimmed'] = false;
 
 				if ('Message' === $sParent)
@@ -9155,11 +9526,29 @@ class Actions
 					$mResult['InReplyTo'] = $mResponse->InReplyTo();
 					$mResult['References'] = $mResponse->References();
 
+					$fAdditionalDomReader = null;
+					if (0 < \strlen($sHtml) && $this->Config()->Get('labs', 'emogrifier', false))
+					{
+						if (!\class_exists('Pelago\Emogrifier', false))
+						{
+							include_once APP_VERSION_ROOT_PATH.'app/libraries/emogrifier/Emogrifier.php';
+						}
+
+						if (\class_exists('Pelago\Emogrifier', false))
+						{
+							$fAdditionalDomReader = function ($oDom) {
+								$oEmogrifier = new \Pelago\Emogrifier();
+								$oEmogrifier->preserveEncoding = false;
+								return $oEmogrifier->emogrify($oDom);
+							};
+						}
+					}
+
 					$fAdditionalExternalFilter = null;
 					if (!!$this->Config()->Get('labs', 'use_local_proxy_for_external_images', false))
 					{
 						$fAdditionalExternalFilter = function ($sUrl) {
-							return './?/ProxyExternal/'.\RainLoop\Utils::EncodeKeyValues(array(
+							return './?/ProxyExternal/'.\RainLoop\Utils::EncodeKeyValuesQ(array(
 								'Rnd' => \md5(\microtime(true)),
 								'Token' => \RainLoop\Utils::GetConnectionToken(),
 								'Url' => $sUrl
@@ -9167,9 +9556,14 @@ class Actions
 						};
 					}
 
+//					$this->Logger()->Write('---');
+//					$this->Logger()->Write($sHtml);
+
 					$mResult['Html'] = 0 === \strlen($sHtml) ? '' : \MailSo\Base\HtmlUtils::ClearHtml(
 						$sHtml, $bHasExternals, $mFoundedCIDs, $aContentLocationUrls, $mFoundedContentLocationUrls, false, false,
-						$fAdditionalExternalFilter);
+						$fAdditionalExternalFilter, $fAdditionalDomReader,
+						!!$this->Config()->Get('labs', 'try_to_detect_hidden_images', false)
+					);
 
 					$mResult['ExternalProxy'] = null !== $fAdditionalExternalFilter;
 
@@ -9309,7 +9703,7 @@ class Actions
 					$mResult['IsThumbnail'] = $this->isFileHasThumbnail($mResult['FileName']);
 				}
 
-				$mResult['Download'] = \RainLoop\Utils::EncodeKeyValues(array(
+				$mResult['Download'] = \RainLoop\Utils::EncodeKeyValuesQ(array(
 					'V' => APP_VERSION,
 					'Account' => $oAccount ? \md5($oAccount->Hash()) : '',
 					'Folder' => $mResult['Folder'],
@@ -9323,16 +9717,24 @@ class Actions
 			else if ('MailSo\Mail\Folder' === $sClassName)
 			{
 				$aExtended = null;
-				$mStatus = $mResponse->Status();
-				if (\is_array($mStatus) && isset($mStatus['MESSAGES'], $mStatus['UNSEEN'], $mStatus['UIDNEXT']))
+
+//				$mStatus = $mResponse->Status();
+//				if (\is_array($mStatus) && isset($mStatus['MESSAGES'], $mStatus['UNSEEN'], $mStatus['UIDNEXT']))
+//				{
+//					$aExtended = array(
+//						'MessageCount' => (int) $mStatus['MESSAGES'],
+//						'MessageUnseenCount' => (int) $mStatus['UNSEEN'],
+//						'UidNext' => (string) $mStatus['UIDNEXT'],
+//						'Hash' => $this->MailClient()->GenerateFolderHash(
+//							$mResponse->FullNameRaw(), $mStatus['MESSAGES'], $mStatus['UNSEEN'], $mStatus['UIDNEXT'],
+//								empty($mStatus['HIGHESTMODSEQ']) ? '' : $mStatus['HIGHESTMODSEQ'])
+//					);
+//				}
+
+				$aCheckableFolder = \call_user_func($fGetCheckableFolder);
+				if (!\is_array($aCheckableFolder))
 				{
-					$aExtended = array(
-						'MessageCount' => (int) $mStatus['MESSAGES'],
-						'MessageUnseenCount' => (int) $mStatus['UNSEEN'],
-						'UidNext' => (string) $mStatus['UIDNEXT'],
-						'Hash' => $this->MailClient()->GenerateFolderHash(
-							$mResponse->FullNameRaw(), $mStatus['MESSAGES'], $mStatus['UNSEEN'], $mStatus['UIDNEXT'])
-					);
+					$aCheckableFolder = array();
 				}
 
 				$mResult = \array_merge($this->objectData($mResponse, $sParent, $aParameters), array(
@@ -9346,6 +9748,7 @@ class Actions
 					'IsExists' => $mResponse->IsExists(),
 					'IsSelectable' => $mResponse->IsSelectable(),
 					'Flags' => $mResponse->FlagsLowerCase(),
+					'Checkable' => \in_array($mResponse->FullNameRaw(), $aCheckableFolder),
 					'Extended' => $aExtended,
 					'SubFolders' => $this->responseObject($mResponse->SubFolders(), $sParent, $aParameters)
 				));
@@ -9359,8 +9762,9 @@ class Actions
 					'Folder' => $mResponse->FolderName,
 					'FolderHash' => $mResponse->FolderHash,
 					'UidNext' => $mResponse->UidNext,
+					'ThreadUid' => $mResponse->ThreadUid,
 					'NewMessages' => $this->responseObject($mResponse->NewMessages),
-//					'LastCollapsedThreadUids' => $mResponse->LastCollapsedThreadUids,
+					'Filtered' => $mResponse->Filtered,
 					'Offset' => $mResponse->Offset,
 					'Limit' => $mResponse->Limit,
 					'Search' => $mResponse->Search
@@ -9379,7 +9783,9 @@ class Actions
 					'FoldersHash' => isset($mResponse->FoldersHash) ? $mResponse->FoldersHash : '',
 					'IsThreadsSupported' => $mResponse->IsThreadsSupported,
 					'Optimized' => $mResponse->Optimized,
-					'SystemFolders' => isset($mResponse->SystemFolders) && \is_array($mResponse->SystemFolders) ? $mResponse->SystemFolders : array()
+					'CountRec' => $mResponse->CountRec(),
+					'SystemFolders' => isset($mResponse->SystemFolders) && \is_array($mResponse->SystemFolders) ?
+						$mResponse->SystemFolders : array()
 				));
 			}
 			else if ($mResponse instanceof \MailSo\Base\Collection)
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Api.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Api.php
index c05c589fe..5680c1359 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Api.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Api.php
@@ -32,6 +32,7 @@ class Api
 			if ($bOne)
 			{
 				\RainLoop\Api::SetupDefaultMailSoConfig();
+
 				$bOne = \RainLoop\Api::RunResult();
 			}
 		}
@@ -91,14 +92,24 @@ class Api
 			\MailSo\Config::$MessageListDateFilter =
 				(int) \RainLoop\Api::Config()->Get('labs', 'imap_message_list_date_filter', 0);
 
+			\MailSo\Config::$MessageListPermanentFilter =
+				\trim(\RainLoop\Api::Config()->Get('labs', 'imap_message_list_permanent_filter', ''));
+
+			\MailSo\Config::$MessageAllHeaders =
+				!!\RainLoop\Api::Config()->Get('labs', 'imap_message_all_headers', false);
+
 			\MailSo\Config::$LargeThreadLimit =
 				(int) \RainLoop\Api::Config()->Get('labs', 'imap_large_thread_limit', 50);
 
+			\MailSo\Config::$BoundaryPrefix = '_RainLoop_';
+
 			\MailSo\Config::$SystemLogger = \RainLoop\Api::Logger();
 
 			$sSslCafile = \RainLoop\Api::Config()->Get('ssl', 'cafile', '');
 			$sSslCapath = \RainLoop\Api::Config()->Get('ssl', 'capath', '');
 
+			\RainLoop\Utils::$CookieDefaultPath = \RainLoop\Api::Config()->Get('labs', 'cookie_path', '/');
+
 			if (!empty($sSslCafile) || !empty($sSslCapath))
 			{
 				\MailSo\Hooks::Add('Net.NetClient.StreamContextSettings/Filter', function (&$aStreamContextSettings) use ($sSslCafile, $sSslCapath) {
@@ -139,12 +150,13 @@ class Api
 	{
 		$sSsoHash = \MailSo\Base\Utils::Sha1Rand($sEmail.$sPassword);
 
-		return \RainLoop\Api::Actions()->Cacher()->Set(\RainLoop\KeyPathHelper::SsoCacherKey($sSsoHash), \RainLoop\Utils::EncodeKeyValues(array(
-			'Email' => $sEmail,
-			'Password' => $sPassword,
-			'AdditionalOptions' => $aAdditionalOptions,
-			'Time' => $bUseTimeout ? \time() : 0
-		))) ? $sSsoHash : '';
+		return \RainLoop\Api::Actions()->Cacher()->Set(\RainLoop\KeyPathHelper::SsoCacherKey($sSsoHash),
+			\RainLoop\Utils::EncodeKeyValuesQ(array(
+				'Email' => $sEmail,
+				'Password' => $sPassword,
+				'AdditionalOptions' => $aAdditionalOptions,
+				'Time' => $bUseTimeout ? \time() : 0
+			))) ? $sSsoHash : '';
 	}
 
 	/**
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php
index 36dac7f96..13c5d9e59 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php
@@ -14,6 +14,11 @@ abstract class PdoAbstract
 	 */
 	protected $bExplain = false;
 
+	/**
+	 * @var bool
+	 */
+	protected $bSqliteCollate = true;
+
 	/**
 	 * @var \MailSo\Log\Logger
 	 */
@@ -48,6 +53,18 @@ abstract class PdoAbstract
 		return array('', '', '', '');
 	}
 
+	/**
+	 * @param string $sStr1
+	 * @param string $sStr2
+	 *
+	 * @return int
+	 */
+	public function sqliteNoCaseCollationHelper($sStr1, $sStr2)
+	{
+		$this->oLogger->WriteDump(array($sStr1, $sStr2));
+		return \strcmp(\mb_strtoupper($sStr1, 'UTF-8'), \mb_strtoupper($sStr2, 'UTF-8'));
+	}
+
 	/**
 	 * @return \PDO
 	 *
@@ -67,6 +84,7 @@ abstract class PdoAbstract
 
 		$sType = $sDsn = $sDbLogin = $sDbPassword = '';
 		list($sType, $sDsn, $sDbLogin, $sDbPassword) = $this->getPdoAccessData();
+
 		if (!\in_array($sType, array('mysql', 'sqlite', 'pgsql')))
 		{
 			throw new \Exception('Unknown PDO SQL connection type');
@@ -82,15 +100,28 @@ abstract class PdoAbstract
 		$oPdo = false;
 		try
 		{
+//			$bCaseFunc = false;
 			$oPdo = @new \PDO($sDsn, $sDbLogin, $sDbPassword);
 			if ($oPdo)
 			{
+				$sPdoType = $oPdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
 				$oPdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-				if ('mysql' === $sType && 'mysql' === $oPdo->getAttribute(\PDO::ATTR_DRIVER_NAME))
+
+				if ('mysql' === $sType && 'mysql' === $sPdoType)
 				{
 					$oPdo->exec('SET NAMES utf8 COLLATE utf8_general_ci');
 //					$oPdo->exec('SET NAMES utf8');
 				}
+//				else if ('sqlite' === $sType && 'sqlite' === $sPdoType && $this->bSqliteCollate)
+//				{
+//					if (\method_exists($oPdo, 'sqliteCreateCollation') && \MailSo\Base\Utils::FunctionExistsAndEnabled('mb_strtoupper'))
+//					{
+//						$oPdo->sqliteCreateCollation('SQLITE_NOCASE_UTF8', array($this, 'sqliteNoCaseCollationHelper'));
+//						$bCaseFunc = true;
+//					}
+//				}
+//
+//				$this->oLogger->Write('PDO:'.$sPdoType.($bCaseFunc ? '/SQLITE_NOCASE_UTF8' : ''));
 			}
 		}
 		catch (\Exception $oException)
@@ -156,10 +187,11 @@ abstract class PdoAbstract
 	 * @param string $sSql
 	 * @param array $aParams
 	 * @param bool $bMultiplyParams = false
+	 * @param bool $bLogParams = false
 	 *
 	 * @return \PDOStatement|null
 	 */
-	protected function prepareAndExecute($sSql, $aParams = array(), $bMultiplyParams = false)
+	protected function prepareAndExecute($sSql, $aParams = array(), $bMultiplyParams = false, $bLogParams = false)
 	{
 		if ($this->bExplain && !$bMultiplyParams)
 		{
@@ -172,16 +204,27 @@ abstract class PdoAbstract
 		$oStmt = $this->getPDO()->prepare($sSql);
 		if ($oStmt)
 		{
+			$aLogs = array();
 			$aRootParams = $bMultiplyParams ? $aParams : array($aParams);
 			foreach ($aRootParams as $aSubParams)
 			{
 				foreach ($aSubParams as $sName => $aValue)
 				{
+					if ($bLogParams)
+					{
+						$aLogs[$sName] = $aValue[0];
+					}
+
 					$oStmt->bindValue($sName, $aValue[0], $aValue[1]);
 				}
 
 				$mResult = $oStmt->execute() && !$bMultiplyParams ? $oStmt : null;
 			}
+
+			if ($bLogParams && $aLogs)
+			{
+				$this->writeLog('Params: '.@\json_encode($aLogs, \defined('JSON_UNESCAPED_UNICODE') ? JSON_UNESCAPED_UNICODE : 0));
+			}
 		}
 
 		return $mResult;
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
index 6403e7940..43d589751 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
@@ -9,6 +9,11 @@ abstract class AbstractConfig
 	 */
 	private $sFile;
 
+	/**
+	 * @var string
+	 */
+	private $sAdditionalFile;
+
 	/**
 	 * @var array
 	 */
@@ -27,12 +32,19 @@ abstract class AbstractConfig
 	/**
 	 * @param string $sFileName
 	 * @param string $sFileHeader = ''
+	 * @param string $sAdditionalFileName = ''
 	 *
 	 * @return void
 	 */
-	public function __construct($sFileName, $sFileHeader = '')
+	public function __construct($sFileName, $sFileHeader = '', $sAdditionalFileName = '')
 	{
-		$this->sFile = \APP_PRIVATE_DATA.'configs/'.$sFileName;
+		$this->sFile = \APP_PRIVATE_DATA.'configs/'.\trim($sFileName);
+
+		$sAdditionalFileName = \trim($sAdditionalFileName);
+		$this->sAdditionalFile = \APP_PRIVATE_DATA.'configs/'.$sAdditionalFileName;
+		$this->sAdditionalFile = 0 < \strlen($sAdditionalFileName) &&
+			\file_exists($this->sAdditionalFile) ? $this->sAdditionalFile : '';
+
 		$this->sFileHeader = $sFileHeader;
 		$this->aData = $this->defaultValues();
 
@@ -109,7 +121,7 @@ abstract class AbstractConfig
 	 */
 	private function cacheKey()
 	{
-		return 'config:'.\sha1($this->sFile).':';
+		return 'config:'.\sha1($this->sFile).':'.\sha1($this->sAdditionalFile).':';
 	}
 
 	/**
@@ -120,12 +132,17 @@ abstract class AbstractConfig
 		if ($this->bUseApcCache)
 		{
 			$iMTime = @\filemtime($this->sFile);
-			if (\is_int($iMTime) && 0 < $iMTime)
+			$iMTime = \is_int($iMTime) && 0 < $iMTime ? $iMTime : 0;
+
+			$iATime = $this->sAdditionalFile ? @\filemtime($this->sAdditionalFile) : 0;
+			$iATime = \is_int($iATime) && 0 < $iATime ? $iATime : 0;
+
+			if (0 < $iMTime)
 			{
 				$sKey = $this->cacheKey();
 
-				$iTime = \apc_fetch($sKey.'time');
-				if ($iTime && $iMTime === (int) $iTime)
+				$sTimeHash = \apc_fetch($sKey.'time');
+				if ($sTimeHash && $sTimeHash === \md5($iMTime.'/'.$iATime))
 				{
 					$aFetchData = \apc_fetch($sKey.'data');
 					if (\is_array($aFetchData))
@@ -148,11 +165,16 @@ abstract class AbstractConfig
 		if ($this->bUseApcCache)
 		{
 			$iMTime = @\filemtime($this->sFile);
-			if (\is_int($iMTime) && 0 < $iMTime)
+			$iMTime = \is_int($iMTime) && 0 < $iMTime ? $iMTime : 0;
+
+			$iATime = $this->sAdditionalFile ? @\filemtime($this->sAdditionalFile) : 0;
+			$iATime = \is_int($iATime) && 0 < $iATime ? $iATime : 0;
+
+			if (0 < $iMTime)
 			{
 				$sKey = $this->cacheKey();
 
-				\apc_store($sKey.'time', $iMTime);
+				\apc_store($sKey.'time', \md5($iMTime.'/'.$iATime));
 				\apc_store($sKey.'data', $this->aData);
 
 				return true;
@@ -193,7 +215,7 @@ abstract class AbstractConfig
 			}
 
 			$aData = \RainLoop\Utils::CustomParseIniFile($this->sFile, true);
-			if (\is_array($aData) && 0 < count($aData))
+			if (\is_array($aData) && 0 < \count($aData))
 			{
 				foreach ($aData as $sSectionKey => $aSectionValue)
 				{
@@ -206,6 +228,28 @@ abstract class AbstractConfig
 					}
 				}
 
+				unset($aData);
+
+				if (\file_exists($this->sAdditionalFile) && \is_readable($this->sAdditionalFile))
+				{
+					$aSubData = \RainLoop\Utils::CustomParseIniFile($this->sAdditionalFile, true);
+					if (\is_array($aSubData) && 0 < \count($aSubData))
+					{
+						foreach ($aSubData as $sSectionKey => $aSectionValue)
+						{
+							if (\is_array($aSectionValue))
+							{
+								foreach ($aSectionValue as $sParamKey => $mParamValue)
+								{
+									$this->Set($sSectionKey, $sParamKey, $mParamValue);
+								}
+							}
+						}
+					}
+
+					unset($aSubData);
+				}
+
 				$this->storeDataToCache();
 
 				return true;
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 64eca8f7b..1282de2c9 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -11,7 +11,8 @@ class Application extends \RainLoop\Config\AbstractConfig
 	{
 		parent::__construct('application.ini',
 			'; RainLoop Webmail configuration file
-; Please don\'t add custom parameters here, those will be overwritten');
+; Please don\'t add custom parameters here, those will be overwritten',
+			defined('APP_ADDITIONAL_CONFIGURATION_NAME') ? APP_ADDITIONAL_CONFIGURATION_NAME : '');
 	}
 
 	/**
@@ -70,6 +71,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 				'allow_languages_on_settings'	=> array(true, 'Allow language selection on settings screen'),
 
 				'allow_additional_accounts'		=> array(true, ''),
+				'allow_additional_identities'	=> array(true, ''),
 
 				'messages_per_page'		=> array(20, ' Number of messages displayed on page by default'),
 
@@ -88,8 +90,13 @@ class Application extends \RainLoop\Config\AbstractConfig
 				'login_desc'		=> array(''),
 				'login_css'			=> array(''),
 				'login_powered'		=> array(true),
-				'user_logo'			=> array(''),
+
 				'user_css'			=> array(''),
+				'user_logo'			=> array(''),
+				'user_logo_title'	=> array(''),
+				'user_logo_message'	=> array(''),
+				'user_iframe_message'	=> array(''),
+
 				'welcome_page_url'		=> array(''),
 				'welcome_page_display'	=> array('none')
 			),
@@ -132,8 +139,21 @@ class Application extends \RainLoop\Config\AbstractConfig
 			),
 
 			'capa' => array(
+				'folders' => array(true),
+				'composer' => array(true),
+				'contacts' => array(true),
+				'settings' => array(true),
+				'quota' => array(true),
+				'help' => array(true),
+				'reload' => array(true),
+				'search' => array(true),
+				'search_adv' => array(true),
 				'filters' => array(true),
-				'templates' => array(true)
+				'x-templates' => array(false),
+				'dangerous_actions' => array(true),
+				'message_actions' => array(true),
+				'messagelist_actions' => array(true),
+				'attachments_actions' => array(true)
 			),
 
 			'login' => array(
@@ -146,6 +166,8 @@ class Application extends \RainLoop\Config\AbstractConfig
 				'determine_user_language' => array(true, ''),
 				'determine_user_domain' => array(false, ''),
 
+				'welcome_page' => array(false, ''),
+
 				'forgot_password_link_url' => array('', ''),
 				'registration_link_url' => array('', ''),
 
@@ -166,7 +188,7 @@ Values:
 
 			'defaults' => array(
 				'view_editor_type'		=> array('Html', 'Editor mode used by default (Plain, Html, HtmlForced or PlainForced)'),
-				'view_layout'			=> array(1, 'layout: 0 - no preview, 1 - side preview, 3 - bottom preview'),
+				'view_layout'			=> array(1, 'layout: 0 - no preview, 1 - side preview, 2 - bottom preview'),
 				'view_use_checkboxes'	=> array(true),
 				'autologout'			=> array(30),
 				'show_images'			=> array(false),
@@ -186,6 +208,9 @@ Values:
 				'hide_passwords' => array(true, 'Required for development purposes only.
 Disabling this option is not recommended.'),
 
+				'time_offset' => array(0),
+				'session_filter' => array(''),
+
 				'filename' => array('log-{date:Y-m-d}.txt',
 					'Log filename.
 For security reasons, some characters are removed from filename.
@@ -216,7 +241,7 @@ Examples:
 
 				'auth_logging' => array(false, 'Enable auth logging in a separate file (for fail2ban)'),
 				'auth_logging_filename' => array('fail2ban/auth-{date:Y-m-d}.txt'),
-				'auth_logging_format' => array('Auth failed: ip={request:ip} user={imap:login} host={imap:host} port={imap:port}')
+				'auth_logging_format' => array('[{date:Y-m-d H:i:s}] Auth failed: ip={request:ip} user={imap:login} host={imap:host} port={imap:port}')
 			),
 
 			'debug' => array(
@@ -226,6 +251,7 @@ Examples:
 			'social' => array(
 				'google_enable' => array(false, 'Google'),
 				'google_enable_auth' => array(false),
+				'google_enable_auth_fast' => array(false),
 				'google_enable_drive' => array(false),
 				'google_enable_preview' => array(false),
 				'google_client_id' => array(''),
@@ -278,11 +304,11 @@ Enables caching in the system'),
 				'allow_html_editor_source_button' => array(false),
 				'allow_html_editor_biti_buttons' => array(false),
 				'allow_ctrl_enter_on_compose' => array(false),
+				'try_to_detect_hidden_images' => array(false),
 				'hide_dangerous_actions' => array(false),
 				'use_app_debug_js' => array(false),
 				'use_app_debug_css' => array(false),
 				'use_imap_sort' => array(true),
-				'use_imap_esearch_esort' => array(true),
 				'use_imap_force_selection' => array(false),
 				'use_imap_list_subscribe' => array(true),
 				'use_imap_thread' => array(true),
@@ -295,12 +321,19 @@ Enables caching in the system'),
 				'imap_message_list_fast_simple_search' => array(true),
 				'imap_message_list_count_limit_trigger' => array(0),
 				'imap_message_list_date_filter' => array(0),
+				'imap_message_list_permanent_filter' => array(''),
+				'imap_message_all_headers' => array(false),
 				'imap_large_thread_limit' => array(50),
 				'imap_folder_list_limit' => array(200),
 				'imap_show_login_alert' => array(true),
 				'smtp_show_server_errors' => array(false),
 				'sieve_allow_raw_script' => array(false),
 				'sieve_utf8_folder_name' => array(true),
+				'mail_func_clear_headers' => array(true),
+				'mail_func_additional_parameters' => array(false),
+				'favicon_status' => array(true),
+				'folders_spec_limit' => array(50),
+				'owncloud_save_folder' => array('Attachments'),
 				'curl_proxy' => array(''),
 				'curl_proxy_auth' => array(''),
 				'in_iframe' => array(false),
@@ -315,6 +348,9 @@ Enables caching in the system'),
 				'fast_cache_memcache_port' => array(11211),
 				'fast_cache_memcache_expire' => array(43200),
 				'use_local_proxy_for_external_images' => array(false),
+				'cookie_path' => array('/'),
+				'startup_url' => array(''),
+				'emogrifier' => array(true),
 				'dev_email' => array(''),
 				'dev_password' => array('')
 			),
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
index 294823fcb..ee7bb5caa 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
@@ -25,7 +25,7 @@ class Plugin extends \RainLoop\Config\AbstractConfig
 	 */
 	private function convertConfigMap($aMap)
 	{
-		if (0 < count($aMap))
+		if (0 < \count($aMap))
 		{
 			$aResultMap = array();
 			foreach ($aMap as /* @var $oProperty \RainLoop\Plugins\Property */ $oProperty)
@@ -33,12 +33,12 @@ class Plugin extends \RainLoop\Config\AbstractConfig
 				if ($oProperty)
 				{
 					$mValue = $oProperty->DefaultValue();
-					$sValue = is_array($mValue) && isset($mValue[0]) ? $mValue[0] : $mValue;
+					$sValue = \is_array($mValue) && isset($mValue[0]) ? $mValue[0] : $mValue;
 					$aResultMap[$oProperty->Name()] = array($sValue, '');
 				}
 			}
 
-			if (0 < count($aResultMap))
+			if (0 < \count($aResultMap))
 			{
 				return array(
 					'plugin' => $aResultMap
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
index 2770881af..56912b5e2 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
@@ -16,6 +16,20 @@ class Capa
 	const FILTERS = 'FILTERS';
 	const ATTACHMENT_THUMBNAILS = 'ATTACHMENT_THUMBNAILS';
 	const ADDITIONAL_ACCOUNTS = 'ADDITIONAL_ACCOUNTS';
+	const IDENTITIES = 'IDENTITIES';
+	const FOLDERS = 'FOLDERS';
+	const COMPOSER = 'COMPOSER';
+	const CONTACTS = 'CONTACTS';
+	const RELOAD = 'RELOAD';
+	const SEARCH = 'SEARCH';
+	const SEARCH_ADV = 'SEARCH_ADV';
+	const SETTINGS = 'SETTINGS';
+	const QUOTA = 'QUOTA';
+	const HELP = 'HELP';
 	const TEMPLATES = 'TEMPLATES';
+	const MESSAGE_ACTIONS = 'MESSAGE_ACTIONS';
+	const MESSAGELIST_ACTIONS = 'MESSAGELIST_ACTIONS';
+	const ATTACHMENTS_ACTIONS = 'ATTACHMENTS_ACTIONS';
+	const DANGEROUS_ACTIONS = 'DANGEROUS_ACTIONS';
 	const AUTOLOGOUT = 'AUTOLOGOUT';
 }
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Account.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Account.php
index 82c463685..31108e1f1 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Account.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Account.php
@@ -362,7 +362,27 @@ class Account extends \RainLoop\Account // for backward compatibility
 			\RainLoop\Utils::GetShortToken(),	// 7
 			$this->sProxyAuthUser,				// 8
 			$this->sProxyAuthPassword,			// 9
-			0									// 10
+			0									// 10 // timelife
+		));
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetAuthTokenQ()
+	{
+		return \RainLoop\Utils::EncodeKeyValuesQ(array(
+			'token',							// 0
+			$this->sEmail,						// 1
+			$this->sLogin,						// 2
+			$this->sPassword,					// 3
+			\RainLoop\Utils::Fingerprint(),		// 4
+			$this->sSignMeToken,				// 5
+			$this->sParentEmail,				// 6
+			\RainLoop\Utils::GetShortToken(),	// 7
+			$this->sProxyAuthUser,				// 8
+			$this->sProxyAuthPassword,			// 9
+			0									// 10 // timelife
 		));
 	}
 
@@ -417,8 +437,18 @@ class Account extends \RainLoop\Account // for backward compatibility
 			}
 			else
 			{
-				$oMailClient->Login($aImapCredentials['Login'], $aImapCredentials['Password'], '',
-					$aImapCredentials['UseAuthPlainIfSupported']);
+				$iGatLen = \strlen(APP_GOOGLE_ACCESS_TOKEN_PREFIX);
+				$sPassword = $aImapCredentials['Password'];
+				if (APP_GOOGLE_ACCESS_TOKEN_PREFIX === \substr($sPassword, 0, $iGatLen))
+				{
+					$oMailClient->LoginWithXOauth2(
+						\base64_encode('user='.$aImapCredentials['Login']."\1".'auth=Bearer '.\substr($sPassword, $iGatLen)."\1\1"));
+				}
+				else
+				{
+					$oMailClient->Login($aImapCredentials['Login'], $aImapCredentials['Password'], '',
+						$aImapCredentials['UseAuthPlainIfSupported']);
+				}
 			}
 
 			$bLogin = true;
@@ -475,7 +505,17 @@ class Account extends \RainLoop\Account // for backward compatibility
 
 		if ($aSmtpCredentials['UseAuth'] && !$aSmtpCredentials['UsePhpMail'] && $oSmtpClient)
 		{
-			$oSmtpClient->Login($aSmtpCredentials['Login'], $aSmtpCredentials['Password']);
+			$iGatLen = \strlen(APP_GOOGLE_ACCESS_TOKEN_PREFIX);
+			$sPassword = $aSmtpCredentials['Password'];
+			if (APP_GOOGLE_ACCESS_TOKEN_PREFIX === \substr($sPassword, 0, $iGatLen))
+			{
+				$oSmtpClient->LoginWithXOauth2(
+					\base64_encode('user='.$aSmtpCredentials['Login']."\1".'auth=Bearer '.\substr($sPassword, $iGatLen)."\1\1"));
+			}
+			else
+			{
+				$oSmtpClient->Login($aSmtpCredentials['Login'], $aSmtpCredentials['Password']);
+			}
 
 			$bLogin = true;
 		}
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Identity.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
index 19dd0c661..1923ce66e 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
@@ -75,11 +75,13 @@ class Identity
 	}
 
 	/**
+	 * @param bool $bFillOnEmpty = false
+	 *
 	 * @return string
 	 */
-	public function Id()
+	public function Id($bFillOnEmpty = false)
 	{
-		return $this->sId;
+		return $bFillOnEmpty ? ('' === $this->sId ? '---' : $this->sId) : $this->sId;
 	}
 
 	/**
@@ -192,4 +194,12 @@ class Identity
 	{
 		return !empty($this->sEmail);
 	}
+
+	/**
+	 * @return bool
+	 */
+	public function IsAccountIdentities()
+	{
+		return '' === $this->Id();
+	}
 }
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
index 67b147a12..5f4b8101d 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
@@ -304,6 +304,22 @@ abstract class AbstractPlugin
 		return $this;
 	}
 
+	/**
+	 * @param string $sFile
+	 * @param bool $bAdminScope = false
+	 *
+	 * @return self
+	 */
+	protected function replaceTemplate($sFile, $bAdminScope = false)
+	{
+		if ($this->oPluginManager)
+		{
+			$this->oPluginManager->AddTemplate($this->sPath.'/'.$sFile, $bAdminScope);
+		}
+
+		return $this;
+	}
+
 	/**
 	 * @param string $sActionName
 	 * @param string $sFunctionName
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
index a4ecfb7ca..00d751723 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
@@ -230,7 +230,7 @@ class Manager
 	public function HaveJs($bAdminScope = false)
 	{
 		$bResult = false;
-		
+
 		if ($this->bIsEnabled)
 		{
 			$bResult = $bAdminScope ? 0 < \count($this->aAdminJs) : 0 < \count($this->aJs);
@@ -274,27 +274,24 @@ class Manager
 	}
 
 	/**
+	 * @param array $aList
 	 * @param bool $bAdminScope = false
 	 * @return string
 	 */
-	public function CompileTemplate($bAdminScope = false)
+	public function CompileTemplate(&$aList, $bAdminScope = false)
 	{
-		$sResult = '';
 		if ($this->bIsEnabled)
 		{
 			$aTemplates = $bAdminScope ? $this->aAdminTemplates : $this->aTemplates;
 			foreach ($aTemplates as $sFile)
 			{
-				if (file_exists($sFile))
+				if (\file_exists($sFile))
 				{
-					$sTemplateName = substr(basename($sFile), 0, -5);
-					$sResult .= '';
+					$sTemplateName = \substr(\basename($sFile), 0, -5);
+					$aList[$sTemplateName] = $sFile;
 				}
 			}
 		}
-
-		return $sResult;
 	}
 
 	/**
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
index 8ea5a138e..dfe914de1 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
@@ -318,7 +318,7 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 	{
 		$iCount = 0;
 
-		if (\class_exists('Sabre\DAV\Client') && $this->IsActive() && \is_string($sVcfData))
+		if (\class_exists('SabreForRainLoop\DAV\Client') && $this->IsActive() && \is_string($sVcfData))
 		{
 			$sVcfData = \trim($sVcfData);
 			if ("\xef\xbb\xbf" === \substr($sVcfData, 0, 3))
@@ -329,7 +329,7 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 			$oVCardSplitter = null;
 			try
 			{
-				$oVCardSplitter = new \Sabre\VObject\Splitter\VCard($sVcfData);
+				$oVCardSplitter = new \SabreForRainLoop\VObject\Splitter\VCard($sVcfData);
 			}
 			catch (\Exception $oExc)
 			{
@@ -344,13 +344,13 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 
 				while ($oVCard = $oVCardSplitter->getNext())
 				{
-					if ($oVCard instanceof \Sabre\VObject\Component\VCard)
+					if ($oVCard instanceof \SabreForRainLoop\VObject\Component\VCard)
 					{
 						\MailSo\Base\Utils::ResetTimeLimit();
 
 						if (empty($oVCard->UID))
 						{
-							$oVCard->UID = \Sabre\DAV\UUIDUtil::getUUID();
+							$oVCard->UID = \SabreForRainLoop\DAV\UUIDUtil::getUUID();
 						}
 
 						$oContact->PopulateByVCard($oVCard->UID, $oVCard->serialize());
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
index 7fd425139..41085ff1b 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
@@ -66,8 +66,9 @@ class Contact
 		$this->Etag = '';
 	}
 
-	public function UpdateDependentValues()
+	public function PopulateDisplayAndFullNameValue($bForceFullNameReplace = false)
 	{
+		$sFullName = '';
 		$sLastName = '';
 		$sFirstName = '';
 		$sEmail = '';
@@ -100,8 +101,12 @@ class Contact
 					{
 						$sFirstName = $oProperty->Value;
 					}
-					else if (\in_array($oProperty->Type, array(
-						PropertyType::FULLNAME, PropertyType::PHONE
+					else if ('' === $sFullName && PropertyType::FULLNAME === $oProperty->Type)
+					{
+						$sFullName = $oProperty->Value;
+					}
+					else if ('' === $sOther && \in_array($oProperty->Type, array(
+						PropertyType::PHONE
 					)))
 					{
 						$sOther = $oProperty->Value;
@@ -110,25 +115,26 @@ class Contact
 			}
 		}
 
-		if (empty($this->IdContactStr))
-		{
-			$this->RegenerateContactStr();
-		}
+		$sDisplay = $bForceFullNameReplace ? '' : \trim($sFullName);
 
-		$sDisplay = '';
-		if (0 < \strlen($sLastName) || 0 < \strlen($sFirstName))
+		if ('' === $sDisplay && (0 < \strlen($sLastName) || 0 < \strlen($sFirstName)))
 		{
 			$sDisplay = \trim($sFirstName.' '.$sLastName);
 		}
 
-		if ('' === $sDisplay && 0 < \strlen($sEmail))
+		if ('' === $sDisplay)
+		{
+			$sDisplay = \trim($sFullName);
+		}
+
+		if ('' === $sDisplay)
 		{
 			$sDisplay = \trim($sEmail);
 		}
 
 		if ('' === $sDisplay)
 		{
-			$sDisplay = $sOther;
+			$sDisplay = \trim($sOther);
 		}
 
 		$this->Display = \trim($sDisplay);
@@ -145,13 +151,23 @@ class Contact
 		}
 	}
 
+	public function UpdateDependentValues()
+	{
+		if (empty($this->IdContactStr))
+		{
+			$this->RegenerateContactStr();
+		}
+
+		$this->PopulateDisplayAndFullNameValue();
+	}
+
 	/**
 	 * @return array
 	 */
 	public function RegenerateContactStr()
 	{
-		$this->IdContactStr = \class_exists('Sabre\DAV\Client') ?
-			\Sabre\DAV\UUIDUtil::getUUID() : \MailSo\Base\Utils::Md5Rand();
+		$this->IdContactStr = \class_exists('SabreForRainLoop\DAV\Client') ?
+			\SabreForRainLoop\DAV\UUIDUtil::getUUID() : \MailSo\Base\Utils::Md5Rand();
 	}
 
 	/**
@@ -186,7 +202,7 @@ class Contact
 	{
 		$this->UpdateDependentValues();
 
-		if (!\class_exists('Sabre\DAV\Client'))
+		if (!\class_exists('SabreForRainLoop\DAV\Client'))
 		{
 			return '';
 		}
@@ -201,7 +217,7 @@ class Contact
 		{
 			try
 			{
-				$oVCard = \Sabre\VObject\Reader::read($sPreVCard);
+				$oVCard = \SabreForRainLoop\VObject\Reader::read($sPreVCard);
 			}
 			catch (\Exception $oExc)
 			{
@@ -213,9 +229,14 @@ class Contact
 			}
 		}
 
+//		if ($oLogger)
+//		{
+//			$oLogger->WriteDump($sPreVCard);
+//		}
+
 		if (!$oVCard)
 		{
-			$oVCard = new \Sabre\VObject\Component\VCard();
+			$oVCard = new \SabreForRainLoop\VObject\Component\VCard();
 		}
 
 		$oVCard->VERSION = '3.0';
@@ -223,7 +244,7 @@ class Contact
 
 		unset($oVCard->FN, $oVCard->EMAIL, $oVCard->TEL, $oVCard->URL, $oVCard->NICKNAME);
 
-		$sFirstName = $sLastName = $sMiddleName = $sSuffix = $sPrefix = '';
+		$sUid = $sFirstName = $sLastName = $sMiddleName = $sSuffix = $sPrefix = '';
 		foreach ($this->Properties as /* @var $oProperty \RainLoop\Providers\AddressBook\Classes\Property */ &$oProperty)
 		{
 			if ($oProperty)
@@ -240,6 +261,9 @@ class Contact
 					case PropertyType::NOTE:
 						$oVCard->NOTE = $oProperty->Value;
 						break;
+					case PropertyType::UID:
+						$sUid = $oProperty->Value;
+						break;
 					case PropertyType::FIRST_NAME:
 						$sFirstName = $oProperty->Value;
 						break;
@@ -278,7 +302,7 @@ class Contact
 			}
 		}
 
-		$oVCard->UID = $this->IdContactStr;
+		$oVCard->UID = empty($sUid) ? $this->IdContactStr : $sUid;
 		$oVCard->N = array($sLastName, $sFirstName, $sMiddleName, $sPrefix, $sSuffix);
 		$oVCard->REV = \gmdate('Ymd', $this->Changed).'T'.\gmdate('His', $this->Changed).'Z';
 
@@ -505,7 +529,7 @@ class Contact
 
 		$this->Properties = array();
 
-		if (!\class_exists('Sabre\DAV\Client'))
+		if (!\class_exists('SabreForRainLoop\DAV\Client'))
 		{
 			return false;
 		}
@@ -515,9 +539,11 @@ class Contact
 			$this->Etag = $sEtag;
 		}
 
+		$this->IdContactStr = $sUid;
+
 		try
 		{
-			$oVCard = \Sabre\VObject\Reader::read($sVCard);
+			$oVCard = \SabreForRainLoop\VObject\Reader::read($sVCard);
 		}
 		catch (\Exception $oExc)
 		{
@@ -526,18 +552,24 @@ class Contact
 				$oLogger->WriteException($oExc);
 				$oLogger->WriteDump($sVCard);
 			}
-
-			$this->IdContactStr = $sUid;
 		}
 
+//		if ($oLogger)
+//		{
+//			$oLogger->WriteDump($sVCard);
+//		}
+
+		$bOwnCloud = false;
 		$aProperties = array();
+
 		if ($oVCard)
 		{
+			$bOwnCloud = empty($oVCard->PRODID) ? false :
+				false !== \strpos(\strtolower($oVCard->PRODID), 'owncloud');
+
 			$bOldVersion = empty($oVCard->VERSION) ? false :
 				\in_array((string) $oVCard->VERSION, array('2.1', '2.0', '1.0'));
 
-			$this->IdContactStr = $oVCard->UID ? (string) $oVCard->UID : \Sabre\DAV\UUIDUtil::getUUID();
-
 			if (isset($oVCard->FN) && '' !== \trim($oVCard->FN))
 			{
 				$sValue = $this->getPropertyValueHelper($oVCard->FN, $bOldVersion);
@@ -612,6 +644,14 @@ class Contact
 				$this->addArrayPropertyHelper($aProperties, $oVCard->TEL, PropertyType::PHONE);
 			}
 
+			$sUidValue = $oVCard->UID ? (string) $oVCard->UID : \SabreForRainLoop\DAV\UUIDUtil::getUUID();
+			$aProperties[] = new Property(PropertyType::UID, $sUidValue);
+
+			if (empty($this->IdContactStr))
+			{
+				$this->IdContactStr = $sUidValue;
+			}
+
 			$this->Properties = $aProperties;
 		}
 
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
index a301ffe2f..78db4e428 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
@@ -10,7 +10,7 @@ class Property
 	 * @var int
 	 */
 	public $IdProperty;
-	
+
 	/**
 	 * @var int
 	 */
@@ -26,6 +26,11 @@ class Property
 	 */
 	public $Value;
 
+	/**
+	 * @var string
+	 */
+	public $ValueLower;
+
 	/**
 	 * @var string
 	 */
@@ -49,16 +54,26 @@ class Property
 	public function Clear()
 	{
 		$this->IdProperty = 0;
-		
+
 		$this->Type = PropertyType::UNKNOWN;
 		$this->TypeStr = '';
 
 		$this->Value = '';
+		$this->ValueLower = '';
 		$this->ValueCustom = '';
 
 		$this->Frec = 0;
 	}
 
+	/**
+	 * @return bool
+	 */
+	public function IsName()
+	{
+		return \in_array($this->Type, array(PropertyType::FULLNAME, PropertyType::FIRST_NAME,
+			PropertyType::LAST_NAME, PropertyType::MIDDLE_NAME, PropertyType::NICK_NAME));
+	}
+
 	/**
 	 * @return bool
 	 */
@@ -66,7 +81,7 @@ class Property
 	{
 		return PropertyType::EMAIl === $this->Type;
 	}
-	
+
 	/**
 	 * @return bool
 	 */
@@ -83,6 +98,14 @@ class Property
 		return PropertyType::WEB_PAGE === $this->Type;
 	}
 
+	/**
+	 * @return bool
+	 */
+	public function IsValueForLower()
+	{
+		return $this->IsEmail() || $this->IsName() || $this->IsWeb();
+	}
+
 	/**
 	 * @return bool
 	 */
@@ -111,7 +134,8 @@ class Property
 		$this->Value = \trim($this->Value);
 		$this->ValueCustom = \trim($this->ValueCustom);
 		$this->TypeStr = \trim($this->TypeStr);
-		
+		$this->ValueLower = '';
+
 		if (0 < \strlen($this->Value))
 		{
 			// lower
@@ -120,13 +144,25 @@ class Property
 				$this->Value = \MailSo\Base\Utils::StrToLowerIfAscii($this->Value);
 			}
 
-			// phones clear value for searching
+			if ($this->IsName())
+			{
+				$this->Value = \MailSo\Base\Utils::StripSpaces($this->Value);
+			}
+
+			// lower value for searching
+			if ($this->IsValueForLower() && \MailSo\Base\Utils::FunctionExistsAndEnabled('mb_strtolower'))
+			{
+				$this->ValueLower = (string) @\mb_strtolower($this->Value, 'UTF-8');
+			}
+
+			// phone value for searching
 			if ($this->IsPhone())
 			{
-				$sPhone = $this->Value;
+				$sPhone = \trim($this->Value);
 				$sPhone = \preg_replace('/^[+]+/', '', $sPhone);
 				$sPhone = \preg_replace('/[^\d]/', '', $sPhone);
-				$this->ValueCustom = $sPhone;
+
+				$this->ValueCustom = \trim($sPhone);
 			}
 		}
 	}
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php
index 4068e4abc..5b1bdae94 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php
@@ -6,8 +6,9 @@ class PropertyType
 {
 	const UNKNOWN = 0;
 
+	const UID = 9;
 	const FULLNAME = 10;
-	
+
 	const FIRST_NAME = 15;
 	const LAST_NAME = 16;
 	const MIDDLE_NAME = 17;
@@ -21,7 +22,7 @@ class PropertyType
 //	const MOBILE = 32;
 //	const FAX = 33;
 	const WEB_PAGE = 32;
-	
+
 	const BIRTHDAY = 40;
 
 	const FACEBOOK = 90;
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
index b2100bc05..7ef050381 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
@@ -117,11 +117,14 @@ class PdoAddressBook
 		try
 		{
 			$this->oLogger->Write('PROPFIND '.$sPath, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+
 			$aResponse = $oClient->propFind($sPath, array(
 				'{DAV:}getlastmodified',
+				'{DAV:}resourcetype',
 				'{DAV:}getetag'
 			), 1);
 
+//			$this->oLogger->WriteDump($aResponse);
 		}
 		catch (\Exception $oException)
 		{
@@ -137,10 +140,11 @@ class PdoAddressBook
 				if (!empty($sKey) && is_array($aItem))
 				{
 					$aItem = \array_change_key_case($aItem, \CASE_LOWER);
-					if (isset($aItem['{dav:}getetag'], $aItem['{dav:}getlastmodified']))
+					if (isset($aItem['{dav:}getetag']))
 					{
 						$aMatch = array();
-						if (\preg_match('/\/([^\/?]+)$/', $sKey, $aMatch) && !empty($aMatch[1]))
+						if (\preg_match('/\/([^\/?]+)$/', $sKey, $aMatch) && !empty($aMatch[1]) &&
+							(!$aItem['{dav:}resourcetype'] || !$aItem['{dav:}resourcetype']->is('{DAV:}collection')))
 						{
 							$sVcfFileName = \urldecode(\urldecode($aMatch[1]));
 							$sKeyID = \preg_replace('/\.vcf$/i', '', $sVcfFileName);
@@ -150,10 +154,23 @@ class PdoAddressBook
 								'uid' => $sKeyID,
 								'vcf' => $sVcfFileName,
 								'etag' => \trim(\trim($aItem['{dav:}getetag']), '"\''),
-								'lastmodified' => $aItem['{dav:}getlastmodified'],
-								'changed' => \MailSo\Base\DateTimeHelper::ParseRFC2822DateString($aItem['{dav:}getlastmodified'])
+								'lastmodified' => '',
+								'changed' => 0
 							);
 
+							if (isset($aItem['{dav:}getlastmodified']))
+							{
+								$mResult[$sKeyID]['lastmodified'] = $aItem['{dav:}getlastmodified'];
+								$mResult[$sKeyID]['changed'] = \MailSo\Base\DateTimeHelper::ParseRFC2822DateString(
+									$aItem['{dav:}getlastmodified']);
+							}
+							else
+							{
+								$mResult[$sKeyID]['changed'] = \MailSo\Base\DateTimeHelper::TryToParseSpecEtagFormat($mResult[$sKeyID]['etag']);
+								$mResult[$sKeyID]['lastmodified'] = 0 < $mResult[$sKeyID]['changed'] ?
+									\gmdate('c', $mResult[$sKeyID]['changed']) : '';
+							}
+
 							$mResult[$sKeyID]['changed_'] = \gmdate('c', $mResult[$sKeyID]['changed']);
 						}
 					}
@@ -168,24 +185,32 @@ class PdoAddressBook
 	{
 		\MailSo\Base\Utils::ResetTimeLimit();
 
-		$this->oLogger->Write($sCmd.' '.$sUrl.('PUT' === $sCmd && null !== $mData ? ' ('.\strlen($mData).')' : ''),
+		$this->oLogger->Write($sCmd.' '.$sUrl.(('PUT' === $sCmd || 'POST' === $sCmd) && null !== $mData ? ' ('.\strlen($mData).')' : ''),
 			\MailSo\Log\Enumerations\Type::INFO, 'DAV');
 
-		if ('PUT' === $sCmd)
-		{
-			$this->oLogger->Write($mData, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
-		}
+//		if ('PUT' === $sCmd || 'POST' === $sCmd)
+//		{
+//			$this->oLogger->Write($mData, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+//		}
 
 		$oResponse = false;
 		try
 		{
-			$oResponse = 'PUT' === $sCmd && null !== $mData ?
-				$oClient->request($sCmd, $sUrl, $mData) : $oClient->request($sCmd, $sUrl);
-
-			if ('GET' === $sCmd && false)
+			if (('PUT' === $sCmd || 'POST' === $sCmd) && null !== $mData)
 			{
-				$this->oLogger->WriteDump($oResponse, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+				$oResponse = $oClient->request($sCmd, $sUrl, $mData, array(
+					'Content-Type' => 'text/vcard; charset=utf-8'
+				));
 			}
+			else
+			{
+				$oResponse = $oClient->request($sCmd, $sUrl);
+			}
+
+//			if ('GET' === $sCmd)
+//			{
+//				$this->oLogger->WriteDump($oResponse, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+//			}
 		}
 		catch (\Exception $oException)
 		{
@@ -196,24 +221,304 @@ class PdoAddressBook
 	}
 
 	/**
-	 * @param string $sEmail
-	 * @param string $sUrl
+	 * @param \SabreForRainLoop\DAV\Client $oClient
+	 * @param string $sPath
+	 *
+	 * @return bool
+	 */
+	private function detectionPropFind($oClient, $sPath)
+	{
+		$aResponse = null;
+
+		try
+		{
+			$this->oLogger->Write('PROPFIND '.$sPath, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+
+			$aResponse = $oClient->propFind($sPath, array(
+				'{DAV:}current-user-principal',
+				'{DAV:}resourcetype',
+				'{DAV:}displayname',
+				'{urn:ietf:params:xml:ns:carddav}addressbook-home-set'
+			), 1);
+
+//			$this->oLogger->WriteDump($aResponse);
+		}
+		catch (\Exception $oException)
+		{
+			$this->oLogger->WriteException($oException);
+		}
+
+		return $aResponse;
+	}
+
+	/**
+	 * @param \SabreForRainLoop\DAV\Client $oClient
 	 * @param string $sUser
 	 * @param string $sPassword
 	 * @param string $sProxy = ''
 	 *
+	 * @return array
+	 */
+	private function getContactsPaths(&$oClient, $sUser, $sPassword, $sProxy = '')
+	{
+		$aContactsPaths = array();
+
+		$sCurrentUserPrincipal = '';
+		$sAddressbookHomeSet = '';
+
+//		[{DAV:}current-user-principal] => /cloud/remote.php/carddav/principals/admin/
+//		[{urn:ietf:params:xml:ns:carddav}addressbook-home-set] => /cloud/remote.php/carddav/addressbooks/admin/
+
+		if (!$oClient)
+		{
+			return $aContactsPaths;
+		}
+
+		$aResponse = $this->detectionPropFind($oClient, '/.well-known/carddav');
+
+		$sNextPath = '';
+		$sFirstNextPath = '';
+		if (\is_array($aResponse))
+		{
+			foreach ($aResponse as $sKey => $aItem)
+			{
+				if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']) &&
+					false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'], '/calendar-proxy'))
+				{
+					$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'];
+					continue;
+				}
+
+				if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']))
+				{
+					$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal'];
+					continue;
+				}
+
+				if (!empty($sKey))
+				{
+					if (empty($sFirstNextPath))
+					{
+						$sFirstNextPath = $sKey;
+					}
+
+					if (empty($sNextPath))
+					{
+						$oResourceType = isset($aItem['{DAV:}resourcetype']) ? $aItem['{DAV:}resourcetype'] : null;
+						/* @var $oResourceType \SabreForRainLoop\DAV\Property\ResourceType */
+						if ($oResourceType && $oResourceType->is('{DAV:}collection'))
+						{
+							$sNextPath = $sKey;
+							continue;
+						}
+					}
+				}
+			}
+
+			if (empty($sNextPath) && empty($sCurrentUserPrincipal) && empty($sAddressbookHomeSet) && !empty($sFirstNextPath))
+			{
+				$sNextPath = $sFirstNextPath;
+			}
+		}
+
+		if (empty($sCurrentUserPrincipal) && empty($sAddressbookHomeSet))
+		{
+			if (empty($sNextPath))
+			{
+				return $aContactsPaths;
+			}
+			else
+			{
+				if (\preg_match('/^http[s]?:\/\//i', $sNextPath))
+				{
+					$oClient = $this->getDavClientFromUrl($sNextPath, $sUser, $sPassword, $sProxy);
+					if ($oClient)
+					{
+						$sNextPath = $oClient->__UrlPath__;
+					}
+					else
+					{
+						return $aContactsPaths;
+					}
+				}
+
+				$aResponse = $this->detectionPropFind($oClient, $sNextPath);
+				if (\is_array($aResponse))
+				{
+					foreach ($aResponse as $sKey => $aItem)
+					{
+						if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']) &&
+							false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'], '/calendar-proxy'))
+						{
+							$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'];
+							continue;
+						}
+
+						if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']))
+						{
+							$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal'];
+							continue;
+						}
+					}
+				}
+			}
+		}
+
+		if (empty($sAddressbookHomeSet))
+		{
+			if (empty($sCurrentUserPrincipal))
+			{
+				return $aContactsPaths;
+			}
+			else
+			{
+				if (\preg_match('/^http[s]?:\/\//i', $sCurrentUserPrincipal))
+				{
+					$oClient = $this->getDavClientFromUrl($sCurrentUserPrincipal, $sUser, $sPassword, $sProxy);
+					if ($oClient)
+					{
+						$sCurrentUserPrincipal = $oClient->__UrlPath__;
+					}
+					else
+					{
+						return $aContactsPaths;
+					}
+				}
+
+				$aResponse = $this->detectionPropFind($oClient, $sCurrentUserPrincipal);
+				if (\is_array($aResponse))
+				{
+					foreach ($aResponse as $sKey => $aItem)
+					{
+						if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']) &&
+							false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'], '/calendar-proxy'))
+						{
+							$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'];
+							continue;
+						}
+					}
+				}
+			}
+		}
+
+		if (empty($sAddressbookHomeSet))
+		{
+			return $aContactsPaths;
+		}
+		else
+		{
+			if (\preg_match('/^http[s]?:\/\//i', $sAddressbookHomeSet))
+			{
+				$oClient = $this->getDavClientFromUrl($sAddressbookHomeSet, $sUser, $sPassword, $sProxy);
+				if ($oClient)
+				{
+					$sAddressbookHomeSet = $oClient->__UrlPath__;
+				}
+				else
+				{
+					return $aContactsPaths;
+				}
+			}
+
+			$aResponse = $this->detectionPropFind($oClient, $sAddressbookHomeSet);
+			if (\is_array($aResponse))
+			{
+				foreach ($aResponse as $sKey => $aItem)
+				{
+					if (!empty($sKey) && $aItem && isset($aItem['{DAV:}resourcetype']))
+					{
+						$oResourceType = $aItem['{DAV:}resourcetype'];
+						/* @var $oResourceType \SabreForRainLoop\DAV\Property\ResourceType */
+
+						if ($oResourceType && $oResourceType->is('{DAV:}collection'))
+						{
+							if ($oResourceType->is('{urn:ietf:params:xml:ns:carddav}addressbook'))
+							{
+								$aContactsPaths[$sKey] = isset($aItem['{DAV:}displayname']) ? \trim($aItem['{DAV:}displayname']) : '';
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return $aContactsPaths;
+	}
+
+	/**
+	 * @param \SabreForRainLoop\DAV\Client $oClient
+	 * @param string $sPath
+	 *
 	 * @return bool
 	 */
-	public function Sync($sEmail, $sUrl, $sUser, $sPassword, $sProxy = '')
+	private function checkContactsPath(&$oClient, $sPath)
 	{
-		$this->SyncDatabase();
-
-		$iUserID = $this->getUserId($sEmail);
-		if (0 >= $iUserID)
+		if (!$oClient)
 		{
 			return false;
 		}
 
+		$this->oLogger->Write('PROPFIND '.$sPath, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+
+		$aResponse = null;
+		try
+		{
+			$aResponse = $oClient->propFind($sPath, array(
+				'{DAV:}resourcetype'
+			), 1);
+
+//			$this->oLogger->WriteDump($aResponse);
+		}
+		catch (\Exception $oException)
+		{
+			$this->oLogger->WriteException($oException);
+		}
+
+		$bGood = false;
+		if (\is_array($aResponse))
+		{
+			foreach ($aResponse as $sKey => $aItem)
+			{
+				if (!empty($sKey) && isset($aItem['{DAV:}resourcetype']))
+				{
+					$oResourceType = $aItem['{DAV:}resourcetype'];
+					/* @var $oResourceType \SabreForRainLoop\DAV\Property\ResourceType */
+
+					if ($oResourceType && $oResourceType->is('{DAV:}collection') &&
+						$oResourceType->is('{urn:ietf:params:xml:ns:carddav}addressbook'))
+					{
+						$bGood = true;
+					}
+				}
+			}
+		}
+
+		if ($bGood)
+		{
+			$oClient->__UrlPath__ = $sPath;
+		}
+
+		return $bGood;
+	}
+
+	public function getDavClientFromUrl($sUrl, $sUser, $sPassword, $sProxy = '')
+	{
+		if (!\preg_match('/^http[s]?:\/\//i', $sUrl))
+		{
+			$sUrl = \preg_replace('/^fruux\.com/i', 'dav.fruux.com', $sUrl);
+			$sUrl = \preg_replace('/^icloud\.com/i', 'contacts.icloud.com', $sUrl);
+			$sUrl = \preg_replace('/^gmail\.com/i', 'google.com', $sUrl);
+
+			if (\preg_match('/^(google\.|dav\.fruux\.com|contacts\.icloud\.com)/i', $sUrl))
+			{
+				$sUrl = 'https://'.$sUrl;
+			}
+			else
+			{
+				$sUrl = 'http://'.$sUrl;
+			}
+		}
+
 		$aUrl = \parse_url($sUrl);
 		if (!\is_array($aUrl))
 		{
@@ -238,17 +543,146 @@ class PdoAddressBook
 			$aSettings['proxy'] = $sProxy;
 		}
 
-		$sPath = $aUrl['path'];
+		$oClient = new \SabreForRainLoop\DAV\Client($aSettings);
+		$oClient->setVerifyPeer(false);
 
-		if (!\class_exists('Sabre\DAV\Client'))
+		$oClient->__UrlPath__ = $aUrl['path'];
+
+		$this->oLogger->Write('DavClient: User: '.$aSettings['userName'].', Url: '.$sUrl, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+
+		return $oClient;
+	}
+
+	/**
+	 * @param string $sEmail
+	 * @param string $sUrl
+	 * @param string $sUser
+	 * @param string $sPassword
+	 * @param string $sProxy = ''
+	 *
+	 * @return bool
+	 */
+	public function getDavClient($sUrl, $sUser, $sPassword, $sProxy = '')
+	{
+		if (!\class_exists('SabreForRainLoop\DAV\Client'))
 		{
 			return false;
 		}
 
-		$oClient = new \Sabre\DAV\Client($aSettings);
-		$oClient->setVerifyPeer(false);
+		$aMatch = array();
+		$sUserAddressBookNameName = '';
 
-		$this->oLogger->Write('User: '.$aSettings['userName'].', Url: '.$sUrl, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+		if (\preg_match('/\|(.+)$/', $sUrl, $aMatch) && !empty($aMatch[1]))
+		{
+			$sUserAddressBookNameName = \trim($aMatch[1]);
+			$sUserAddressBookNameName = \MailSo\Base\Utils::StrToLowerIfAscii($sUserAddressBookNameName);
+
+			$sUrl = \preg_replace('/\|(.+)$/', '', $sUrl);
+		}
+
+		$oClient = $this->getDavClientFromUrl($sUrl, $sUser, $sPassword, $sProxy);
+		if (!$oClient)
+		{
+			return false;
+		}
+
+		$bGood = false;
+		$sPath = $oClient->__UrlPath__;
+
+		$bGood = false;
+		if ('' === $sPath || '/' === $sPath || !$this->checkContactsPath($oClient, $sPath))
+		{
+			$sNewPath = '';
+
+			$aPaths = $this->getContactsPaths($oClient, $sUser, $sPassword, $sProxy);
+			$this->oLogger->WriteDump($aPaths);
+
+			if (\is_array($aPaths))
+			{
+				if (1 < \count($aPaths))
+				{
+					if ('' !== $sUserAddressBookNameName)
+					{
+						foreach ($aPaths as $sKey => $sValue)
+						{
+							$sValue = \MailSo\Base\Utils::StrToLowerIfAscii(\trim($sValue));
+							if ($sValue === $sUserAddressBookNameName)
+							{
+								$sNewPath = $sKey;
+								break;
+							}
+						}
+					}
+
+					if (empty($sNewPath))
+					{
+						foreach ($aPaths as $sKey => $sValue)
+						{
+							$sValue = \MailSo\Base\Utils::StrToLowerIfAscii($sValue);
+
+							if (\in_array($sValue, array('contacts', 'default', 'addressbook', 'address book')))
+							{
+								$sNewPath = $sKey;
+								break;
+							}
+						}
+					}
+				}
+
+				if (empty($sNewPath))
+				{
+					foreach ($aPaths as $sKey => $sValue)
+					{
+						$sNewPath = $sKey;
+						break;
+					}
+				}
+			}
+
+
+			$sPath = $sNewPath;
+
+			$bGood = $this->checkContactsPath($oClient, $sPath);
+		}
+		else
+		{
+			$bGood = true;
+		}
+
+		if (!$bGood)
+		{
+			$oClient = false;
+		}
+
+		return $oClient;
+	}
+
+	/**
+	 * @param string $sEmail
+	 * @param string $sUrl
+	 * @param string $sUser
+	 * @param string $sPassword
+	 * @param string $sProxy = ''
+	 *
+	 * @return bool
+	 */
+	public function Sync($sEmail, $sUrl, $sUser, $sPassword, $sProxy = '')
+	{
+		$this->SyncDatabase();
+
+		$iUserID = $this->getUserId($sEmail);
+		if (0 >= $iUserID)
+		{
+			return false;
+		}
+
+		$oClient = $this->getDavClient($sUrl, $sUser, $sPassword, $sProxy);
+		if (!$oClient)
+		{
+			return false;
+		}
+
+		$sPath = $oClient->__UrlPath__;
 
 		$aRemoteSyncData = $this->prepearRemoteSyncData($oClient, $sPath);
 		if (false === $aRemoteSyncData)
@@ -258,8 +692,8 @@ class PdoAddressBook
 
 		$aDatabaseSyncData = $this->prepearDatabaseSyncData($iUserID);
 
-//		$this->oLogger->WriteDump($aDatabaseSyncData);
 //		$this->oLogger->WriteDump($aRemoteSyncData);
+//		$this->oLogger->WriteDump($aDatabaseSyncData);
 
 		//+++del (from carddav)
 		foreach ($aDatabaseSyncData as $sKey => $aData)
@@ -315,10 +749,13 @@ class PdoAddressBook
 						{
 							$sExsistensBody = \trim($oResponse['body']);
 						}
+
+//						$this->oLogger->WriteDump($sExsistensBody);
 					}
 
 					$oResponse = $this->davClientRequest($oClient, 'PUT',
-						$sPath.$oContact->CardDavNameUri(), $oContact->ToVCard($sExsistensBody, $this->oLogger)."\r\n\r\n");
+						$sPath.(0 < \strlen($mExsistenRemoteID) ? $mExsistenRemoteID : $oContact->CardDavNameUri()),
+						$oContact->ToVCard($sExsistensBody, $this->oLogger)."\r\n\r\n");
 
 					if ($oResponse && isset($oResponse['headers'], $oResponse['headers']['etag']))
 					{
@@ -521,6 +958,7 @@ class PdoAddressBook
 						':prop_type' => array($oProp->Type, \PDO::PARAM_INT),
 						':prop_type_str' => array($oProp->TypeStr, \PDO::PARAM_STR),
 						':prop_value' => array($oProp->Value, \PDO::PARAM_STR),
+						':prop_value_lower' => array($oProp->ValueLower, \PDO::PARAM_STR),
 						':prop_value_custom' => array($oProp->ValueCustom, \PDO::PARAM_STR),
 						':prop_frec' => array($iFreq, \PDO::PARAM_INT),
 					);
@@ -529,9 +967,9 @@ class PdoAddressBook
 				if (0 < \count($aParams))
 				{
 					$sSql = 'INSERT INTO rainloop_ab_properties '.
-						'( id_contact,  id_user,  prop_type,  prop_type_str,  prop_value,  prop_value_custom,  prop_frec)'.
+						'( id_contact,  id_user,  prop_type,  prop_type_str,  prop_value,  prop_value_lower, prop_value_custom,  prop_frec)'.
 						' VALUES '.
-						'(:id_contact, :id_user, :prop_type, :prop_type_str, :prop_value, :prop_value_custom, :prop_frec)';
+						'(:id_contact, :id_user, :prop_type, :prop_type_str, :prop_value, :prop_value_lower, :prop_value_custom, :prop_frec)';
 
 					$this->prepareAndExecute($sSql, $aParams, true);
 				}
@@ -636,6 +1074,7 @@ class PdoAddressBook
 		if (0 < \strlen($sSearch))
 		{
 			$sCustomSearch = $this->specialConvertSearchValueCustomPhone($sSearch);
+			$sLowerSearch = $this->specialConvertSearchValueLower($sSearch, '=');
 
 			$sSearchTypes = \implode(',', array(
 				PropertyType::EMAIl, PropertyType::FIRST_NAME, PropertyType::LAST_NAME, PropertyType::NICK_NAME,
@@ -643,8 +1082,10 @@ class PdoAddressBook
 			));
 
 			$sSql = 'SELECT id_user, id_prop, id_contact FROM rainloop_ab_properties '.
-				'WHERE (id_user = :id_user) AND prop_type IN ('.$sSearchTypes.') AND (prop_value LIKE :search ESCAPE \'=\''.
-					(0 < \strlen($sCustomSearch) ? ' OR (prop_type = '.PropertyType::PHONE.' AND prop_value_custom <> \'\' AND prop_value_custom LIKE :search_custom_phone)' : '').
+				'WHERE (id_user = :id_user) AND prop_type IN ('.$sSearchTypes.') AND ('.
+				'prop_value LIKE :search ESCAPE \'=\''.
+(0 < \strlen($sLowerSearch) ? ' OR (prop_value_lower <> \'\' AND prop_value_lower LIKE :search_lower ESCAPE \'=\')' : '').
+(0 < \strlen($sCustomSearch) ? ' OR (prop_type = '.PropertyType::PHONE.' AND prop_value_custom <> \'\' AND prop_value_custom LIKE :search_custom_phone)' : '').
 				') GROUP BY id_contact, id_prop';
 
 			$aParams = array(
@@ -652,12 +1093,17 @@ class PdoAddressBook
 				':search' => array($this->specialConvertSearchValue($sSearch, '='), \PDO::PARAM_STR)
 			);
 
+			if (0 < \strlen($sLowerSearch))
+			{
+				$aParams[':search_lower'] = array($sLowerSearch, \PDO::PARAM_STR);
+			}
+
 			if (0 < \strlen($sCustomSearch))
 			{
 				$aParams[':search_custom_phone'] = array($sCustomSearch, \PDO::PARAM_STR);
 			}
 
-			$oStmt = $this->prepareAndExecute($sSql, $aParams);
+			$oStmt = $this->prepareAndExecute($sSql, $aParams, false, true);
 			if ($oStmt)
 			{
 				$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
@@ -775,6 +1221,7 @@ class PdoAddressBook
 										$oProperty->Type = (int) $aItem['prop_type'];
 										$oProperty->TypeStr = isset($aItem['prop_type_str']) ? (string) $aItem['prop_type_str'] : '';
 										$oProperty->Value = (string) $aItem['prop_value'];
+										$oProperty->ValueLower = isset($aItem['prop_value_lower']) ? (string) $aItem['prop_value_lower'] : '';
 										$oProperty->ValueCustom = isset($aItem['prop_value_custom']) ? (string) $aItem['prop_value_custom'] : '';
 										$oProperty->Frec = isset($aItem['prop_frec']) ? (int) $aItem['prop_frec'] : 0;
 
@@ -884,6 +1331,7 @@ class PdoAddressBook
 									$oProperty->Type = (int) $aItem['prop_type'];
 									$oProperty->TypeStr = isset($aItem['prop_type_str']) ? (string) $aItem['prop_type_str'] : '';
 									$oProperty->Value = (string) $aItem['prop_value'];
+									$oProperty->ValueLower = isset($aItem['prop_value_lower']) ? (string) $aItem['prop_value_lower'] : '';
 									$oProperty->ValueCustom = isset($aItem['prop_value_custom']) ? (string) $aItem['prop_value_custom'] : '';
 									$oProperty->Frec = isset($aItem['prop_frec']) ? (int) $aItem['prop_frec'] : 0;
 
@@ -928,8 +1376,14 @@ class PdoAddressBook
 			PropertyType::EMAIl, PropertyType::FIRST_NAME, PropertyType::LAST_NAME, PropertyType::NICK_NAME
 		));
 
+		$sLowerSearch = $this->specialConvertSearchValueLower($sSearch);
+
 		$sSql = 'SELECT id_contact, id_prop, prop_type, prop_value FROM rainloop_ab_properties '.
-			'WHERE (id_user = :id_user) AND prop_type IN ('.$sTypes.') AND prop_value LIKE :search ESCAPE \'=\'';
+			'WHERE (id_user = :id_user) AND prop_type IN ('.$sTypes.') AND ('.
+			'prop_value LIKE :search ESCAPE \'=\''.
+(0 < \strlen($sLowerSearch) ? ' OR (prop_value_lower <> \'\' AND prop_value_lower LIKE :search_lower ESCAPE \'=\')' : '').
+			')'
+		;
 
 		$aParams = array(
 			':id_user' => array($iUserID, \PDO::PARAM_INT),
@@ -937,6 +1391,11 @@ class PdoAddressBook
 			':search' => array($this->specialConvertSearchValue($sSearch, '='), \PDO::PARAM_STR)
 		);
 
+		if (0 < \strlen($sLowerSearch))
+		{
+			$aParams[':search_lower'] = array($sLowerSearch, \PDO::PARAM_STR);
+		}
+
 		$sSql .= ' ORDER BY prop_frec DESC';
 		$sSql .= ' LIMIT :limit';
 
@@ -1111,7 +1570,7 @@ class PdoAddressBook
 			{
 				$oResult = \MailSo\Mime\Email::Parse(\trim($mItem));
 			}
-			catch (\Exception $oException) {}
+			catch (\Exception $oException) { unset($oException); }
 			return $oResult;
 		}, $aEmails);
 
@@ -1401,7 +1860,7 @@ SQLITEINITIAL;
 				break;
 		}
 
-		if (0 < strlen($sInitial))
+		if (0 < \strlen($sInitial))
 		{
 			$aList = \explode(';', \trim($sInitial));
 			foreach ($aList as $sV)
@@ -1433,17 +1892,33 @@ SQLITEINITIAL;
 		{
 			case 'mysql':
 				$mCache = $this->dataBaseUpgrade($this->sDsnType.'-ab-version', array(
-					1 => $this->getInitialTablesArray($this->sDsnType)
+					1 => $this->getInitialTablesArray($this->sDsnType),
+					2 => array(
+'ALTER TABLE rainloop_ab_properties ADD prop_value_lower varchar(255) NOT NULL DEFAULT \'\' AFTER prop_value_custom;'
+					),
+					3 => array(
+'ALTER TABLE rainloop_ab_properties CHANGE prop_value prop_value TEXT NOT NULL;',
+'ALTER TABLE rainloop_ab_properties CHANGE prop_value_custom prop_value_custom TEXT NOT NULL;',
+'ALTER TABLE rainloop_ab_properties CHANGE prop_value_lower prop_value_lower TEXT NOT NULL;'
+					)
 				));
 				break;
 			case 'pgsql':
 				$mCache = $this->dataBaseUpgrade($this->sDsnType.'-ab-version', array(
-					1 => $this->getInitialTablesArray($this->sDsnType)
+					1 => $this->getInitialTablesArray($this->sDsnType),
+					2 => array(
+'ALTER TABLE rainloop_ab_properties ADD prop_value_lower text NOT NULL DEFAULT \'\';'
+					),
+					3 => array()
 				));
 				break;
 			case 'sqlite':
 				$mCache = $this->dataBaseUpgrade($this->sDsnType.'-ab-version', array(
-					1 => $this->getInitialTablesArray($this->sDsnType)
+					1 => $this->getInitialTablesArray($this->sDsnType),
+					2 => array(
+'ALTER TABLE rainloop_ab_properties ADD prop_value_lower text NOT NULL DEFAULT \'\';'
+					),
+					3 => array()
 				));
 				break;
 		}
@@ -1498,6 +1973,24 @@ SQLITEINITIAL;
 			array($sEscapeSign.$sEscapeSign, $sEscapeSign.'_', $sEscapeSign.'%'), $sSearch).'%';
 	}
 
+	/**
+	 * @param string $sSearch
+	 * @param string $sEscapeSign = '='
+	 *
+	 * @return string
+	 */
+	private function specialConvertSearchValueLower($sSearch, $sEscapeSign = '=')
+	{
+		if (!\MailSo\Base\Utils::FunctionExistsAndEnabled('mb_strtolower'))
+		{
+			return '';
+		}
+
+		return '%'.\str_replace(array($sEscapeSign, '_', '%'),
+			array($sEscapeSign.$sEscapeSign, $sEscapeSign.'_', $sEscapeSign.'%'),
+				(string) @\mb_strtolower($sSearch, 'UTF-8')).'%';
+	}
+
 	/**
 	 * @param string $sSearch
 	 *
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/ChangePassword.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/ChangePassword.php
index b344b227c..180b7afc1 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/ChangePassword.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/ChangePassword.php
@@ -53,6 +53,8 @@ class ChangePassword extends \RainLoop\Providers\AbstractProvider
 	 */
 	public function ChangePassword(\RainLoop\Account $oAccount, $sPrevPassword, $sNewPassword)
 	{
+		$mResult = false;
+		
 		if ($this->oDriver instanceof \RainLoop\Providers\ChangePassword\ChangePasswordInterface &&
 			$this->PasswordChangePossibility($oAccount))
 		{
@@ -79,11 +81,15 @@ class ChangePassword extends \RainLoop\Providers\AbstractProvider
 
 			$oAccount->SetPassword($sNewPassword);
 			$this->oActions->SetAuthToken($oAccount);
+
+			$mResult = $this->oActions->GetSpecAuthToken();
 		}
 		else
 		{
 			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CouldNotSaveNewPassword);
 		}
+
+		return $mResult;
 	}
 
 	/**
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files.php
index c3539b9c8..31d72a8c4 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files.php
@@ -116,6 +116,17 @@ class Files extends \RainLoop\Providers\AbstractProvider
 			$this->oDriver->CloseAllOpenedFiles() : false;
 	}
 
+	/**
+	 * @param \RainLoop\Model\Account $oAccount
+	 * @param string $sKey
+	 *
+	 * @return string
+	 */
+	public function GenerateLocalFullFileName($oAccount, $sKey)
+	{
+		return $this->oDriver ? $this->oDriver->GenerateLocalFullFileName($oAccount, $sKey) : '';
+	}
+
 	/**
 	 * @return bool
 	 */
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
index bc2591523..3ae703a8a 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
@@ -25,6 +25,17 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		$this->sDataPath = \rtrim(\trim($sStoragePath), '\\/');
 	}
 
+	/**
+	 * @param \RainLoop\Model\Account $oAccount
+	 * @param string $sKey
+	 *
+	 * @return string
+	 */
+	public function GenerateLocalFullFileName($oAccount, $sKey)
+	{
+		return $this->generateFullFileName($oAccount, $sKey, true);
+	}
+
 	/**
 	 * @param \RainLoop\Model\Account $oAccount
 	 * @param string $sKey
@@ -37,7 +48,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		$bResult = false;
 		if ($rSource)
 		{
-			$rOpenOutput = @\fopen($this->generateFileName($oAccount, $sKey, true), 'w+b');
+			$rOpenOutput = @\fopen($this->generateFullFileName($oAccount, $sKey, true), 'w+b');
 			if ($rOpenOutput)
 			{
 				$bResult = (false !== \MailSo\Base\Utils::MultipleStreamWriter($rSource, array($rOpenOutput)));
@@ -57,7 +68,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 	public function MoveUploadedFile($oAccount, $sKey, $sSource)
 	{
 		return @\move_uploaded_file($sSource,
-			$this->generateFileName($oAccount, $sKey, true));
+			$this->generateFullFileName($oAccount, $sKey, true));
 	}
 
 	/**
@@ -72,7 +83,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		$mResult = false;
 		$bCreate = !!\preg_match('/[wac]/', $sOpenMode);
 
-		$sFileName = $this->generateFileName($oAccount, $sKey, $bCreate);
+		$sFileName = $this->generateFullFileName($oAccount, $sKey, $bCreate);
 		if ($bCreate || \file_exists($sFileName))
 		{
 			$mResult = @\fopen($sFileName, $sOpenMode);
@@ -95,7 +106,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 	public function GetFileName($oAccount, $sKey)
 	{
 		$mResult = false;
-		$sFileName = $this->generateFileName($oAccount, $sKey);
+		$sFileName = $this->generateFullFileName($oAccount, $sKey);
 		if (\file_exists($sFileName))
 		{
 			$mResult = $sFileName;
@@ -113,7 +124,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 	public function Clear($oAccount, $sKey)
 	{
 		$mResult = true;
-		$sFileName = $this->generateFileName($oAccount, $sKey);
+		$sFileName = $this->generateFullFileName($oAccount, $sKey);
 		if (\file_exists($sFileName))
 		{
 			if (isset($this->aResources[$sFileName]) && \is_resource($this->aResources[$sFileName]))
@@ -136,7 +147,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 	public function FileSize($oAccount, $sKey)
 	{
 		$mResult = false;
-		$sFileName = $this->generateFileName($oAccount, $sKey);
+		$sFileName = $this->generateFullFileName($oAccount, $sKey);
 		if (\file_exists($sFileName))
 		{
 			$mResult = \filesize($sFileName);
@@ -153,7 +164,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 	 */
 	public function FileExists($oAccount, $sKey)
 	{
-		return @\file_exists($this->generateFileName($oAccount, $sKey));
+		return @\file_exists($this->generateFullFileName($oAccount, $sKey));
 	}
 
 	/**
@@ -198,7 +209,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 	 *
 	 * @return string
 	 */
-	private function generateFileName($oAccount, $sKey, $bMkDir = false)
+	private function generateFullFileName($oAccount, $sKey, $bMkDir = false)
 	{
 		$sEmail = $sSubEmail = '';
 		if ($oAccount instanceof \RainLoop\Model\Account)
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/IFiles.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/IFiles.php
index cb7aaceae..c31e231be 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/IFiles.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/IFiles.php
@@ -4,6 +4,14 @@ namespace RainLoop\Providers\Files;
 
 interface IFiles
 {
+	/**
+	 * @param \RainLoop\Model\Account $oAccount
+	 * @param string $sKey
+	 *
+	 * @return string
+	 */
+	public function GenerateLocalFullFileName($oAccount, $sKey);
+
 	/**
 	 * @param \RainLoop\Model\Account $oAccount
 	 * @param string $sKey
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/Filter.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/Filter.php
index 360a2c074..09c181344 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/Filter.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/Filter.php
@@ -49,6 +49,11 @@ class Filter
 	 */
 	private $sActionValueThird;
 
+	/**
+	 * @var string
+	 */
+	private $sActionValueFourth;
+
 	/**
 	 * @var bool
 	 */
@@ -89,6 +94,7 @@ class Filter
 		$this->sActionValue = '';
 		$this->sActionValueSecond = '';
 		$this->sActionValueThird = '';
+		$this->sActionValueFourth  = '';
 
 		$this->bMarkAsRead = false;
 		$this->bKeep = true;
@@ -167,6 +173,14 @@ class Filter
 		return $this->sActionValueThird;
 	}
 
+	/**
+	 * @return string
+	 */
+	public function ActionValueFourth()
+	{
+		return $this->sActionValueFourth;
+	}
+
 	/**
 	 * @return bool
 	 */
@@ -236,6 +250,7 @@ class Filter
 			$this->sActionValue = isset($aFilter['ActionValue']) ? $aFilter['ActionValue'] : '';
 			$this->sActionValueSecond = isset($aFilter['ActionValueSecond']) ? $aFilter['ActionValueSecond'] : '';
 			$this->sActionValueThird = isset($aFilter['ActionValueThird']) ? $aFilter['ActionValueThird'] : '';
+			$this->sActionValueFourth = isset($aFilter['ActionValueFourth']) ? $aFilter['ActionValueFourth'] : '';
 
 			$this->bKeep = isset($aFilter['Keep']) ? '1' === (string) $aFilter['Keep'] : true;
 			$this->bStop = isset($aFilter['Stop']) ? '1' === (string) $aFilter['Stop'] : true;
@@ -276,6 +291,7 @@ class Filter
 			'ActionValue' => $this->ActionValue(),
 			'ActionValueSecond' => $this->ActionValueSecond(),
 			'ActionValueThird' => $this->ActionValueThird(),
+			'ActionValueFourth' => $this->ActionValueFourth(),
 			'Keep' => $this->Keep(),
 			'Stop' => $this->Stop(),
 			'MarkAsRead' => $this->MarkAsRead()
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/FilterCondition.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/FilterCondition.php
index b56e92fdf..173d66dfa 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/FilterCondition.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/FilterCondition.php
@@ -19,6 +19,11 @@ class FilterCondition
 	 */
 	private $sValue;
 
+	/**
+	 * @var string
+	 */
+	private $sValueSecond;
+
 	public function __construct()
 	{
 		$this->Clear();
@@ -29,6 +34,7 @@ class FilterCondition
 		$this->sField = \RainLoop\Providers\Filters\Enumerations\ConditionField::FROM;
 		$this->sType = \RainLoop\Providers\Filters\Enumerations\ConditionType::EQUAL_TO;
 		$this->sValue = '';
+		$this->sValueSecond = '';
 	}
 
 	/**
@@ -55,6 +61,14 @@ class FilterCondition
 		return $this->sValue;
 	}
 
+	/**
+	 * @return string
+	 */
+	public function ValueSecond()
+	{
+		return $this->sValueSecond;
+	}
+
 	/**
 	 * @param array $aData
 	 *
@@ -70,7 +84,8 @@ class FilterCondition
 			$this->sType = isset($aData['Type']) ? $aData['Type'] :
 				\RainLoop\Providers\Filters\Enumerations\ConditionType::EQUAL_TO;
 
-			$this->sValue = isset($aData['Value']) ? $aData['Value'] : '';
+			$this->sValue = isset($aData['Value']) ? (string) $aData['Value'] : '';
+			$this->sValueSecond = isset($aData['ValueSecond']) ? (string) $aData['ValueSecond'] : '';
 
 			return true;
 		}
@@ -88,7 +103,8 @@ class FilterCondition
 		return array(
 			'Field' => $this->Field(),
 			'Type' => $this->Type(),
-			'Value' => $this->Value()
+			'Value' => $this->Value(),
+			'ValueSecond' => $this->ValueSecond()
 		);
 	}
 
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionField.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionField.php
index 7853ba457..e78f95402 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionField.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionField.php
@@ -7,4 +7,6 @@ class ConditionField
 	const FROM = 'From';
 	const RECIPIENT = 'Recipient';
 	const SUBJECT = 'Subject';
+	const HEADER = 'Header';
+	const SIZE = 'Size';
 }
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionType.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionType.php
index 96b6c4113..126bdf642 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionType.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionType.php
@@ -8,4 +8,6 @@ class ConditionType
 	const NOT_EQUAL_TO = 'NotEqualTo';
 	const CONTAINS = 'Contains';
 	const NOT_CONTAINS = 'NotContains';
+	const OVER = 'Over';
+	const UNDER = 'Under';
 }
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
index 4d14d2b16..590dc9568 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
@@ -163,12 +163,23 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
 	{
 		$sResult = '';
 		$sTypeWord = '';
+		$bTrue = true;
 
 		$sValue = \trim($oCondition->Value());
-		if (0 < strlen($sValue))
+		$sValueSecond = \trim($oCondition->ValueSecond());
+
+		if (0 < \strlen($sValue) ||
+			(0 < \strlen($sValue) && 0 < \strlen($sValueSecond) &&
+				\RainLoop\Providers\Filters\Enumerations\ConditionField::HEADER === $oCondition->Field()))
 		{
 			switch ($oCondition->Type())
 			{
+				case \RainLoop\Providers\Filters\Enumerations\ConditionType::OVER:
+					$sTypeWord = ':over';
+					break;
+				case \RainLoop\Providers\Filters\Enumerations\ConditionType::UNDER:
+					$sTypeWord = ':under';
+					break;
 				case \RainLoop\Providers\Filters\Enumerations\ConditionType::NOT_EQUAL_TO:
 					$sResult .= 'not ';
 				case \RainLoop\Providers\Filters\Enumerations\ConditionType::EQUAL_TO:
@@ -179,6 +190,10 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
 				case \RainLoop\Providers\Filters\Enumerations\ConditionType::CONTAINS:
 					$sTypeWord = ':contains';
 					break;
+				default:
+					$bTrue = false;
+					$sResult = '/* @Error: unknown type value */ false';
+					break;
 			}
 
 			switch ($oCondition->Field())
@@ -192,26 +207,43 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
 				case \RainLoop\Providers\Filters\Enumerations\ConditionField::SUBJECT:
 					$sResult .= 'header '.$sTypeWord.' ["Subject"]';
 					break;
+				case \RainLoop\Providers\Filters\Enumerations\ConditionField::HEADER:
+					$sResult .= 'header '.$sTypeWord.' ["'.$this->quote($sValueSecond).'"]';
+					break;
+				case \RainLoop\Providers\Filters\Enumerations\ConditionField::SIZE:
+					$sResult .= 'size '.$sTypeWord;
+					break;
+				default:
+					$bTrue = false;
+					$sResult = '/* @Error: unknown field value */ false';
+					break;
 			}
 
-			if (\in_array($oCondition->Field(), array(
-				\RainLoop\Providers\Filters\Enumerations\ConditionField::FROM,
-				\RainLoop\Providers\Filters\Enumerations\ConditionField::RECIPIENT
-			)) && false !== \strpos($sValue, ','))
+			if ($bTrue)
 			{
-				$self = $this;
-				$aValue = \array_map(function ($sValue) use ($self) {
-					return '"'.$self->quote(\trim($sValue)).'"';
-				}, \explode(',', $sValue));
+				if (\in_array($oCondition->Field(), array(
+					\RainLoop\Providers\Filters\Enumerations\ConditionField::FROM,
+					\RainLoop\Providers\Filters\Enumerations\ConditionField::RECIPIENT
+				)) && false !== \strpos($sValue, ','))
+				{
+					$self = $this;
+					$aValue = \array_map(function ($sValue) use ($self) {
+						return '"'.$self->quote(\trim($sValue)).'"';
+					}, \explode(',', $sValue));
 
-				$sResult .= ' ['.\trim(\implode(', ', $aValue)).']';
-			}
-			else
-			{
-				$sResult .= ' "'.$this->quote($sValue).'"';
-			}
+					$sResult .= ' ['.\trim(\implode(', ', $aValue)).']';
+				}
+				else if (\RainLoop\Providers\Filters\Enumerations\ConditionField::SIZE === $oCondition->Field())
+				{
+					$sResult .= ' '.$this->quote($sValue);
+				}
+				else
+				{
+					$sResult .= ' "'.$this->quote($sValue).'"';
+				}
 
-			$sResult = \preg_replace('/[\s]+/u', ' ', $sResult);
+				$sResult = \MailSo\Base\Utils::StripSpaces($sResult);
+			}
 		}
 		else
 		{
@@ -318,6 +350,7 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
 				$sValue = \trim($oFilter->ActionValue());
 				$sValueSecond = \trim($oFilter->ActionValueSecond());
 				$sValueThird = \trim($oFilter->ActionValueThird());
+				$sValueFourth = \trim($oFilter->ActionValueFourth());
 				if (0 < \strlen($sValue))
 				{
 					$aCapa['vacation'] = true;
@@ -326,8 +359,8 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
 					$sSubject = '';
 					if (0 < \strlen($sValueSecond))
 					{
-						$sSubject = ':subject "'.$this->quote(
-							\preg_replace('/[\s]+/u', ' ', $sValueSecond)).'" ';
+						$sSubject = ':subject "'.
+							$this->quote(\MailSo\Base\Utils::StripSpaces($sValueSecond)).'" ';
 					}
 
 					if (0 < \strlen($sValueThird) && \is_numeric($sValueThird) && 1 < (int) $sValueThird)
@@ -335,8 +368,24 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
 						$iDays = (int) $sValueThird;
 					}
 
-					$aResult[] = $sTab.'vacation :days '.$iDays.' '.$sSubject.'"'.$this->quote($sValue).'";';
+					$sAddresses = '';
+					if (0 < \strlen($sValueFourth))
+					{
+						$self = $this;
 
+						$aAddresses = \explode(',', $sValueFourth);
+						$aAddresses = \array_filter(\array_map(function ($sEmail) use ($self) {
+							$sEmail = \trim($sEmail);
+							return 0 < \strlen($sEmail) ? '"'.$self->quote($sEmail).'"' : '';
+						}, $aAddresses), 'strlen');
+
+						if (0 < \count($aAddresses))
+						{
+							$sAddresses = ':addresses ['.\implode(', ', $aAddresses).'] ';
+						}
+					}
+
+					$aResult[] = $sTab.'vacation :days '.$iDays.' '.$sAddresses.$sSubject.'"'.$this->quote($sValue).'";';
 					if ($oFilter->Stop())
 					{
 						$aResult[] = $sTab.'stop;';
@@ -491,7 +540,7 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
 	 *
 	 * @return string
 	 */
-	private function quote($sValue)
+	public function quote($sValue)
 	{
 		return \str_replace(array('\\', '"'), array('\\\\', '\\"'), \trim($sValue));
 	}
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions.php
index d4b5b27bc..13cc8cbe9 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions.php
@@ -5,31 +5,72 @@ namespace RainLoop\Providers;
 class Suggestions extends \RainLoop\Providers\AbstractProvider
 {
 	/**
-	 * @var \RainLoop\Providers\Suggestions\ISuggestions
+	 * @var \RainLoop\Providers\Suggestions\ISuggestions[]
 	 */
-	private $oDriver;
+	private $aDrivers;
 
 	/**
-	 * @param \RainLoop\Providers\Suggestions\ISuggestions|null $oDriver = null
+	 * @param \RainLoop\Providers\Suggestions\ISuggestions[]|null $aDriver = null
 	 *
 	 * @return void
 	 */
-	public function __construct($oDriver = null)
+	public function __construct($aDriver = null)
 	{
-		$this->oDriver = $oDriver;
+		if (\is_array($aDriver))
+		{
+			$aDriver = \array_filter($aDriver, function ($oDriver) {
+				return $oDriver instanceof \RainLoop\Providers\Suggestions\ISuggestions;
+			});
+		}
+
+		$this->aDrivers = \is_array($aDriver) && 0 < \count($aDriver) ? $aDriver : null;
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 * @param string $sQuery
 	 * @param int $iLimit = 20
 	 *
 	 * @return array
 	 */
-	public function Process(\RainLoop\Account $oAccount, $sQuery, $iLimit = 20)
+	public function Process($oAccount, $sQuery, $iLimit = 20)
 	{
-		return $this->oDriver && $this->IsActive() && 0 < \strlen($sQuery) ?
-			$this->oDriver->Process($oAccount, $sQuery, $iLimit = 20) : array();
+		$aResult = array();
+		$aSuggestions = array();
+		if ($oAccount instanceof \RainLoop\Model\Account &&
+			$this->IsActive() && \is_array($this->aDrivers) && 0 < \strlen($sQuery))
+		{
+			foreach ($this->aDrivers as $oDriver)
+			{
+				$aSubs = null;
+				if ($oDriver)
+				{
+					$aSubs = $oDriver->Process($oAccount, $sQuery, $iLimit);
+					if (\is_array($aSubs) && 0 < \count($aSubs))
+					{
+						$aSuggestions = \array_merge($aSuggestions, $aSubs);
+					}
+				}
+			}
+		}
+
+		$aCache = array();
+		foreach ($aSuggestions as $aItem) // remove duplicates
+		{
+			$sLine = \implode('~~', $aItem);
+			if (!isset($aCache[$sLine]))
+			{
+				$aCache[$sLine] = true;
+				$aResult[] = $aItem;
+			}
+		}
+
+		if ($iLimit < \count($aResult))
+		{
+			$aResult = \array_slice($aResult, 0, $iLimit);
+		}
+
+		return $aResult;
 	}
 
 	/**
@@ -37,6 +78,6 @@ class Suggestions extends \RainLoop\Providers\AbstractProvider
 	 */
 	public function IsActive()
 	{
-		return $this->oDriver instanceof \RainLoop\Providers\Suggestions\ISuggestions;
+		return \is_array($this->aDrivers) && 0 < \count($this->aDrivers);
 	}
 }
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/ISuggestions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/ISuggestions.php
index cbb8130d2..93050fbce 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/ISuggestions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/ISuggestions.php
@@ -9,7 +9,7 @@ interface ISuggestions
 	 * @param string $sQuery
 	 * @param int $iLimit = 20
 	 *
-	 * @return array
+	 * @return array [['email@1', 'name_1'], ['email@2', 'name_2']]
 	 */
 	public function Process($oAccount, $sQuery, $iLimit = 20);
 }
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php
index d4a7aac97..33eae71bf 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php
@@ -24,9 +24,8 @@ class OwnCloudSuggestions implements \RainLoop\Providers\Suggestions\ISuggestion
 
 		try
 		{
-			if ('' === $sQuery || !$oAccount || !\RainLoop\Utils::IsOwnCloud() ||
-				!\class_exists('\\OCP\\Contacts') || !\OCP\Contacts::isEnabled() ||
-				!\class_exists('\\OCP\\User') || !\OCP\User::isLoggedIn()
+			if ('' === $sQuery || !$oAccount || !\RainLoop\Utils::IsOwnCloudLoggedIn() ||
+				!\class_exists('OCP\Contacts') || !\OCP\Contacts::isEnabled()
 			)
 			{
 				return $aResult;
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/TestSuggestions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/TestSuggestions.php
index fd9cbfc9c..f1c640c46 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/TestSuggestions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/TestSuggestions.php
@@ -15,7 +15,7 @@ class TestSuggestions implements \RainLoop\Providers\Suggestions\ISuggestions
 	{
 		return array(
 			array($oAccount->Email(), ''),
-			array('xxx@xxx', 'xxx')
+			array('email@domain.com', 'name')
 		);
 	}
 }
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
index 896fbdfa7..903e615c1 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -193,17 +193,23 @@ class Service
 
 			$sResult .= '';
+			$sResult .= '] //-->';
 		}
 
 		// Output result
@@ -260,7 +266,9 @@ class Service
 			'{{BaseAppOpenPgpScriptLink}}' => $aData['OpenPgpJsLink'],
 			'{{BaseAppMainCommonScriptLink}}' => $aData['AppJsCommonLink'],
 			'{{BaseAppMainScriptLink}}' => $aData['AppJsLink'],
-			'{{BaseDir}}' => \in_array($aData['Language'], array('ar', 'he', 'ur')) ? 'rtl' : 'ltr'
+			'{{BaseVersion}}' => APP_VERSION,
+			'{{BaseDir}}' => 'ltr'
+//			'{{BaseDir}}' => \in_array($aData['Language'], array('ar', 'he', 'ur')) ? 'rtl' : 'ltr'
 		);
 
 		$aTemplateParameters['{{BaseHash}}'] = \md5(
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index 76eb2c773..19b2cb183 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -429,7 +429,7 @@ class ServiceActions
 		{
 			$this->oActions->verifyCacheByKey($sData);
 
-			$aData = \RainLoop\Utils::DecodeKeyValues($sData);
+			$aData = \RainLoop\Utils::DecodeKeyValuesQ($sData);
 			if (\is_array($aData) && !empty($aData['Token']) && !empty($aData['Url']) && $aData['Token'] === \RainLoop\Utils::GetConnectionToken())
 			{
 				$iCode = 404;
@@ -766,7 +766,8 @@ class ServiceActions
 	 */
 	public function ServiceSocialGoogle()
 	{
-		return $this->oActions->Social()->GooglePopupService();
+		$bXAuth = '1' === (string) $this->oHttp->GetQuery('xauth', '0');
+		return $this->oActions->Social()->GooglePopupService($bXAuth);
 	}
 
 	/**
@@ -892,7 +893,7 @@ class ServiceActions
 			$sSsoSubData = $this->Cacher()->Get(\RainLoop\KeyPathHelper::SsoCacherKey($sSsoHash));
 			if (!empty($sSsoSubData))
 			{
-				$mData = \RainLoop\Utils::DecodeKeyValues($sSsoSubData);
+				$mData = \RainLoop\Utils::DecodeKeyValuesQ($sSsoSubData);
 				$this->Cacher()->Delete(\RainLoop\KeyPathHelper::SsoCacherKey($sSsoHash));
 
 				if (\is_array($mData) && !empty($mData['Email']) && isset($mData['Password'], $mData['Time']) &&
@@ -1219,11 +1220,23 @@ class ServiceActions
 	 */
 	public function compileTemplates($bAdmin = false, $bJsOutput = true)
 	{
-		$sHtml =
-			\RainLoop\Utils::CompileTemplates(APP_VERSION_ROOT_PATH.'app/templates/Views/Components', $this->oActions, 'Component').
-			\RainLoop\Utils::CompileTemplates(APP_VERSION_ROOT_PATH.'app/templates/Views/'.($bAdmin ? 'Admin' : 'User'), $this->oActions).
-			\RainLoop\Utils::CompileTemplates(APP_VERSION_ROOT_PATH.'app/templates/Views/Common', $this->oActions).
-			$this->oActions->Plugins()->CompileTemplate($bAdmin);
+		$aTemplates = array();
+
+		\RainLoop\Utils::CompileTemplates($aTemplates, APP_VERSION_ROOT_PATH.'app/templates/Views/Components', 'Component');
+		\RainLoop\Utils::CompileTemplates($aTemplates, APP_VERSION_ROOT_PATH.'app/templates/Views/'.($bAdmin ? 'Admin' : 'User'));
+		\RainLoop\Utils::CompileTemplates($aTemplates, APP_VERSION_ROOT_PATH.'app/templates/Views/Common');
+
+		$this->oActions->Plugins()->CompileTemplate($aTemplates, $bAdmin);
+
+		$sHtml = '';
+		foreach ($aTemplates as $sName => $sFile)
+		{
+			$sName = \preg_replace('/[^a-zA-Z0-9]/', '', $sName);
+			$sHtml .= '';
+		}
+
+		unset($aTemplates);
 
 		return $bJsOutput ? 'window.rainloopTEMPLATES='.\MailSo\Base\Utils::Php2js(array($sHtml), $this->Logger()).';' : $sHtml;
 	}
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Social.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Social.php
index aa0175c40..0183b84f3 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Social.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Social.php
@@ -25,152 +25,6 @@ class Social
 		$this->oActions = $oActions;
 	}
 
-	/**
-	 * @param array $oItem
-	 * @param array $aPics
-	 *
-	 * @return array|null
-	 */
-	private function convertGoogleJsonContactToResponseContact($oItem, &$aPics)
-	{
-		$mResult = null;
-		if (!empty($oItem['gd$email'][0]['address']))
-		{
-			$mEmail = \MailSo\Base\Utils::IdnToAscii($oItem['gd$email'][0]['address'], true);
-			if (\is_array($oItem['gd$email']) && 1 < \count($oItem['gd$email']))
-			{
-				$mEmail = array();
-				foreach ($oItem['gd$email'] as $oEmail)
-				{
-					if (!empty($oEmail['address']))
-					{
-						$mEmail[] = \MailSo\Base\Utils::IdnToAscii($oEmail['address'], true);
-					}
-				}
-			}
-
-			$sImg = '';
-			if (!empty($oItem['link']) && \is_array($oItem['link']))
-			{
-				foreach ($oItem['link'] as $oLink)
-				{
-					if ($oLink && isset($oLink['type'], $oLink['href'], $oLink['rel']) &&
-						'image/*' === $oLink['type'] && '#photo' === \substr($oLink['rel'], -6))
-					{
-						$sImg = $oLink['href'];
-						break;
-					}
-				}
-			}
-
-			$mResult = array(
-				'email' => $mEmail,
-				'name' => !empty($oItem['title']['$t']) ? $oItem['title']['$t'] : ''
-			);
-
-			if (0 < \strlen($sImg))
-			{
-				$sHash = \RainLoop\Utils::EncodeKeyValues(array(
-					'url' => $sImg,
-					'type' => 'google_access_token'
-				));
-
-				$mData = array();
-				if (isset($aPics[$sHash]))
-				{
-					$mData = $aPics[$sHash];
-					if (!\is_array($mData))
-					{
-						$mData = array($mData);
-					}
-				}
-
-				if (\is_array($mEmail))
-				{
-					$mData = \array_merge($mData, $mEmail);
-					$mData = \array_unique($mData);
-				}
-				else if (0 < \strlen($mEmail))
-				{
-					$mData[] = $mEmail;
-				}
-
-				if (\is_array($mData))
-				{
-					if (1 === \count($mData) && !empty($mData[0]))
-					{
-						$aPics[$sHash] = $mData[0];
-					}
-					else if (1 < \count($mData))
-					{
-						$aPics[$sHash] = $mData;
-					}
-				}
-			}
-		}
-
-		return $mResult;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function GoogleUserContacts($oAccount)
-	{
-		$mResult = false;
-		$oGoogle = $this->GoogleConnector();
-		$aPics = array();
-
-		if ($oAccount && $oGoogle)
-		{
-			$sAccessToken = $this->GoogleAccessToken($oAccount, $oGoogle);
-			if (!empty($sAccessToken))
-			{
-				$oGoogle->setAccessToken($sAccessToken);
-
-				$aResponse = $oGoogle->fetch('https://www.google.com/m8/feeds/contacts/default/full', array(
-					'alt' => 'json'
-				));
-
-				if (!empty($aResponse['result']['feed']['entry']) && \is_array($aResponse['result']['feed']['entry']))
-				{
-					$mResult = array();
-					foreach ($aResponse['result']['feed']['entry'] as $oItem)
-					{
-						$aItem = $this->convertGoogleJsonContactToResponseContact($oItem, $aPics);
-						if ($aItem)
-						{
-							if (\is_array($aItem['email']))
-							{
-								$aNewItem = $aItem;
-								unset($aNewItem['email']);
-
-								foreach ($aItem['email'] as $sEmail)
-								{
-									$aNewItem['email'] = $sEmail;
-									$mResult[] = $aNewItem;
-								}
-							}
-							else
-							{
-								$mResult[] = $aItem;
-							}
-						}
-					}
-				}
-			}
-			else
-			{
-				$this->oActions->Logger()->Write('Empty Google Access Token', \MailSo\Log\Enumerations\Type::ERROR);
-			}
-		}
-
-		return false !== $mResult ? array(
-			'List' => $mResult,
-			'Pics' => $aPics
-		) : false;
-	}
-
 	/**
 	 * @return bool
 	 */
@@ -185,7 +39,7 @@ class Social
 			if (!empty($sEncodedeData))
 			{
 				$aData = \RainLoop\Utils::DecodeKeyValues($sEncodedeData);
-				if (\is_array($aData) && isset($aData['access_token'], $aData['id']))
+				if (\is_array($aData) && !empty($aData['id']))
 				{
 					$this->oActions->StorageProvider()->Clear(null,
 						\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY,
@@ -271,7 +125,7 @@ class Social
 	/**
 	 * @return string
 	 */
-	public function GooglePopupService()
+	public function GooglePopupService($bGmail = false)
 	{
 		$sResult = '';
 		$sLoginUrl = '';
@@ -298,23 +152,36 @@ class Social
 				$sState = $this->oHttp->GetQuery('state');
 				if (!empty($sState))
 				{
-					$aParts = explode('|', $sState, 2);
-					$sCheckToken = !empty($aParts[0]) ? $aParts[0] : '';
-					$sCheckAuth = !empty($aParts[1]) ? $aParts[1] : '';
+					$aParts = explode('|', $sState, 3);
+
+					if (!$bGmail)
+					{
+						$bGmail = !empty($aParts[0]) ? '1' === (string) $aParts[0] : false;
+					}
+
+					$sCheckToken = !empty($aParts[1]) ? $aParts[1] : '';
+					$sCheckAuth = !empty($aParts[2]) ? $aParts[2] : '';
 				}
 
 				$sRedirectUrl = $this->oHttp->GetFullUrl().'?SocialGoogle';
 				if (!$this->oHttp->HasQuery('code'))
 				{
-//					https://www.google.com/m8/feeds/
 					$aParams = array(
-						'scope' => 'https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile',
-						'state' => \RainLoop\Utils::GetConnectionToken().'|'.$this->oActions->GetSpecAuthToken(),
-//						'access_type' => 'offline',
-//						'approval_prompt' => 'force',
+						'scope' => \trim(\implode(' ', array(
+							'https://www.googleapis.com/auth/userinfo.email',
+							'https://www.googleapis.com/auth/userinfo.profile',
+							$bGmail ? 'https://mail.google.com/' : ''
+						))),
+						'state' => ($bGmail ? '1' : '0').'|'.\RainLoop\Utils::GetConnectionToken().'|'.$this->oActions->GetSpecAuthToken(),
 						'response_type' => 'code'
 					);
 
+//					if ($bGmail)
+//					{
+//						$aParams['access_type'] = 'offline';
+//						$aParams['approval_prompt'] = 'force';
+//					}
+
 					$sLoginUrl = $oGoogle->getAuthenticationUrl('https://accounts.google.com/o/oauth2/auth', $sRedirectUrl, $aParams);
 				}
 				else if (!empty($sState) && $sCheckToken === \RainLoop\Utils::GetConnectionToken())
@@ -332,18 +199,32 @@ class Social
 					if (!empty($aAuthorizationResponse['result']['access_token']))
 					{
 						$oGoogle->setAccessToken($aAuthorizationResponse['result']['access_token']);
-						$aUserinfoResponse = $oGoogle->fetch('https://www.googleapis.com/oauth2/v2/userinfo');
+						$aUserInfoResponse = $oGoogle->fetch('https://www.googleapis.com/oauth2/v2/userinfo');
 
-						if (!empty($aUserinfoResponse['result']['id']))
+						if (!empty($aUserInfoResponse['result']['id']))
 						{
 							if ($bLogin)
 							{
-								$sUserData = $this->oActions->StorageProvider()->Get(null,
-									\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY,
-									$this->GoogleUserLoginStorageKey($oGoogle, $aUserinfoResponse['result']['id'])
-								);
+								$aUserData = null;
+								if ($bGmail)
+								{
+									if (!empty($aUserInfoResponse['result']['email']))
+									{
+										$aUserData = array(
+											'Email' => $aUserInfoResponse['result']['email'],
+											'Password' => APP_GOOGLE_ACCESS_TOKEN_PREFIX.$aAuthorizationResponse['result']['access_token']
+										);
+									}
+								}
+								else
+								{
+									$sUserData = $this->oActions->StorageProvider()->Get(null,
+										\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY,
+										$this->GoogleUserLoginStorageKey($oGoogle, $aUserInfoResponse['result']['id'])
+									);
 
-								$aUserData = \RainLoop\Utils::DecodeKeyValues($sUserData);
+									$aUserData = \RainLoop\Utils::DecodeKeyValues($sUserData);
+								}
 
 								if ($aUserData && \is_array($aUserData) &&
 									!empty($aUserData['Email']) && isset($aUserData['Password']))
@@ -356,24 +237,31 @@ class Social
 								}
 							}
 
-							if ($oAccount)
+							if ($oAccount && !$bGmail)
 							{
 								$aUserData = array(
+									'ID' => $aUserInfoResponse['result']['id'],
 									'Email' => $oAccount->Email(),
 									'Password' => $oAccount->Password()
 								);
 
-								$sSocialName = !empty($aUserinfoResponse['result']['name']) ? $aUserinfoResponse['result']['name'] : '';
-								$sSocialName .= !empty($aUserinfoResponse['result']['email']) ? ' ('.$aUserinfoResponse['result']['email'].')' : '';
+								$sSocialName = !empty($aUserInfoResponse['result']['name']) ? $aUserInfoResponse['result']['name'] : '';
+								$sSocialName .= !empty($aUserInfoResponse['result']['email']) ? ' ('.$aUserInfoResponse['result']['email'].')' : '';
 								$sSocialName = \trim($sSocialName);
 
 								$oSettings = $this->oActions->SettingsProvider()->Load($oAccount);
+
+								$oSettings->SetConf('GoogleAccessToken', \RainLoop\Utils::EncodeKeyValues(array(
+									'id' => $aUserInfoResponse['result']['id']
+								)));
+
 								$oSettings->SetConf('GoogleSocialName', $sSocialName);
+
 								$this->oActions->SettingsProvider()->Save($oAccount, $oSettings);
 
 								$this->oActions->StorageProvider()->Put(null,
 									\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY,
-									$this->GoogleUserLoginStorageKey($oGoogle, $aUserinfoResponse['result']['id']),
+									$this->GoogleUserLoginStorageKey($oGoogle, $aUserInfoResponse['result']['id']),
 									\RainLoop\Utils::EncodeKeyValues($aUserData));
 
 								$iErrorCode = 0;
@@ -577,9 +465,7 @@ class Social
 
 							if (200 === $iCode && isset($oTwitter->response['response']))
 							{
-								$this->oActions->Logger()->WriteDump($oTwitter->response['response']);
 								$aAccessToken = $oTwitter->extract_params($oTwitter->response['response']);
-								$this->oActions->Logger()->WriteDump($aAccessToken);
 								if ($aAccessToken && isset($aAccessToken['oauth_token']) && !empty($aAccessToken['user_id']))
 								{
 									$oTwitter->config['user_token'] = $aAccessToken['oauth_token'];
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php
index b85f33c99..56a53082f 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php
@@ -4,8 +4,17 @@ namespace RainLoop;
 
 class Utils
 {
+	/**
+	 * @var string
+	 */
+	static $CookieDefaultPath = '/';
+
 	static $Cookies = null;
 
+	static $RSA = null;
+
+	static $RsaKey = null;
+
 	/**
 	 * @return void
 	 */
@@ -13,6 +22,164 @@ class Utils
 	{
 	}
 
+	/**
+	 * @param string $sFileName
+	 * @param string $sSignature
+	 *
+	 * @return bool
+	 */
+	static public function PgpVerifyFile($sFileName, $sSignature)
+	{
+		$sKeyFile = APP_VERSION_ROOT_PATH.'app/resources/RainLoop.asc';
+		if (\file_exists($sKeyFile) && \file_exists($sFileName) && !empty($sSignature))
+		{
+			$sKeyFile = @\file_get_contents($sKeyFile);
+			return !empty($sKeyFile); // TODO
+		}
+
+		return false;
+	}
+
+	/**
+	 * @return \Crypt_RSA|null
+	 */
+	static public function CryptRSA()
+	{
+		if (null === \RainLoop\Utils::$RSA)
+		{
+			if (!\defined('_phpseclib_'))
+			{
+				\set_include_path(\get_include_path().PATH_SEPARATOR.APP_VERSION_ROOT_PATH.'app/libraries/phpseclib');
+				define('_phpseclib_', true);
+			}
+
+			if (!\class_exists('Crypt_RSA', false))
+			{
+				include_once 'Crypt/RSA.php';
+				\defined('CRYPT_RSA_MODE') || \define('CRYPT_RSA_MODE', CRYPT_RSA_MODE_INTERNAL);
+			}
+
+			if (\class_exists('Crypt_RSA'))
+			{
+				$oRsa = new \Crypt_RSA();
+
+				$oRsa->setEncryptionMode(CRYPT_RSA_ENCRYPTION_PKCS1);
+				$oRsa->setPrivateKeyFormat(CRYPT_RSA_PRIVATE_FORMAT_PKCS1);
+				$oRsa->setPrivateKeyFormat(CRYPT_RSA_PUBLIC_FORMAT_PKCS1);
+
+				$sPrivateKey = \file_exists(APP_PRIVATE_DATA.'rsa/private') ?
+					\file_get_contents(APP_PRIVATE_DATA.'rsa/private') : '';
+
+				if (!empty($sPrivateKey))
+				{
+					$oRsa->loadKey($sPrivateKey, CRYPT_RSA_PRIVATE_FORMAT_PKCS1);
+					$oRsa->loadKey($oRsa->getPublicKey(), CRYPT_RSA_PUBLIC_FORMAT_PKCS1);
+
+					\RainLoop\Utils::$RSA = $oRsa;
+				}
+			}
+		}
+
+		return \RainLoop\Utils::$RSA;
+	}
+
+	/**
+	 * @return string
+	 */
+	static public function RsaPrivateKey()
+	{
+		if (!empty(\RainLoop\Utils::$RsaKey))
+		{
+			return \RainLoop\Utils::$RsaKey;
+		}
+
+		\RainLoop\Utils::$RsaKey = \file_exists(APP_PRIVATE_DATA.'rsa/private') ?
+			\file_get_contents(APP_PRIVATE_DATA.'rsa/private') : '';
+
+		\RainLoop\Utils::$RsaKey = \is_string(\RainLoop\Utils::$RsaKey) ? \RainLoop\Utils::$RsaKey : '';
+	}
+
+	/**
+	 * @param string $sString
+	 * @param string $sKey = ''
+	 *
+	 * @return string|false
+	 */
+	static public function EncryptStringRSA($sString, $sKey = '')
+	{
+		$sResult = '';
+		$sKey = \md5($sKey);
+
+		$sPrivateKey = \RainLoop\Utils::RsaPrivateKey();
+		if (!empty($sPrivateKey))
+		{
+			$oPrivKey  = \openssl_pkey_get_private($sPrivateKey);
+			$oKeyDetails = \openssl_pkey_get_details($oPrivKey);
+
+			if (!empty($oKeyDetails['key']) && !empty($oKeyDetails['bits']))
+			{
+				$oPubKey = \openssl_pkey_get_public($oKeyDetails['key']);
+
+				$iC = (($oKeyDetails['bits'] / 8) - 15);
+				$aString = \str_split($sString, $iC);
+
+				foreach ($aString as $iIndex => $sLine)
+				{
+					$sEncrypted = '';
+					\openssl_public_encrypt($sLine, $sEncrypted, $oPubKey);
+					$aString[$iIndex] = $sEncrypted;
+				}
+
+				$aString[] = $sKey;
+				$sResult = @\serialize($aString);
+
+				\openssl_free_key($oPubKey);
+			}
+
+			\openssl_free_key($oPrivKey);
+		}
+
+		return $sResult;
+	}
+
+	/**
+	 * @param string $sString
+	 * @param string $sKey = ''
+	 *
+	 * @return string|false
+	 */
+	static public function DecryptStringRSA($sString, $sKey = '')
+	{
+		$sResult = '';
+		$sKey = \md5($sKey);
+
+		$sPrivateKey = \RainLoop\Utils::RsaPrivateKey();
+		if (!empty($sPrivateKey) && !empty($sString))
+		{
+			$oPrivKey  = \openssl_pkey_get_private($sPrivateKey);
+
+			$aString = @\unserialize($sString);
+			if (\is_array($aString))
+			{
+				if ($sKey === \array_pop($aString))
+				{
+					foreach ($aString as $iIndex => $sLine)
+					{
+						$sDecrypted = '';
+						\openssl_private_decrypt($sLine, $sDecrypted, $oPrivKey);
+						$aString[$iIndex] = $sDecrypted;
+					}
+
+					$sResult = \implode('', $aString);
+				}
+			}
+
+			\openssl_free_key($oPrivKey);
+		}
+
+		return $sResult;
+	}
+
 	/**
 	 * @param string $sString
 	 * @param string $sKey
@@ -35,6 +202,42 @@ class Utils
 		return \MailSo\Base\Crypt::XxteaDecrypt($sEncriptedString, $sKey);
 	}
 
+	/**
+	 * @param string $sString
+	 * @param string $sKey
+	 *
+	 * @return string
+	 */
+	static public function EncryptStringQ($sString, $sKey)
+	{
+//		if (\MailSo\Base\Utils::FunctionExistsAndEnabled('openssl_pkey_get_private'))
+//		{
+//			return \RainLoop\Utils::EncryptStringRSA($sString,
+//				$sKey.'Q'.\RainLoop\Utils::GetShortToken());
+//		}
+
+		return \MailSo\Base\Crypt::XxteaEncrypt($sString,
+			$sKey.'Q'.\RainLoop\Utils::GetShortToken());
+	}
+
+	/**
+	 * @param string $sEncriptedString
+	 * @param string $sKey
+	 *
+	 * @return string
+	 */
+	static public function DecryptStringQ($sEncriptedString, $sKey)
+	{
+//		if (\MailSo\Base\Utils::FunctionExistsAndEnabled('openssl_pkey_get_private'))
+//		{
+//			return \RainLoop\Utils::DecryptStringRSA($sEncriptedString,
+//				$sKey.'Q'.\RainLoop\Utils::GetShortToken());
+//		}
+
+		return \MailSo\Base\Crypt::XxteaDecrypt($sEncriptedString,
+			$sKey.'Q'.\RainLoop\Utils::GetShortToken());
+	}
+
 	/**
 	 * @param array $aValues
 	 * @param string $sCustomKey = ''
@@ -44,7 +247,7 @@ class Utils
 	static public function EncodeKeyValues(array $aValues, $sCustomKey = '')
 	{
 		return \MailSo\Base\Utils::UrlSafeBase64Encode(
-			\RainLoop\Utils::EncryptString(\serialize($aValues), \md5(APP_SALT.$sCustomKey)));
+			\RainLoop\Utils::EncryptString(@\serialize($aValues), \md5(APP_SALT.$sCustomKey)));
 	}
 
 	/**
@@ -55,13 +258,41 @@ class Utils
 	 */
 	static public function DecodeKeyValues($sEncodedValues, $sCustomKey = '')
 	{
-		$aResult = \unserialize(
+		$aResult = @\unserialize(
 			\RainLoop\Utils::DecryptString(
 				\MailSo\Base\Utils::UrlSafeBase64Decode($sEncodedValues), \md5(APP_SALT.$sCustomKey)));
 
 		return \is_array($aResult) ? $aResult : array();
 	}
 
+	/**
+	 * @param array $aValues
+	 * @param string $sCustomKey = ''
+	 *
+	 * @return string
+	 */
+	static public function EncodeKeyValuesQ(array $aValues, $sCustomKey = '')
+	{
+		return \MailSo\Base\Utils::UrlSafeBase64Encode(
+			\RainLoop\Utils::EncryptStringQ(
+				@\serialize($aValues), \md5(APP_SALT.$sCustomKey)));
+	}
+
+	/**
+	 * @param string $sEncodedValues
+	 * @param string $sCustomKey = ''
+	 *
+	 * @return array
+	 */
+	static public function DecodeKeyValuesQ($sEncodedValues, $sCustomKey = '')
+	{
+		$aResult = @\unserialize(
+			\RainLoop\Utils::DecryptStringQ(
+				\MailSo\Base\Utils::UrlSafeBase64Decode($sEncodedValues), \md5(APP_SALT.$sCustomKey)));
+
+		return \is_array($aResult) ? $aResult : array();
+	}
+
 	/**
 	 * @return string
 	 */
@@ -73,7 +304,7 @@ class Utils
 		if (null === $sToken)
 		{
 			$sToken = \MailSo\Base\Utils::Md5Rand(APP_SALT);
-			\RainLoop\Utils::SetCookie($sKey, $sToken, \time() + 60 * 60 * 24 * 30, '/', null, null, true);
+			\RainLoop\Utils::SetCookie($sKey, $sToken, \time() + 60 * 60 * 24 * 30);
 		}
 
 		return \md5('Connection'.APP_SALT.$sToken.'Token'.APP_SALT);
@@ -98,7 +329,7 @@ class Utils
 		if (null === $sToken)
 		{
 			$sToken = \MailSo\Base\Utils::Md5Rand(APP_SALT);
-			\RainLoop\Utils::SetCookie($sKey, $sToken, 0, '/', null, null, true);
+			\RainLoop\Utils::SetCookie($sKey, $sToken, 0);
 		}
 
 		return \md5('Session'.APP_SALT.$sToken.'Token'.APP_SALT);
@@ -114,7 +345,7 @@ class Utils
 		$sToken = \RainLoop\Utils::GetCookie($sKey, '');
 		if (!empty($sToken))
 		{
-			\RainLoop\Utils::SetCookie($sKey, $sToken, \time() + 60 * 60 * 24 * 30, '/', null, null, true);
+			\RainLoop\Utils::SetCookie($sKey, $sToken, \time() + 60 * 60 * 24 * 30);
 		}
 	}
 
@@ -244,30 +475,22 @@ class Utils
 	}
 
 	/**
+	 * @param array $aList
 	 * @param string $sDirName
-	 * @param \RainLoop\Actions $oAction
 	 * @param string $sNameSuffix = ''
-	 *
-	 * @return string
 	 */
-	public static function CompileTemplates($sDirName, $oAction, $sNameSuffix = '')
+	public static function CompileTemplates(&$aList, $sDirName, $sNameSuffix = '')
 	{
-		$sResult = '';
 		if (\file_exists($sDirName))
 		{
-			$aList = \RainLoop\Utils::FolderFiles($sDirName, '.html');
+			$aFileList = \RainLoop\Utils::FolderFiles($sDirName, '.html');
 
-			foreach ($aList as $sName)
+			foreach ($aFileList as $sName)
 			{
 				$sTemplateName = \substr($sName, 0, -5).$sNameSuffix;
-				$sResult .= '';
+				$aList[$sTemplateName] = $sDirName.'/'.$sName;
 			}
-
-			$sResult = \trim($sResult);
 		}
-
-		return $sResult;
 	}
 
 	/**
@@ -277,34 +500,39 @@ class Utils
 	 */
 	public static function GetCookie($sName, $mDefault = null)
 	{
-		if (null === self::$Cookies)
+		if (null === \RainLoop\Utils::$Cookies)
 		{
-			self::$Cookies = is_array($_COOKIE) ? $_COOKIE : array();
+			\RainLoop\Utils::$Cookies = is_array($_COOKIE) ? $_COOKIE : array();
 		}
 
-		return isset(self::$Cookies[$sName]) ? self::$Cookies[$sName] : $mDefault;
+		return isset(\RainLoop\Utils::$Cookies[$sName]) ? \RainLoop\Utils::$Cookies[$sName] : $mDefault;
 	}
 
-	public static function SetCookie($sName, $sValue = '', $iExpire = 0, $sPath = '/', $sDomain = '', $sSecure = false, $bHttpOnly = false)
+	public static function SetCookie($sName, $sValue = '', $iExpire = 0, $sPath = null, $sDomain = null, $sSecure = null, $bHttpOnly = true)
 	{
-		if (null === self::$Cookies)
+		if (null === \RainLoop\Utils::$Cookies)
 		{
-			self::$Cookies = is_array($_COOKIE) ? $_COOKIE : array();
+			\RainLoop\Utils::$Cookies = is_array($_COOKIE) ? $_COOKIE : array();
 		}
 
-		self::$Cookies[$sName] = $sValue;
+		if (null === $sPath)
+		{
+			$sPath = \RainLoop\Utils::$CookieDefaultPath;
+		}
+
+		\RainLoop\Utils::$Cookies[$sName] = $sValue;
 		@\setcookie($sName, $sValue, $iExpire, $sPath, $sDomain, $sSecure, $bHttpOnly);
 	}
 
 	public static function ClearCookie($sName)
 	{
-		if (null === self::$Cookies)
+		if (null === \RainLoop\Utils::$Cookies)
 		{
-			self::$Cookies = is_array($_COOKIE) ? $_COOKIE : array();
+			\RainLoop\Utils::$Cookies = is_array($_COOKIE) ? $_COOKIE : array();
 		}
 
-		unset(self::$Cookies[$sName]);
-		@\setcookie($sName, '', \time() - 3600 * 24 * 30, '/');
+		unset(\RainLoop\Utils::$Cookies[$sName]);
+		@\setcookie($sName, '', \time() - 3600 * 24 * 30);
 	}
 
 	/**
@@ -313,7 +541,25 @@ class Utils
 	public static function IsOwnCloud()
 	{
 		return isset($_ENV['RAINLOOP_OWNCLOUD']) && $_ENV['RAINLOOP_OWNCLOUD'] &&
-			\class_exists('\\OC');
+			\class_exists('OC');
+	}
+	/**
+	 * @return bool
+	 */
+	public static function IsOwnCloudLoggedIn()
+	{
+		return self::IsOwnCloud() && \class_exists('OCP\User') && \OCP\User::isLoggedIn();
+	}
+
+	/**
+	 * @param string $sV
+	 * @param bool $bEncode = false
+	 *
+	 * @return string
+	 */
+	public static function UrlEncode($sV, $bEncode = false)
+	{
+		return $bEncode ? \urlencode($sV) : $sV;
 	}
 
 	/**
@@ -324,7 +570,7 @@ class Utils
 		$sAppPath = '';
 		if (\RainLoop\Utils::IsOwnCloud())
 		{
-			if (\class_exists('\\OC_App'))
+			if (\class_exists('OC_App'))
 			{
 				$sAppPath = \rtrim(\trim(\OC_App::getAppWebPath('rainloop')), '\\/').'/app/';
 			}
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/AbstractBackend.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/AbstractBackend.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/AbstractBackend.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/AbstractBackend.php
index 21f88162b..eab644076 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/AbstractBackend.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/AbstractBackend.php
@@ -1,9 +1,9 @@
 getCalendarObjects($calendarId);
 
-        $validator = new \Sabre\CalDAV\CalendarQueryValidator();
+        $validator = new \SabreForRainLoop\CalDAV\CalendarQueryValidator();
 
         foreach($objects as $object) {
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/BackendInterface.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/BackendInterface.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/BackendInterface.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/BackendInterface.php
index b8334e5d0..ddfe5d8c0 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/BackendInterface.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/BackendInterface.php
@@ -1,6 +1,6 @@
 getValue());
         }
@@ -497,7 +497,7 @@ class PDO extends AbstractBackend {
             }
         }
         if (!$componentType) {
-            throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
         }
         if ($componentType === 'VEVENT') {
             $firstOccurence = $component->DTSTART->getDateTime()->getTimeStamp();
@@ -572,7 +572,7 @@ class PDO extends AbstractBackend {
      * query.
      *
      * The list of filters are specified as an array. The exact array is
-     * documented by \Sabre\CalDAV\CalendarQueryParser.
+     * documented by \SabreForRainLoop\CalDAV\CalendarQueryParser.
      *
      * Note that it is extremely likely that getCalendarObject for every path
      * returned from this method will be called almost immediately after. You
@@ -601,7 +601,7 @@ class PDO extends AbstractBackend {
      * time-range filter specified on a VEVENT must for instance also handle
      * recurrence rules correctly.
      * A good example of how to interprete all these filters can also simply
-     * be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
+     * be found in \SabreForRainLoop\CalDAV\CalendarQueryFilter. This class is as correct
      * as possible, so it gives you a good idea on what type of stuff you need
      * to think of.
      *
@@ -615,7 +615,7 @@ class PDO extends AbstractBackend {
     public function calendarQuery($calendarId, array $filters) {
 
         $result = array();
-        $validator = new \Sabre\CalDAV\CalendarQueryValidator();
+        $validator = new \SabreForRainLoop\CalDAV\CalendarQueryValidator();
 
         $componentType = null;
         $requirePostFilter = true;
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/SharingSupport.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/SharingSupport.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/SharingSupport.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/SharingSupport.php
index 8fb2b320c..3bfcc145d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/SharingSupport.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/SharingSupport.php
@@ -1,6 +1,6 @@
 xpath->query('/cal:calendar-query/cal:filter');
         if ($filter->length !== 1) {
-            throw new \Sabre\DAV\Exception\BadRequest('Only one filter element is allowed');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('Only one filter element is allowed');
         }
 
         $compFilters = $this->parseCompFilters($filter->item(0));
         if (count($compFilters)!==1) {
-            throw new \Sabre\DAV\Exception\BadRequest('There must be exactly 1 top-level comp-filter.');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('There must be exactly 1 top-level comp-filter.');
         }
 
         $this->filters = $compFilters[0];
-        $this->requestedProperties = array_keys(\Sabre\DAV\XMLUtil::parseProperties($this->dom->firstChild));
+        $this->requestedProperties = array_keys(\SabreForRainLoop\DAV\XMLUtil::parseProperties($this->dom->firstChild));
 
         $expand = $this->xpath->query('/cal:calendar-query/dav:prop/cal:calendar-data/cal:expand');
         if ($expand->length>0) {
@@ -132,7 +132,7 @@ class CalendarQueryParser {
                 'VFREEBUSY',
                 'VALARM',
             ))) {
-                throw new \Sabre\DAV\Exception\BadRequest('The time-range filter is not defined for the ' . $compFilter['name'] . ' component');
+                throw new \SabreForRainLoop\DAV\Exception\BadRequest('The time-range filter is not defined for the ' . $compFilter['name'] . ' component');
             };
 
             $result[] = $compFilter;
@@ -253,7 +253,7 @@ class CalendarQueryParser {
         }
 
         if (!is_null($start) && !is_null($end) && $end <= $start) {
-            throw new \Sabre\DAV\Exception\BadRequest('The end-date must be larger than the start-date in the time-range filter');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('The end-date must be larger than the start-date in the time-range filter');
         }
 
         return array(
@@ -273,19 +273,19 @@ class CalendarQueryParser {
 
         $start = $parentNode->getAttribute('start');
         if(!$start) {
-            throw new \Sabre\DAV\Exception\BadRequest('The "start" attribute is required for the CALDAV:expand element');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('The "start" attribute is required for the CALDAV:expand element');
         }
         $start = VObject\DateTimeParser::parseDateTime($start);
 
         $end = $parentNode->getAttribute('end');
         if(!$end) {
-            throw new \Sabre\DAV\Exception\BadRequest('The "end" attribute is required for the CALDAV:expand element');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('The "end" attribute is required for the CALDAV:expand element');
         }
 
         $end = VObject\DateTimeParser::parseDateTime($end);
 
         if ($end <= $start) {
-            throw new \Sabre\DAV\Exception\BadRequest('The end-date must be larger than the start-date in the expand element.');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('The end-date must be larger than the start-date in the expand element.');
         }
 
         return array(
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarQueryValidator.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarQueryValidator.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarQueryValidator.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarQueryValidator.php
index fd47127f2..4537d3bf5 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarQueryValidator.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarQueryValidator.php
@@ -1,8 +1,8 @@
 name . ' components');
+                throw new \SabreForRainLoop\DAV\Exception\NotImplemented('time-range filters are currently not supported on ' . $component->name . ' components');
 
             case 'COMPLETED' :
             case 'CREATED' :
@@ -383,7 +383,7 @@ class CalendarQueryValidator {
 
 
             default :
-                throw new \Sabre\DAV\Exception\BadRequest('You cannot create a time-range filter on a ' . $component->name . ' component');
+                throw new \SabreForRainLoop\DAV\Exception\BadRequest('You cannot create a time-range filter on a ' . $component->name . ' component');
 
         }
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarRootNode.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarRootNode.php
similarity index 84%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarRootNode.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarRootNode.php
index 5d1ee7780..69e01b1a4 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarRootNode.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarRootNode.php
@@ -1,8 +1,8 @@
 xmlNamespaces[self::NS_CALDAV] = 'cal';
         $server->xmlNamespaces[self::NS_CALENDARSERVER] = 'cs';
 
-        $server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Property\\SupportedCalendarComponentSet';
-        $server->propertyMap['{' . self::NS_CALDAV . '}schedule-calendar-transp'] = 'Sabre\\CalDAV\\Property\\ScheduleCalendarTransp';
+        $server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'SabreForRainLoop\\CalDAV\\Property\\SupportedCalendarComponentSet';
+        $server->propertyMap['{' . self::NS_CALDAV . '}schedule-calendar-transp'] = 'SabreForRainLoop\\CalDAV\\Property\\ScheduleCalendarTransp';
 
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Schedule\\IOutbox'] = '{urn:ietf:params:xml:ns:caldav}schedule-outbox';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Notifications\\ICollection'] = '{' . self::NS_CALENDARSERVER . '}notification';
+        $server->resourceTypeMapping['\\SabreForRainLoop\\CalDAV\\ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
+        $server->resourceTypeMapping['\\SabreForRainLoop\\CalDAV\\Schedule\\IOutbox'] = '{urn:ietf:params:xml:ns:caldav}schedule-outbox';
+        $server->resourceTypeMapping['\\SabreForRainLoop\\CalDAV\\Principal\\IProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
+        $server->resourceTypeMapping['\\SabreForRainLoop\\CalDAV\\Principal\\IProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
+        $server->resourceTypeMapping['\\SabreForRainLoop\\CalDAV\\Notifications\\ICollection'] = '{' . self::NS_CALENDARSERVER . '}notification';
 
         array_push($server->protectedProperties,
 
@@ -286,7 +286,7 @@ class Plugin extends DAV\ServerPlugin {
         // for clients matching iCal in the user agent
         //$ua = $this->server->httpRequest->getHeader('User-Agent');
         //if (strpos($ua,'iCal/')!==false) {
-        //    throw new \Sabre\DAV\Exception\Forbidden('iCal has major bugs in it\'s RFC3744 support. Therefore we are left with no other choice but disabling this feature.');
+        //    throw new \SabreForRainLoop\DAV\Exception\Forbidden('iCal has major bugs in it\'s RFC3744 support. Therefore we are left with no other choice but disabling this feature.');
         //}
 
         $body = $this->server->httpRequest->getBody(true);
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/Collection.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/Collection.php
similarity index 91%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/Collection.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/Collection.php
index 4fc70e265..e4559c878 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/Collection.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/Collection.php
@@ -1,7 +1,7 @@
 server = $server;
-        $server->resourceTypeMapping['Sabre\\CalDAV\\ISharedCalendar'] = '{' . Plugin::NS_CALENDARSERVER . '}shared';
+        $server->resourceTypeMapping['SabreForRainLoop\\CalDAV\\ISharedCalendar'] = '{' . Plugin::NS_CALENDARSERVER . '}shared';
 
         array_push(
             $this->server->protectedProperties,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/UserCalendars.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/UserCalendars.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/UserCalendars.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/UserCalendars.php
index a3be4fdd3..17f7956f0 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/UserCalendars.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/UserCalendars.php
@@ -1,9 +1,9 @@
 xmlNamespaces[self::NS_CARDDAV] = 'card';
 
         /* Mapping Interfaces to {DAV:}resourcetype values */
-        $server->resourceTypeMapping['Sabre\\CardDAV\\IAddressBook'] = '{' . self::NS_CARDDAV . '}addressbook';
-        $server->resourceTypeMapping['Sabre\\CardDAV\\IDirectory'] = '{' . self::NS_CARDDAV . '}directory';
+        $server->resourceTypeMapping['SabreForRainLoop\\CardDAV\\IAddressBook'] = '{' . self::NS_CARDDAV . '}addressbook';
+        $server->resourceTypeMapping['SabreForRainLoop\\CardDAV\\IDirectory'] = '{' . self::NS_CARDDAV . '}directory';
 
         /* Adding properties that may never be changed */
         $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-address-data';
@@ -73,7 +73,7 @@ class Plugin extends DAV\ServerPlugin {
         $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}addressbook-home-set';
         $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-collation-set';
 
-        $server->propertyMap['{http://calendarserver.org/ns/}me-card'] = 'Sabre\\DAV\\Property\\Href';
+        $server->propertyMap['{http://calendarserver.org/ns/}me-card'] = 'SabreForRainLoop\\DAV\\Property\\Href';
 
         $this->server = $server;
 
@@ -654,7 +654,7 @@ class Plugin extends DAV\ServerPlugin {
 
     /**
      * This method is used to generate HTML output for the
-     * Sabre\DAV\Browser\Plugin. This allows us to generate an interface users
+     * SabreForRainLoop\DAV\Browser\Plugin. This allows us to generate an interface users
      * can use to create new calendars.
      *
      * @param DAV\INode $node
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Property/SupportedAddressData.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Property/SupportedAddressData.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Property/SupportedAddressData.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Property/SupportedAddressData.php
index b2bb6b551..084c06f32 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Property/SupportedAddressData.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Property/SupportedAddressData.php
@@ -1,9 +1,9 @@
  'icons/file',
-        'Sabre\\DAV\\ICollection' => 'icons/collection',
-        'Sabre\\DAVACL\\IPrincipal' => 'icons/principal',
-        'Sabre\\CalDAV\\ICalendar' => 'icons/calendar',
-        'Sabre\\CardDAV\\IAddressBook' => 'icons/addressbook',
-        'Sabre\\CardDAV\\ICard' => 'icons/card',
+        'SabreForRainLoop\\DAV\\IFile' => 'icons/file',
+        'SabreForRainLoop\\DAV\\ICollection' => 'icons/collection',
+        'SabreForRainLoop\\DAVACL\\IPrincipal' => 'icons/principal',
+        'SabreForRainLoop\\CalDAV\\ICalendar' => 'icons/calendar',
+        'SabreForRainLoop\\CardDAV\\IAddressBook' => 'icons/addressbook',
+        'SabreForRainLoop\\CardDAV\\ICard' => 'icons/card',
     );
 
     /**
@@ -49,7 +49,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * reference to server class
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
@@ -400,7 +400,7 @@ class Plugin extends DAV\ServerPlugin {
 
         // We also know fairly certain that if an object is a non-extended
         // SimpleCollection, we won't need to show the panel either.
-        if (get_class($node)==='Sabre\\DAV\\SimpleCollection')
+        if (get_class($node)==='SabreForRainLoop\\DAV\\SimpleCollection')
             return;
 
         $output.= '

diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/favicon.ico b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/favicon.ico
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/favicon.ico
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/favicon.ico
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/addressbook.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/addressbook.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/addressbook.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/addressbook.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/calendar.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/calendar.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/calendar.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/calendar.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/card.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/card.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/card.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/card.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/collection.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/collection.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/collection.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/collection.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/file.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/file.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/file.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/file.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/parent.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/parent.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/parent.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/parent.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/principal.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/principal.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/principal.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/principal.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Client.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Client.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
index e2831bf70..8941d74cb 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Client.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
@@ -1,6 +1,6 @@
 authType = self::AUTH_BASIC | self::AUTH_DIGEST;
         }
 
-        $this->propertyMap['{DAV:}resourcetype'] = 'Sabre\\DAV\\Property\\ResourceType';
+        $this->propertyMap['{DAV:}resourcetype'] = 'SabreForRainLoop\\DAV\\Property\\ResourceType';
 
     }
 
@@ -376,6 +376,9 @@ class Client {
             $curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
         }
 
+//		var_dump($url);
+//		var_dump($curlSettings);
+
         list(
             $response,
             $curlInfo,
@@ -383,9 +386,12 @@ class Client {
             $curlError
         ) = $this->curlRequest($url, $curlSettings);
 
+//		var_dump($response);
+
         $headerBlob = substr($response, 0, $curlInfo['header_size']);
         $response = substr($response, $curlInfo['header_size']);
 
+
         // In the case of 100 Continue, or redirects we'll have multiple lists
         // of headers for each separate HTTP response. We can easily split this
         // because they are separated by \r\n\r\n
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Collection.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Collection.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Collection.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Collection.php
index d8d5265b9..1e070e76c 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Collection.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Collection.php
@@ -1,6 +1,6 @@
 ownerDocument->createElementNS('DAV:','d:valid-resourcetype');
         $errorNode->appendChild($error);
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/LockTokenMatchesRequestUri.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/LockTokenMatchesRequestUri.php
index a8f8407f0..6fbd28891 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/LockTokenMatchesRequestUri.php
@@ -1,8 +1,8 @@
 getAllowedMethods($server->getRequestUri());
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/NotAuthenticated.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/NotAuthenticated.php
similarity index 88%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/NotAuthenticated.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/NotAuthenticated.php
index 695edda15..99e2ad262 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/NotAuthenticated.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/NotAuthenticated.php
@@ -1,8 +1,8 @@
 addPlugin($lockPlugin);
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
@@ -30,7 +30,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * server
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
@@ -66,7 +66,7 @@ class Plugin extends DAV\ServerPlugin {
      * Returns a plugin name.
      *
      * Using this name other plugins will be able to access other plugins
-     * using Sabre\DAV\Server::getPlugin
+     * using SabreForRainLoop\DAV\Server::getPlugin
      *
      * @return string
      */
@@ -216,7 +216,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Returns all lock information on a particular uri
      *
-     * This function should return an array with Sabre\DAV\Locks\LockInfo objects. If there are no locks on a file, return an empty array.
+     * This function should return an array with SabreForRainLoop\DAV\Locks\LockInfo objects. If there are no locks on a file, return an empty array.
      *
      * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree
      * If the $returnChildLocks argument is set to true, we'll also traverse all the children of the object
@@ -449,7 +449,7 @@ class Plugin extends DAV\ServerPlugin {
      * It will check if the requested url is locked, and see if the correct lock tokens are passed
      *
      * @param mixed $urls List of relevant urls. Can be an array, a string or nothing at all for the current request uri
-     * @param mixed $lastLock This variable will be populated with the last checked lock object (Sabre\DAV\Locks\LockInfo)
+     * @param mixed $lastLock This variable will be populated with the last checked lock object (SabreForRainLoop\DAV\Locks\LockInfo)
      * @param bool $checkChildLocks If set to true, this function will also look for any locks set on child resources of the supplied urls. This is needed for for example deletion of entire trees.
      * @return bool
      */
@@ -614,7 +614,7 @@ class Plugin extends DAV\ServerPlugin {
     }
 
     /**
-     * Parses a webdav lock xml body, and returns a new Sabre\DAV\Locks\LockInfo object
+     * Parses a webdav lock xml body, and returns a new SabreForRainLoop\DAV\Locks\LockInfo object
      *
      * @param string $body
      * @return DAV\Locks\LockInfo
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Mount/Plugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Mount/Plugin.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Mount/Plugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Mount/Plugin.php
index 669acafc0..4959f012b 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Mount/Plugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Mount/Plugin.php
@@ -1,8 +1,8 @@
 addPlugin($patchPlugin);
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
@@ -23,7 +23,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Reference to server
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property.php
index 00f0df3fe..36d4ea694 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property.php
@@ -1,6 +1,6 @@
 responses = $responses;
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/SupportedLock.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/SupportedLock.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/SupportedLock.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/SupportedLock.php
index e6f477c38..5ddde6478 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/SupportedLock.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/SupportedLock.php
@@ -1,8 +1,8 @@
  'Sabre\\DAV\\Property\\ResourceType',
+        '{DAV:}resourcetype' => 'SabreForRainLoop\\DAV\\Property\\ResourceType',
     );
 
     public $protectedProperties = array(
@@ -131,12 +131,12 @@ class Server {
      * based on a node's classname or interface.
      *
      * The preset ensures that {DAV:}collection is automaticlly added for nodes
-     * implementing Sabre\DAV\ICollection.
+     * implementing SabreForRainLoop\DAV\ICollection.
      *
      * @var array
      */
     public $resourceTypeMapping = array(
-        'Sabre\\DAV\\ICollection' => '{DAV:}collection',
+        'SabreForRainLoop\\DAV\\ICollection' => '{DAV:}collection',
     );
 
     /**
@@ -152,12 +152,12 @@ class Server {
     /**
      * Sets up the server
      *
-     * If a Sabre\DAV\Tree object is passed as an argument, it will
-     * use it as the directory tree. If a Sabre\DAV\INode is passed, it
-     * will create a Sabre\DAV\ObjectTree and use the node as the root.
+     * If a SabreForRainLoop\DAV\Tree object is passed as an argument, it will
+     * use it as the directory tree. If a SabreForRainLoop\DAV\INode is passed, it
+     * will create a SabreForRainLoop\DAV\ObjectTree and use the node as the root.
      *
-     * If nothing is passed, a Sabre\DAV\SimpleCollection is created in
-     * a Sabre\DAV\ObjectTree.
+     * If nothing is passed, a SabreForRainLoop\DAV\SimpleCollection is created in
+     * a SabreForRainLoop\DAV\ObjectTree.
      *
      * If an array is passed, we automatically create a root node, and use
      * the nodes in the array as top-level children.
@@ -176,7 +176,7 @@ class Server {
             // create the root node.
             foreach($treeOrNode as $node) {
                 if (!($node instanceof INode)) {
-                    throw new Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement Sabre\\DAV\\INode');
+                    throw new Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement SabreForRainLoop\\DAV\\INode');
                 }
             }
 
@@ -187,7 +187,7 @@ class Server {
             $root = new SimpleCollection('root');
             $this->tree = new ObjectTree($root);
         } else {
-            throw new Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre\\DAV\\Tree, Sabre\\DAV\\INode, an array or null');
+            throw new Exception('Invalid argument passed to constructor. Argument must either be an instance of SabreForRainLoop\\DAV\\Tree, SabreForRainLoop\\DAV\\INode, an array or null');
         }
         $this->httpResponse = new HTTP\Response();
         $this->httpRequest = new HTTP\Request();
@@ -340,7 +340,7 @@ class Server {
     /**
      * Adds a plugin to the server
      *
-     * For more information, console the documentation of Sabre\DAV\ServerPlugin
+     * For more information, console the documentation of SabreForRainLoop\DAV\ServerPlugin
      *
      * @param ServerPlugin $plugin
      * @return void
@@ -1157,7 +1157,7 @@ class Server {
     /**
      * Returns the HTTP depth header
      *
-     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the Sabre\DAV\Server::DEPTH_INFINITY object
+     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the SabreForRainLoop\DAV\Server::DEPTH_INFINITY object
      * It is possible to supply a default depth value, which is used when the depth header has invalid content, or is completely non-existent
      *
      * @param mixed $default
@@ -1820,7 +1820,7 @@ class Server {
             ));
         }
 
-        // If the node is not an instance of Sabre\DAV\IProperties, every
+        // If the node is not an instance of SabreForRainLoop\DAV\IProperties, every
         // property is 403 Forbidden
         if (!$hasError && count($remainingProperties) && !($node instanceof IProperties)) {
             $hasError = true;
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/ServerPlugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/ServerPlugin.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/ServerPlugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/ServerPlugin.php
index b8396abaf..83cde5756 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/ServerPlugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/ServerPlugin.php
@@ -1,6 +1,6 @@
 name = $name;
         foreach($children as $child) {
 
-            if (!($child instanceof INode)) throw new Exception('Only instances of Sabre\DAV\INode are allowed to be passed in the children argument');
+            if (!($child instanceof INode)) throw new Exception('Only instances of SabreForRainLoop\DAV\INode are allowed to be passed in the children argument');
             $this->addChild($child);
 
         }
@@ -78,7 +78,7 @@ class SimpleCollection extends Collection {
      * This method makes use of the getChildren method to grab all the child nodes, and compares the name.
      * Generally its wise to override this, as this can usually be optimized
      *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+     * This method must throw SabreForRainLoop\DAV\Exception\NotFound if the node does not
      * exist.
      *
      * @param string $name
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/SimpleFile.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/SimpleFile.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/SimpleFile.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/SimpleFile.php
index 694207eec..d1b2d7e3a 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/SimpleFile.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/SimpleFile.php
@@ -1,6 +1,6 @@
 server->getPlugin('auth');
         if (is_null($authPlugin)) return null;
-        /** @var $authPlugin Sabre\DAV\Auth\Plugin */
+        /** @var $authPlugin SabreForRainLoop\DAV\Auth\Plugin */
 
         $userName = $authPlugin->getCurrentUser();
         if (!$userName) return null;
@@ -599,7 +599,7 @@ class Plugin extends DAV\ServerPlugin {
      *                                   If this is ommitted, the standard
      *                                   principal collection-set will be used.
      * @return array     This method returns an array structure similar to
-     *                  Sabre\DAV\Server::getPropertiesForPath. Returned
+     *                  SabreForRainLoop\DAV\Server::getPropertiesForPath. Returned
      *                  properties are index by a HTTP status code.
      *
      */
@@ -678,11 +678,11 @@ class Plugin extends DAV\ServerPlugin {
 
         // Automatically mapping nodes implementing IPrincipal to the
         // {DAV:}principal resourcetype.
-        $server->resourceTypeMapping['Sabre\\DAVACL\\IPrincipal'] = '{DAV:}principal';
+        $server->resourceTypeMapping['SabreForRainLoop\\DAVACL\\IPrincipal'] = '{DAV:}principal';
 
         // Mapping the group-member-set property to the HrefList property
         // class.
-        $server->propertyMap['{DAV:}group-member-set'] = 'Sabre\\DAV\\Property\\HrefList';
+        $server->propertyMap['{DAV:}group-member-set'] = 'SabreForRainLoop\\DAV\\Property\\HrefList';
 
     }
 
@@ -965,7 +965,7 @@ class Plugin extends DAV\ServerPlugin {
                 $propertyDelta['{DAV:}group-member-set']->getHrefs()
             );
         } else {
-            throw new DAV\Exception('The group-member-set property MUST be an instance of Sabre\DAV\Property\HrefList or null');
+            throw new DAV\Exception('The group-member-set property MUST be an instance of SabreForRainLoop\DAV\Property\HrefList or null');
         }
 
         if (!($node instanceof IPrincipal)) {
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Principal.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Principal.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Principal.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Principal.php
index 267100212..b2d9e9da5 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Principal.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Principal.php
@@ -1,8 +1,8 @@
 children[] = $property;
             }
         } else {
-            throw new \InvalidArgumentException('You must pass a \\Sabre\\VObject\\Component, \\Sabre\\VObject\\Property or scalar type');
+            throw new \InvalidArgumentException('You must pass a \\SabreForRainLoop\\VObject\\Component, \\SabreForRainLoop\\VObject\\Property or scalar type');
         }
 
     }
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VAlarm.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VAlarm.php
index 2f86c44fd..6951c1996 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VAlarm.php
@@ -1,7 +1,7 @@
  'Sabre\\VObject\\Component\\VEvent',
-        'VFREEBUSY' => 'Sabre\\VObject\\Component\\VFreeBusy',
-        'VJOURNAL'  => 'Sabre\\VObject\\Component\\VJournal',
-        'VTODO'     => 'Sabre\\VObject\\Component\\VTodo',
-        'VALARM'    => 'Sabre\\VObject\\Component\\VAlarm',
+        'VEVENT'    => 'SabreForRainLoop\\VObject\\Component\\VEvent',
+        'VFREEBUSY' => 'SabreForRainLoop\\VObject\\Component\\VFreeBusy',
+        'VJOURNAL'  => 'SabreForRainLoop\\VObject\\Component\\VJournal',
+        'VTODO'     => 'SabreForRainLoop\\VObject\\Component\\VTodo',
+        'VALARM'    => 'SabreForRainLoop\\VObject\\Component\\VAlarm',
     );
 
     /**
@@ -45,21 +45,21 @@ class VCalendar extends VObject\Document {
      * @var array
      */
     static public $valueMap = array(
-        'BINARY'           => 'Sabre\\VObject\\Property\\Binary',
-        'BOOLEAN'          => 'Sabre\\VObject\\Property\\Boolean',
-        'CAL-ADDRESS'      => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
-        'DATE'             => 'Sabre\\VObject\\Property\\ICalendar\\Date',
-        'DATE-TIME'        => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DURATION'         => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
-        'FLOAT'            => 'Sabre\\VObject\\Property\\Float',
-        'INTEGER'          => 'Sabre\\VObject\\Property\\Integer',
-        'PERIOD'           => 'Sabre\\VObject\\Property\\ICalendar\\Period',
-        'RECUR'            => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
-        'TEXT'             => 'Sabre\\VObject\\Property\\Text',
-        'TIME'             => 'Sabre\\VObject\\Property\\Time',
-        'UNKNOWN'          => 'Sabre\\VObject\\Property\\Unknown', // jCard / jCal-only.
-        'URI'              => 'Sabre\\VObject\\Property\\Uri',
-        'UTC-OFFSET'       => 'Sabre\\VObject\\Property\\UtcOffset',
+        'BINARY'           => 'SabreForRainLoop\\VObject\\Property\\Binary',
+        'BOOLEAN'          => 'SabreForRainLoop\\VObject\\Property\\Boolean',
+        'CAL-ADDRESS'      => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\CalAddress',
+        'DATE'             => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Date',
+        'DATE-TIME'        => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'DURATION'         => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Duration',
+        'FLOAT'            => 'SabreForRainLoop\\VObject\\Property\\Float',
+        'INTEGER'          => 'SabreForRainLoop\\VObject\\Property\\Integer',
+        'PERIOD'           => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Period',
+        'RECUR'            => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Recur',
+        'TEXT'             => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'TIME'             => 'SabreForRainLoop\\VObject\\Property\\Time',
+        'UNKNOWN'          => 'SabreForRainLoop\\VObject\\Property\\Unknown', // jCard / jCal-only.
+        'URI'              => 'SabreForRainLoop\\VObject\\Property\\Uri',
+        'UTC-OFFSET'       => 'SabreForRainLoop\\VObject\\Property\\UtcOffset',
     );
 
     /**
@@ -69,75 +69,75 @@ class VCalendar extends VObject\Document {
      */
     static public $propertyMap = array(
         // Calendar properties
-        'CALSCALE'      => 'Sabre\\VObject\\Property\\FlatText',
-        'METHOD'        => 'Sabre\\VObject\\Property\\FlatText',
-        'PRODID'        => 'Sabre\\VObject\\Property\\FlatText',
-        'VERSION'       => 'Sabre\\VObject\\Property\\FlatText',
+        'CALSCALE'      => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'METHOD'        => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'PRODID'        => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'VERSION'       => 'SabreForRainLoop\\VObject\\Property\\FlatText',
 
         // Component properties
-        'ATTACH'            => 'Sabre\\VObject\\Property\\Binary',
-        'CATEGORIES'        => 'Sabre\\VObject\\Property\\Text',
-        'CLASS'             => 'Sabre\\VObject\\Property\\FlatText',
-        'COMMENT'           => 'Sabre\\VObject\\Property\\FlatText',
-        'DESCRIPTION'       => 'Sabre\\VObject\\Property\\FlatText',
-        'GEO'               => 'Sabre\\VObject\\Property\\Float',
-        'LOCATION'          => 'Sabre\\VObject\\Property\\FlatText',
-        'PERCENT-COMPLETE'  => 'Sabre\\VObject\\Property\\Integer',
-        'PRIORITY'          => 'Sabre\\VObject\\Property\\Integer',
-        'RESOURCES'         => 'Sabre\\VObject\\Property\\Text',
-        'STATUS'            => 'Sabre\\VObject\\Property\\FlatText',
-        'SUMMARY'           => 'Sabre\\VObject\\Property\\FlatText',
+        'ATTACH'            => 'SabreForRainLoop\\VObject\\Property\\Binary',
+        'CATEGORIES'        => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'CLASS'             => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'COMMENT'           => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'DESCRIPTION'       => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'GEO'               => 'SabreForRainLoop\\VObject\\Property\\Float',
+        'LOCATION'          => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'PERCENT-COMPLETE'  => 'SabreForRainLoop\\VObject\\Property\\Integer',
+        'PRIORITY'          => 'SabreForRainLoop\\VObject\\Property\\Integer',
+        'RESOURCES'         => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'STATUS'            => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'SUMMARY'           => 'SabreForRainLoop\\VObject\\Property\\FlatText',
 
         // Date and Time Component Properties
-        'COMPLETED'     => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DTEND'         => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DUE'           => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DTSTART'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DURATION'      => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
-        'FREEBUSY'      => 'Sabre\\VObject\\Property\\ICalendar\\Period',
-        'TRANSP'        => 'Sabre\\VObject\\Property\\FlatText',
+        'COMPLETED'     => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'DTEND'         => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'DUE'           => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'DTSTART'       => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'DURATION'      => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Duration',
+        'FREEBUSY'      => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Period',
+        'TRANSP'        => 'SabreForRainLoop\\VObject\\Property\\FlatText',
 
         // Time Zone Component Properties
-        'TZID'          => 'Sabre\\VObject\\Property\\FlatText',
-        'TZNAME'        => 'Sabre\\VObject\\Property\\FlatText',
-        'TZOFFSETFROM'  => 'Sabre\\VObject\\Property\\UtcOffset',
-        'TZOFFSETTO'    => 'Sabre\\VObject\\Property\\UtcOffset',
-        'TZURL'         => 'Sabre\\VObject\\Property\\Uri',
+        'TZID'          => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'TZNAME'        => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'TZOFFSETFROM'  => 'SabreForRainLoop\\VObject\\Property\\UtcOffset',
+        'TZOFFSETTO'    => 'SabreForRainLoop\\VObject\\Property\\UtcOffset',
+        'TZURL'         => 'SabreForRainLoop\\VObject\\Property\\Uri',
 
         // Relationship Component Properties
-        'ATTENDEE'      => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
-        'CONTACT'       => 'Sabre\\VObject\\Property\\FlatText',
-        'ORGANIZER'     => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
-        'RECURRENCE-ID' => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'RELATED-TO'    => 'Sabre\\VObject\\Property\\FlatText',
-        'URL'           => 'Sabre\\VObject\\Property\\Uri',
-        'UID'           => 'Sabre\\VObject\\Property\\FlatText',
+        'ATTENDEE'      => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\CalAddress',
+        'CONTACT'       => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'ORGANIZER'     => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\CalAddress',
+        'RECURRENCE-ID' => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'RELATED-TO'    => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'URL'           => 'SabreForRainLoop\\VObject\\Property\\Uri',
+        'UID'           => 'SabreForRainLoop\\VObject\\Property\\FlatText',
 
         // Recurrence Component Properties
-        'EXDATE'        => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'RDATE'         => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'RRULE'         => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
-        'EXRULE'        => 'Sabre\\VObject\\Property\\ICalendar\\Recur', // Deprecated since rfc5545
+        'EXDATE'        => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'RDATE'         => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'RRULE'         => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Recur',
+        'EXRULE'        => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Recur', // Deprecated since rfc5545
 
         // Alarm Component Properties
-        'ACTION'        => 'Sabre\\VObject\\Property\\FlatText',
-        'REPEAT'        => 'Sabre\\VObject\\Property\\Integer',
-        'TRIGGER'       => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
+        'ACTION'        => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'REPEAT'        => 'SabreForRainLoop\\VObject\\Property\\Integer',
+        'TRIGGER'       => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Duration',
 
         // Change Management Component Properties
-        'CREATED'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DTSTAMP'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'LAST-MODIFIED' => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'SEQUENCE'      => 'Sabre\\VObject\\Property\\Integer',
+        'CREATED'       => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'DTSTAMP'       => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'LAST-MODIFIED' => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'SEQUENCE'      => 'SabreForRainLoop\\VObject\\Property\\Integer',
 
         // Request Status
-        'REQUEST-STATUS' => 'Sabre\\VObject\\Property\\Text',
+        'REQUEST-STATUS' => 'SabreForRainLoop\\VObject\\Property\\Text',
 
         // Additions from draft-daboo-valarm-extensions-04
-        'ALARM-AGENT'    => 'Sabre\\VObject\\Property\\Text',
-        'ACKNOWLEDGED'   => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'PROXIMITY'      => 'Sabre\\VObject\\Property\\Text',
-        'DEFAULT-ALARM'  => 'Sabre\\VObject\\Property\\Boolean',
+        'ALARM-AGENT'    => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'ACKNOWLEDGED'   => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'PROXIMITY'      => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'DEFAULT-ALARM'  => 'SabreForRainLoop\\VObject\\Property\\Boolean',
 
     );
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VCard.php
similarity index 63%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VCard.php
index 69eb8d4c1..e44ac3f1f 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VCard.php
@@ -1,9 +1,9 @@
  'Sabre\\VObject\\Property\\Binary',
-        'BOOLEAN'          => 'Sabre\\VObject\\Property\\Boolean',
-        'CONTENT-ID'       => 'Sabre\\VObject\\Property\\FlatText',   // vCard 2.1 only
-        'DATE'             => 'Sabre\\VObject\\Property\\VCard\\Date',
-        'DATE-TIME'        => 'Sabre\\VObject\\Property\\VCard\\DateTime',
-        'DATE-AND-OR-TIME' => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime', // vCard only
-        'FLOAT'            => 'Sabre\\VObject\\Property\\Float',
-        'INTEGER'          => 'Sabre\\VObject\\Property\\Integer',
-        'LANGUAGE-TAG'     => 'Sabre\\VObject\\Property\\VCard\\LanguageTag',
-        'TIMESTAMP'        => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
-        'TEXT'             => 'Sabre\\VObject\\Property\\Text',
-        'TIME'             => 'Sabre\\VObject\\Property\\Time',
-        'UNKNOWN'          => 'Sabre\\VObject\\Property\\Unknown', // jCard / jCal-only.
-        'URI'              => 'Sabre\\VObject\\Property\\Uri',
-        'URL'              => 'Sabre\\VObject\\Property\\Uri', // vCard 2.1 only
-        'UTC-OFFSET'       => 'Sabre\\VObject\\Property\\UtcOffset',
+        'BINARY'           => 'SabreForRainLoop\\VObject\\Property\\Binary',
+        'BOOLEAN'          => 'SabreForRainLoop\\VObject\\Property\\Boolean',
+        'CONTENT-ID'       => 'SabreForRainLoop\\VObject\\Property\\FlatText',   // vCard 2.1 only
+        'DATE'             => 'SabreForRainLoop\\VObject\\Property\\VCard\\Date',
+        'DATE-TIME'        => 'SabreForRainLoop\\VObject\\Property\\VCard\\DateTime',
+        'DATE-AND-OR-TIME' => 'SabreForRainLoop\\VObject\\Property\\VCard\\DateAndOrTime', // vCard only
+        'FLOAT'            => 'SabreForRainLoop\\VObject\\Property\\Float',
+        'INTEGER'          => 'SabreForRainLoop\\VObject\\Property\\Integer',
+        'LANGUAGE-TAG'     => 'SabreForRainLoop\\VObject\\Property\\VCard\\LanguageTag',
+        'TIMESTAMP'        => 'SabreForRainLoop\\VObject\\Property\\VCard\\TimeStamp',
+        'TEXT'             => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'TIME'             => 'SabreForRainLoop\\VObject\\Property\\Time',
+        'UNKNOWN'          => 'SabreForRainLoop\\VObject\\Property\\Unknown', // jCard / jCal-only.
+        'URI'              => 'SabreForRainLoop\\VObject\\Property\\Uri',
+        'URL'              => 'SabreForRainLoop\\VObject\\Property\\Uri', // vCard 2.1 only
+        'UTC-OFFSET'       => 'SabreForRainLoop\\VObject\\Property\\UtcOffset',
     );
 
     /**
@@ -65,53 +65,53 @@ class VCard extends VObject\Document {
     static public $propertyMap = array(
 
         // vCard 2.1 properties and up
-        'N'       => 'Sabre\\VObject\\Property\\Text',
-        'FN'      => 'Sabre\\VObject\\Property\\FlatText',
-        'PHOTO'   => 'Sabre\\VObject\\Property\\Binary', // Todo: we should add a class for Binary values.
-        'BDAY'    => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
-        'ADR'     => 'Sabre\\VObject\\Property\\Text',
-        'LABEL'   => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
-        'TEL'     => 'Sabre\\VObject\\Property\\FlatText',
-        'EMAIL'   => 'Sabre\\VObject\\Property\\FlatText',
-        'MAILER'  => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
-        'GEO'     => 'Sabre\\VObject\\Property\\FlatText',
-        'TITLE'   => 'Sabre\\VObject\\Property\\FlatText',
-        'ROLE'    => 'Sabre\\VObject\\Property\\FlatText',
-        'LOGO'    => 'Sabre\\VObject\\Property\\Binary',
-        // 'AGENT'   => 'Sabre\\VObject\\Property\\',      // Todo: is an embedded vCard. Probably rare, so
+        'N'       => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'FN'      => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'PHOTO'   => 'SabreForRainLoop\\VObject\\Property\\Binary', // Todo: we should add a class for Binary values.
+        'BDAY'    => 'SabreForRainLoop\\VObject\\Property\\VCard\\DateAndOrTime',
+        'ADR'     => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'LABEL'   => 'SabreForRainLoop\\VObject\\Property\\FlatText', // Removed in vCard 4.0
+        'TEL'     => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'EMAIL'   => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'MAILER'  => 'SabreForRainLoop\\VObject\\Property\\FlatText', // Removed in vCard 4.0
+        'GEO'     => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'TITLE'   => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'ROLE'    => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'LOGO'    => 'SabreForRainLoop\\VObject\\Property\\Binary',
+        // 'AGENT'   => 'SabreForRainLoop\\VObject\\Property\\',      // Todo: is an embedded vCard. Probably rare, so
                                  // not supported at the moment
-        'ORG'     => 'Sabre\\VObject\\Property\\Text',
-        'NOTE'    => 'Sabre\\VObject\\Property\\FlatText',
-        'REV'     => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
-        'SOUND'   => 'Sabre\\VObject\\Property\\FlatText',
-        'URL'     => 'Sabre\\VObject\\Property\\Uri',
-        'UID'     => 'Sabre\\VObject\\Property\\FlatText',
-        'VERSION' => 'Sabre\\VObject\\Property\\FlatText',
-        'KEY'     => 'Sabre\\VObject\\Property\\FlatText',
-        'TZ'      => 'Sabre\\VObject\\Property\\Text',
+        'ORG'     => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'NOTE'    => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'REV'     => 'SabreForRainLoop\\VObject\\Property\\VCard\\TimeStamp',
+        'SOUND'   => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'URL'     => 'SabreForRainLoop\\VObject\\Property\\Uri',
+        'UID'     => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'VERSION' => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'KEY'     => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'TZ'      => 'SabreForRainLoop\\VObject\\Property\\Text',
 
         // vCard 3.0 properties
-        'CATEGORIES'  => 'Sabre\\VObject\\Property\\Text',
-        'SORT-STRING' => 'Sabre\\VObject\\Property\\FlatText',
-        'PRODID'      => 'Sabre\\VObject\\Property\\FlatText',
-        'NICKNAME'    => 'Sabre\\VObject\\Property\\Text',
-        'CLASS'       => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
+        'CATEGORIES'  => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'SORT-STRING' => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'PRODID'      => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'NICKNAME'    => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'CLASS'       => 'SabreForRainLoop\\VObject\\Property\\FlatText', // Removed in vCard 4.0
 
         // rfc2739 properties
-        'FBURL'        => 'Sabre\\VObject\\Property\\Uri',
-        'CAPURI'       => 'Sabre\\VObject\\Property\\Uri',
-        'CALURI'       => 'Sabre\\VObject\\Property\\Uri',
+        'FBURL'        => 'SabreForRainLoop\\VObject\\Property\\Uri',
+        'CAPURI'       => 'SabreForRainLoop\\VObject\\Property\\Uri',
+        'CALURI'       => 'SabreForRainLoop\\VObject\\Property\\Uri',
 
         // rfc4770 properties
-        'IMPP'         => 'Sabre\\VObject\\Property\\Uri',
+        'IMPP'         => 'SabreForRainLoop\\VObject\\Property\\Uri',
 
         // vCard 4.0 properties
-        'XML'          => 'Sabre\\VObject\\Property\\FlatText',
-        'ANNIVERSARY'  => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
-        'CLIENTPIDMAP' => 'Sabre\\VObject\\Property\\Text',
-        'LANG'         => 'Sabre\\VObject\\Property\\VCard\\LanguageTag',
-        'GENDER'       => 'Sabre\\VObject\\Property\\Text',
-        'KIND'         => 'Sabre\\VObject\\Property\\FlatText',
+        'XML'          => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'ANNIVERSARY'  => 'SabreForRainLoop\\VObject\\Property\\VCard\\DateAndOrTime',
+        'CLIENTPIDMAP' => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'LANG'         => 'SabreForRainLoop\\VObject\\Property\\VCard\\LanguageTag',
+        'GENDER'       => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'KIND'         => 'SabreForRainLoop\\VObject\\Property\\FlatText',
 
     );
 
@@ -342,8 +342,8 @@ class VCard extends VObject\Document {
         $className = parent::getClassNameForPropertyName($propertyName);
         // In vCard 4, BINARY no longer exists, and we need URI instead.
 
-        if ($className == 'Sabre\\VObject\\Property\\Binary' && $this->getDocumentType()===self::VCARD40) {
-            return 'Sabre\\VObject\\Property\\Uri';
+        if ($className == 'SabreForRainLoop\\VObject\\Property\\Binary' && $this->getDocumentType()===self::VCARD40) {
+            return 'SabreForRainLoop\\VObject\\Property\\Uri';
         }
         return $className;
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VEvent.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VEvent.php
index 0ce204566..b1dc19331 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VEvent.php
@@ -1,7 +1,7 @@
 objects[] = $object;
             } else {
-                throw new \InvalidArgumentException('You can only pass strings or \\Sabre\\VObject\\Component arguments to setObjects');
+                throw new \InvalidArgumentException('You can only pass strings or \\SabreForRainLoop\\VObject\\Component arguments to setObjects');
             }
 
         }
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Node.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Node.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Node.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Node.php
index 3260a8c02..3330fceff 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Node.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Node.php
@@ -1,6 +1,6 @@
 
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Filesystem\Exception;
-
-/**
- * Exception interface for all exceptions thrown by the component.
- *
- * @author Romain Neutron 
- *
- * @api
- */
-interface ExceptionInterface
-{
-}
diff --git a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/FileNotFoundException.php b/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/FileNotFoundException.php
deleted file mode 100644
index 15533db40..000000000
--- a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/FileNotFoundException.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Filesystem\Exception;
-
-/**
- * Exception class thrown when a file couldn't be found
- *
- * @author Fabien Potencier 
- * @author Christian Gärtner 
- */
-class FileNotFoundException extends IOException
-{
-    public function __construct($message = null, $code = 0, \Exception $previous = null, $path = null)
-    {
-        if (null === $message) {
-            if (null === $path) {
-                $message = 'File could not be found.';
-            } else {
-                $message = sprintf('File "%s" could not be found.', $path);
-            }
-        }
-
-        parent::__construct($message, $code, $previous, $path);
-    }
-}
diff --git a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/IOException.php b/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/IOException.php
deleted file mode 100644
index 4b551af71..000000000
--- a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/IOException.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Filesystem\Exception;
-
-/**
- * Exception class thrown when a filesystem operation failure happens
- *
- * @author Romain Neutron 
- * @author Christian Gärtner 
- * @author Fabien Potencier 
- *
- * @api
- */
-class IOException extends \RuntimeException implements IOExceptionInterface
-{
-    private $path;
-
-    public function __construct($message, $code = 0, \Exception $previous = null, $path = null)
-    {
-        $this->path = $path;
-
-        parent::__construct($message, $code, $previous);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-}
diff --git a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php b/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php
deleted file mode 100644
index de9f3e714..000000000
--- a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Filesystem\Exception;
-
-/**
- * IOException interface for file and input/output stream releated exceptions thrown by the component.
- *
- * @author Christian Gärtner 
- */
-interface IOExceptionInterface extends ExceptionInterface
-{
-    /**
-     * Returns the associated path for the exception
-     *
-     * @return string The path.
-     */
-    public function getPath();
-}
diff --git a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Filesystem.php b/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Filesystem.php
deleted file mode 100644
index 9e45d2ba3..000000000
--- a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Filesystem.php
+++ /dev/null
@@ -1,474 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Filesystem;
-
-use Symfony\Component\Filesystem\Exception\IOException;
-use Symfony\Component\Filesystem\Exception\FileNotFoundException;
-
-/**
- * Provides basic utility to manipulate the file system.
- *
- * @author Fabien Potencier 
- */
-class Filesystem
-{
-    /**
-     * Copies a file.
-     *
-     * This method only copies the file if the origin file is newer than the target file.
-     *
-     * By default, if the target already exists, it is not overridden.
-     *
-     * @param string  $originFile The original filename
-     * @param string  $targetFile The target filename
-     * @param boolean $override   Whether to override an existing file or not
-     *
-     * @throws FileNotFoundException    When orginFile doesn't exist
-     * @throws IOException              When copy fails
-     */
-    public function copy($originFile, $targetFile, $override = false)
-    {
-        if (stream_is_local($originFile) && !is_file($originFile)) {
-            throw new FileNotFoundException(sprintf('Failed to copy "%s" because file does not exist.', $originFile), 0, null, $originFile);
-        }
-
-        $this->mkdir(dirname($targetFile));
-
-        if (!$override && is_file($targetFile)) {
-            $doCopy = filemtime($originFile) > filemtime($targetFile);
-        } else {
-            $doCopy = true;
-        }
-
-        if ($doCopy) {
-            // https://bugs.php.net/bug.php?id=64634
-            $source = fopen($originFile, 'r');
-            $target = fopen($targetFile, 'w+');
-            stream_copy_to_stream($source, $target);
-            fclose($source);
-            fclose($target);
-            unset($source, $target);
-
-            if (!is_file($targetFile)) {
-                throw new IOException(sprintf('Failed to copy "%s" to "%s".', $originFile, $targetFile), 0, null, $originFile);
-            }
-        }
-    }
-
-    /**
-     * Creates a directory recursively.
-     *
-     * @param string|array|\Traversable $dirs The directory path
-     * @param integer                   $mode The directory mode
-     *
-     * @throws IOException On any directory creation failure
-     */
-    public function mkdir($dirs, $mode = 0777)
-    {
-        foreach ($this->toIterator($dirs) as $dir) {
-            if (is_dir($dir)) {
-                continue;
-            }
-
-            if (true !== @mkdir($dir, $mode, true)) {
-                throw new IOException(sprintf('Failed to create "%s".', $dir), 0, null, $dir);
-            }
-        }
-    }
-
-    /**
-     * Checks the existence of files or directories.
-     *
-     * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to check
-     *
-     * @return Boolean true if the file exists, false otherwise
-     */
-    public function exists($files)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            if (!file_exists($file)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Sets access and modification time of file.
-     *
-     * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to create
-     * @param integer                   $time  The touch time as a unix timestamp
-     * @param integer                   $atime The access time as a unix timestamp
-     *
-     * @throws IOException When touch fails
-     */
-    public function touch($files, $time = null, $atime = null)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            $touch = $time ? @touch($file, $time, $atime) : @touch($file);
-            if (true !== $touch) {
-                throw new IOException(sprintf('Failed to touch "%s".', $file), 0, null, $file);
-            }
-        }
-    }
-
-    /**
-     * Removes files or directories.
-     *
-     * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to remove
-     *
-     * @throws IOException When removal fails
-     */
-    public function remove($files)
-    {
-        $files = iterator_to_array($this->toIterator($files));
-        $files = array_reverse($files);
-        foreach ($files as $file) {
-            if (!file_exists($file) && !is_link($file)) {
-                continue;
-            }
-
-            if (is_dir($file) && !is_link($file)) {
-                $this->remove(new \FilesystemIterator($file));
-
-                if (true !== @rmdir($file)) {
-                    throw new IOException(sprintf('Failed to remove directory "%s".', $file), 0, null, $file);
-                }
-            } else {
-                // https://bugs.php.net/bug.php?id=52176
-                if (defined('PHP_WINDOWS_VERSION_MAJOR') && is_dir($file)) {
-                    if (true !== @rmdir($file)) {
-                        throw new IOException(sprintf('Failed to remove file "%s".', $file), 0, null, $file);
-                    }
-                } else {
-                    if (true !== @unlink($file)) {
-                        throw new IOException(sprintf('Failed to remove file "%s".', $file), 0, null, $file);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Change mode for an array of files or directories.
-     *
-     * @param string|array|\Traversable $files     A filename, an array of files, or a \Traversable instance to change mode
-     * @param integer                   $mode      The new mode (octal)
-     * @param integer                   $umask     The mode mask (octal)
-     * @param Boolean                   $recursive Whether change the mod recursively or not
-     *
-     * @throws IOException When the change fail
-     */
-    public function chmod($files, $mode, $umask = 0000, $recursive = false)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            if ($recursive && is_dir($file) && !is_link($file)) {
-                $this->chmod(new \FilesystemIterator($file), $mode, $umask, true);
-            }
-            if (true !== @chmod($file, $mode & ~$umask)) {
-                throw new IOException(sprintf('Failed to chmod file "%s".', $file), 0, null, $file);
-            }
-        }
-    }
-
-    /**
-     * Change the owner of an array of files or directories
-     *
-     * @param string|array|\Traversable $files     A filename, an array of files, or a \Traversable instance to change owner
-     * @param string                    $user      The new owner user name
-     * @param Boolean                   $recursive Whether change the owner recursively or not
-     *
-     * @throws IOException When the change fail
-     */
-    public function chown($files, $user, $recursive = false)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            if ($recursive && is_dir($file) && !is_link($file)) {
-                $this->chown(new \FilesystemIterator($file), $user, true);
-            }
-            if (is_link($file) && function_exists('lchown')) {
-                if (true !== @lchown($file, $user)) {
-                    throw new IOException(sprintf('Failed to chown file "%s".', $file), 0, null, $file);
-                }
-            } else {
-                if (true !== @chown($file, $user)) {
-                    throw new IOException(sprintf('Failed to chown file "%s".', $file), 0, null, $file);
-                }
-            }
-        }
-    }
-
-    /**
-     * Change the group of an array of files or directories
-     *
-     * @param string|array|\Traversable $files     A filename, an array of files, or a \Traversable instance to change group
-     * @param string                    $group     The group name
-     * @param Boolean                   $recursive Whether change the group recursively or not
-     *
-     * @throws IOException When the change fail
-     */
-    public function chgrp($files, $group, $recursive = false)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            if ($recursive && is_dir($file) && !is_link($file)) {
-                $this->chgrp(new \FilesystemIterator($file), $group, true);
-            }
-            if (is_link($file) && function_exists('lchgrp')) {
-                if (true !== @lchgrp($file, $group)) {
-                    throw new IOException(sprintf('Failed to chgrp file "%s".', $file), 0, null, $file);
-                }
-            } else {
-                if (true !== @chgrp($file, $group)) {
-                    throw new IOException(sprintf('Failed to chgrp file "%s".', $file), 0, null, $file);
-                }
-            }
-        }
-    }
-
-    /**
-     * Renames a file or a directory.
-     *
-     * @param string  $origin    The origin filename or directory
-     * @param string  $target    The new filename or directory
-     * @param Boolean $overwrite Whether to overwrite the target if it already exists
-     *
-     * @throws IOException When target file or directory already exists
-     * @throws IOException When origin cannot be renamed
-     */
-    public function rename($origin, $target, $overwrite = false)
-    {
-        // we check that target does not exist
-        if (!$overwrite && is_readable($target)) {
-            throw new IOException(sprintf('Cannot rename because the target "%s" already exists.', $target), 0, null, $target);
-        }
-
-        if (true !== @rename($origin, $target)) {
-            throw new IOException(sprintf('Cannot rename "%s" to "%s".', $origin, $target), 0, null, $target);
-        }
-    }
-
-    /**
-     * Creates a symbolic link or copy a directory.
-     *
-     * @param string  $originDir     The origin directory path
-     * @param string  $targetDir     The symbolic link name
-     * @param Boolean $copyOnWindows Whether to copy files if on Windows
-     *
-     * @throws IOException When symlink fails
-     */
-    public function symlink($originDir, $targetDir, $copyOnWindows = false)
-    {
-        if (!function_exists('symlink') && $copyOnWindows) {
-            $this->mirror($originDir, $targetDir);
-
-            return;
-        }
-
-        $this->mkdir(dirname($targetDir));
-
-        $ok = false;
-        if (is_link($targetDir)) {
-            if (readlink($targetDir) != $originDir) {
-                $this->remove($targetDir);
-            } else {
-                $ok = true;
-            }
-        }
-
-        if (!$ok) {
-            if (true !== @symlink($originDir, $targetDir)) {
-                $report = error_get_last();
-                if (is_array($report)) {
-                    if (defined('PHP_WINDOWS_VERSION_MAJOR') && false !== strpos($report['message'], 'error code(1314)')) {
-                        throw new IOException('Unable to create symlink due to error code 1314: \'A required privilege is not held by the client\'. Do you have the required Administrator-rights?');
-                    }
-                }
-
-                throw new IOException(sprintf('Failed to create symbolic link from "%s" to "%s".', $originDir, $targetDir), 0, null, $targetDir);
-            }
-        }
-    }
-
-    /**
-     * Given an existing path, convert it to a path relative to a given starting path
-     *
-     * @param string $endPath   Absolute path of target
-     * @param string $startPath Absolute path where traversal begins
-     *
-     * @return string Path of target relative to starting path
-     */
-    public function makePathRelative($endPath, $startPath)
-    {
-        // Normalize separators on windows
-        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
-            $endPath = strtr($endPath, '\\', '/');
-            $startPath = strtr($startPath, '\\', '/');
-        }
-
-        // Split the paths into arrays
-        $startPathArr = explode('/', trim($startPath, '/'));
-        $endPathArr = explode('/', trim($endPath, '/'));
-
-        // Find for which directory the common path stops
-        $index = 0;
-        while (isset($startPathArr[$index]) && isset($endPathArr[$index]) && $startPathArr[$index] === $endPathArr[$index]) {
-            $index++;
-        }
-
-        // Determine how deep the start path is relative to the common path (ie, "web/bundles" = 2 levels)
-        $depth = count($startPathArr) - $index;
-
-        // Repeated "../" for each level need to reach the common path
-        $traverser = str_repeat('../', $depth);
-
-        $endPathRemainder = implode('/', array_slice($endPathArr, $index));
-
-        // Construct $endPath from traversing to the common path, then to the remaining $endPath
-        $relativePath = $traverser.(strlen($endPathRemainder) > 0 ? $endPathRemainder.'/' : '');
-
-        return (strlen($relativePath) === 0) ? './' : $relativePath;
-    }
-
-    /**
-     * Mirrors a directory to another.
-     *
-     * @param string       $originDir The origin directory
-     * @param string       $targetDir The target directory
-     * @param \Traversable $iterator  A Traversable instance
-     * @param array        $options   An array of boolean options
-     *                               Valid options are:
-     *                                 - $options['override'] Whether to override an existing file on copy or not (see copy())
-     *                                 - $options['copy_on_windows'] Whether to copy files instead of links on Windows (see symlink())
-     *                                 - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
-     *
-     * @throws IOException When file type is unknown
-     */
-    public function mirror($originDir, $targetDir, \Traversable $iterator = null, $options = array())
-    {
-        $targetDir = rtrim($targetDir, '/\\');
-        $originDir = rtrim($originDir, '/\\');
-
-        // Iterate in destination folder to remove obsolete entries
-        if ($this->exists($targetDir) && isset($options['delete']) && $options['delete']) {
-            $deleteIterator = $iterator;
-            if (null === $deleteIterator) {
-                $flags = \FilesystemIterator::SKIP_DOTS;
-                $deleteIterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($targetDir, $flags), \RecursiveIteratorIterator::CHILD_FIRST);
-            }
-            foreach ($deleteIterator as $file) {
-                $origin = str_replace($targetDir, $originDir, $file->getPathname());
-                if (!$this->exists($origin)) {
-                    $this->remove($file);
-                }
-            }
-        }
-
-        $copyOnWindows = false;
-        if (isset($options['copy_on_windows']) && !function_exists('symlink')) {
-            $copyOnWindows = $options['copy_on_windows'];
-        }
-
-        if (null === $iterator) {
-            $flags = $copyOnWindows ? \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS : \FilesystemIterator::SKIP_DOTS;
-            $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($originDir, $flags), \RecursiveIteratorIterator::SELF_FIRST);
-        }
-
-        foreach ($iterator as $file) {
-            $target = str_replace($originDir, $targetDir, $file->getPathname());
-
-            if ($copyOnWindows) {
-                if (is_link($file) || is_file($file)) {
-                    $this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
-                } elseif (is_dir($file)) {
-                    $this->mkdir($target);
-                } else {
-                    throw new IOException(sprintf('Unable to guess "%s" file type.', $file), 0, null, $file);
-                }
-            } else {
-                if (is_link($file)) {
-                    $this->symlink($file, $target);
-                } elseif (is_dir($file)) {
-                    $this->mkdir($target);
-                } elseif (is_file($file)) {
-                    $this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
-                } else {
-                    throw new IOException(sprintf('Unable to guess "%s" file type.', $file), 0, null, $file);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns whether the file path is an absolute path.
-     *
-     * @param string $file A file path
-     *
-     * @return Boolean
-     */
-    public function isAbsolutePath($file)
-    {
-        if (strspn($file, '/\\', 0, 1)
-            || (strlen($file) > 3 && ctype_alpha($file[0])
-                && substr($file, 1, 1) === ':'
-                && (strspn($file, '/\\', 2, 1))
-            )
-            || null !== parse_url($file, PHP_URL_SCHEME)
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Atomically dumps content into a file.
-     *
-     * @param  string  $filename The file to be written to.
-     * @param  string  $content  The data to write into the file.
-     * @param  integer $mode     The file mode (octal).
-     * @throws IOException       If the file cannot be written to.
-     */
-    public function dumpFile($filename, $content, $mode = 0666)
-    {
-        $dir = dirname($filename);
-
-        if (!is_dir($dir)) {
-            $this->mkdir($dir);
-        } elseif (!is_writable($dir)) {
-            throw new IOException(sprintf('Unable to write to the "%s" directory.', $dir), 0, null, $dir);
-        }
-
-        $tmpFile = tempnam($dir, basename($filename));
-
-        if (false === @file_put_contents($tmpFile, $content)) {
-            throw new IOException(sprintf('Failed to write file "%s".', $filename), 0, null, $filename);
-        }
-
-        $this->rename($tmpFile, $filename, true);
-        $this->chmod($filename, $mode);
-    }
-
-    /**
-     * @param mixed $files
-     *
-     * @return \Traversable
-     */
-    private function toIterator($files)
-    {
-        if (!$files instanceof \Traversable) {
-            $files = new \ArrayObject(is_array($files) ? $files : array($files));
-        }
-
-        return $files;
-    }
-}
diff --git a/rainloop/v/0.0.0/app/libraries/emogrifier/CHANGELOG.TXT b/rainloop/v/0.0.0/app/libraries/emogrifier/CHANGELOG.TXT
new file mode 100644
index 000000000..55c062e72
--- /dev/null
+++ b/rainloop/v/0.0.0/app/libraries/emogrifier/CHANGELOG.TXT
@@ -0,0 +1,73 @@
+2012-05-01
+Made removal of invisible nodes operate in a case-insensitive manner... Thanks Juha P.!
+
+2012-02-07
+Fixed some recent code introductions to use class constants rather than global constants.
+Fixed some recent code introductions to make it cleaner to read.
+
+2012-01-31
+Fixed a bug that was introduced with the 2011-12-22 revision... Thanks Sagi L. and M. Bąkowski!
+Added extraction of 
 		
@@ -89,7 +90,10 @@
 
 			if (window.$LAB && window.rainloopAppData && window.rainloopAppData['TemplatesLink'] && window.rainloopAppData['LangLink'])
 			{
-				__simplePace(10);
+				var oProgress = progressJs();
+
+				oProgress.setOptions({'theme': 'rainloop'});
+				oProgress.start().set(5);
 
 				window.$LAB
 					.script(function () {
@@ -98,7 +102,9 @@
 						];
 					})
 					.wait(function () {
-						__simplePace(20);
+
+						oProgress.set(20);
+
 						if (window.rainloopAppData['IncludeBackground']) {
 							$('#rl-bg').attr('style', 'background-image: none !important;').backstretch(
 								window.rainloopAppData['IncludeBackground'].replace('{{USER}}',
@@ -114,20 +120,20 @@
 						];
 					})
 					.wait(function () {
-						__simplePace(10);
+						oProgress.set(30);
 					})
 					.script(function () {
 						return {'src': '{{BaseAppMainScriptLink}}', 'type': 'text/javascript', 'charset': 'utf-8'};
 					})
 					.wait(function () {
-						__simplePace(20);
+						oProgress.set(50);
 					})
 					.script(function () {
 						return window.rainloopAppData['PluginsLink'] ?
 							{'src': window.rainloopAppData['PluginsLink'], 'type': 'text/javascript', 'charset': 'utf-8'} : null;
 					})
 					.wait(function () {
-						__simplePace(5);
+						oProgress.set(55);
 						__runBoot(false);
 					})
 					.script(function () {
diff --git a/rainloop/v/0.0.0/app/templates/Themes/template.less b/rainloop/v/0.0.0/app/templates/Themes/template.less
index d9e69c07a..570df86a5 100644
--- a/rainloop/v/0.0.0/app/templates/Themes/template.less
+++ b/rainloop/v/0.0.0/app/templates/Themes/template.less
@@ -59,14 +59,17 @@
 }
 
 .thm-login {
-	color: @login-color !important;
 	border: @login-border !important;
 	.thm-rgba-background-color(@login-background-color, @login-rgba-background-color);
 	.thm-linear-gradient-mixin(@login-gradient-start, @login-gradient-end);
 	.thm-border-radius(@login-border-radius);
 	.thm-box-shadow(@login-box-shadow);
+}
 
-	.legend, .checkboxSignMe, .checkboxAdditionalCodeSignMe, .g-ui-link, .social-button, .language-button {
+.thm-login-text {
+	color: @login-color !important;
+
+	.legend, .e-checkbox-icon, .g-ui-link, .social-button, .language-button {
 		color: @login-color !important;
 	}
 }
@@ -85,7 +88,7 @@
 	color: @languages-color;
 	.flag-name {
 		color: @languages-color;
-		border-bottom: 1px dashed @languages-color;
+		border-color: @languages-color;
 	}
 }
 
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
index 1dc30c7c2..40a343a09 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -5,7 +5,7 @@
 				
 				
 			

-			
+			
 				

 					

 						
 			
 			

-				Powered by RainLoop
+				Powered by RainLoop
 			

 		
 	

diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminPane.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminPane.html
index 2edd2e437..9c0845f63 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminPane.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminPane.html
@@ -5,11 +5,11 @@
 				
 				  
 				RainLoop
-				()
+				()
 				—
 				
 				  
-				()
+				()
 			
 			

 				
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
index 609f9000d..d4586d32e 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
@@ -4,10 +4,10 @@
 		

 			

 				
-				
 			

@@ -19,7 +19,7 @@
 					
 				
 				

-				

+				

 					

 						
 						  
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html
index 378b1cda3..23d724312 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html
@@ -29,7 +29,7 @@
 		

 	

 	

-	
    
+	
      
 		
    • 
 			
@@ -44,7 +44,7 @@
 		
      • 
 	
    
 	
    
-	
    
+	
    
 		
    
 			
    
 
@@ -126,6 +126,50 @@
 			
    
 
 
    
+	
    
+		
+		
    
+			
    
+		
    
+	
    
+	
    
+		
+		
    
+			
    
+		
    
+	
    
+	
    
+		
+		
    
+			
    
+		
    
+	
    
 	
    
 		
 		
    
@@ -144,7 +188,7 @@
 
    
 
 			
    
-			
    
+			
    
 
 
    
 	
    
@@ -185,7 +229,7 @@
 		
    
 	
    
 
-	
    
+	
    
 		
    
 	
    
 
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
index e35ab6465..a6bac5d5d 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
@@ -26,9 +26,16 @@
 		
    
 			
 			
    
-				
-				
    
+				
    
 			
    
 		
    
 		
    
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
index 386773892..ddd69856f 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
@@ -15,7 +15,7 @@
 					
 						
 					
-					
+					
 					  
 					
    
 						
 					
-					
+					
 					  
 					
    
+				
    
 			
    
 		
    
 
 	  
-	
+	
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html
index 349d3197d..b275485c8 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html
@@ -2,6 +2,6 @@
 	
 
 	  
-	
+	
 
 
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
index 82e9db65b..cbd3dcc48 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
@@ -1,10 +1,10 @@
-

 				

-				
 

-				

+				
 

+				

 					
 						
@@ -50,64 +50,66 @@
 						
 					
 				

-				
 

-				

+				
 

+				

 					
 						
 					
 					

+						
+						
-						
-						
+						
-