3 files changed, 119 insertions, 183 deletions
diff --git a/mail/rainloop/Makefile b/mail/rainloop/Makefile
index e5b639b7e0f1..88275cefa064 100644
--- a/mail/rainloop/Makefile
+++ b/mail/rainloop/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rainloop
-PORTVERSION=	1.7.2
-PORTREVISION=	1
+PORTVERSION=	1.8.0
 CATEGORIES?=	mail www
 MASTER_SITES=	SF/${PORTNAME}-webmail/
 
@@ -19,7 +18,7 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 WANT_PHP_WEB=	yes
 USE_PHP=	curl iconv json xml dom openssl pcre spl zlib
-RVER=		1.7.2.220
+RVER=		1.8.0.250
 PLIST_SUB=	VER="${RVER}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 # @TODO: PDO also for different backends
 
diff --git a/mail/rainloop/distinfo b/mail/rainloop/distinfo
index 6c6442942ddd..22cf20e93933 100644
--- a/mail/rainloop/distinfo
+++ b/mail/rainloop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rainloop-1.7.2.zip) = 8025922c7a7ac52a044c1a662416f42c84f32fde5cc0bd5bfe666f0faca3c0ab
-SIZE (rainloop-1.7.2.zip) = 4897740
+SHA256 (rainloop-1.8.0.zip) = 3ae6e1260d4b3e44046860b70fd7313cbcd15316107ba60fa02f604c4c20aa8d
+SIZE (rainloop-1.8.0.zip) = 4795462
diff --git a/mail/rainloop/pkg-plist b/mail/rainloop/pkg-plist
index a23f3d80b2a1..4c5b25960adf 100644
--- a/mail/rainloop/pkg-plist
+++ b/mail/rainloop/pkg-plist
@@ -6,6 +6,7 @@
 @owner root
 @group wheel
 %%WWWDIR%%/index.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/domains/default.ini.dist
 %%WWWDIR%%/rainloop/v/%%VER%%/app/domains/disabled
 %%WWWDIR%%/rainloop/v/%%VER%%/app/domains/gmail.com.ini
 %%WWWDIR%%/rainloop/v/%%VER%%/app/domains/outlook.com.ini
@@ -263,6 +264,7 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/MailSo/Mime/Email.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/MailSo/Mime/EmailCollection.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/MailSo/Mime/Enumerations/Constants.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/MailSo/Mime/Enumerations/DkimStatus.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/MailSo/Mime/Enumerations/Header.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/MailSo/Mime/Enumerations/MessagePriority.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/MailSo/Mime/Enumerations/MimeType.php
@@ -334,6 +336,79 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/PHPThumb/PHPThumb.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/PHPThumb/PluginInterface.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/PHPThumb/Plugins/Reflection.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Actions.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Api.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Common/BackwardCapability/Account.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Common/MbStringFix.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Common/PdoAbstract.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Common/RainLoopFacebookRedirectLoginHelper.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Config/AbstractConfig.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Config/Application.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Config/Plugin.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Enumerations/Capa.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Enumerations/Layout.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Enumerations/PluginPropertyType.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Enumerations/SignMeType.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Enumerations/TimeFormat.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Enumerations/UploadClientError.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Enumerations/UploadError.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Exceptions/ClientException.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Exceptions/Exception.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Exceptions/InvalidArgumentException.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Exceptions/RuntimeException.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/KeyPathHelper.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Model/Account.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Model/Domain.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Model/Identity.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Notifications.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Plugins/AbstractPlugin.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Plugins/Helper.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Plugins/Manager.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Plugins/Property.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/AbstractProvider.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/AddressBook.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/AddressBook/Classes/Tag.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/ChangePassword.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/ChangePassword/ChangePasswordInterface.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Domain.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Domain/DomainAdminInterface.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Domain/DomainInterface.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Files.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Files/DefaultStorage.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Files/FilesInterface.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Filters.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Filters/Classes/Filter.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Filters/Classes/FilterCondition.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Filters/Enumerations/ActionType.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionField.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionType.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionsType.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Filters/FiltersInterface.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Settings.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Settings/SettingsInterface.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Storage.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Storage/DefaultStorage.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Storage/Enumerations/StorageType.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Storage/StorageInterface.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Suggestions.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Suggestions/SuggestionsInterface.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/TwoFactorAuth.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/TwoFactorAuth/AbstractTwoFactorAuth.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/TwoFactorAuth/GoogleTwoFactorAuth.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/TwoFactorAuth/TwoFactorAuthInterface.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Service.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/ServiceActions.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Settings.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Social.php
+%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Utils.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/Sabre/CalDAV/Backend/AbstractBackend.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/Sabre/CalDAV/Backend/BackendInterface.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/Sabre/CalDAV/Backend/NotificationSupport.php
@@ -645,80 +720,6 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/resources/images/services/ted.com.png
 %%WWWDIR%%/rainloop/v/%%VER%%/app/resources/images/services/twitter.com.png
 %%WWWDIR%%/rainloop/v/%%VER%%/app/resources/images/services/youtube.com.png
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Actions.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Api.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Common/BackwardCapability/Account.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Common/MbStringFix.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Common/PdoAbstract.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Common/RainLoopFacebookRedirectLoginHelper.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Config/AbstractConfig.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Config/Application.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Config/Plugin.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Enumerations/Capa.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Enumerations/InterfaceAnimation.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Enumerations/Layout.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Enumerations/PluginPropertyType.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Enumerations/SignMeType.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Enumerations/TimeFormat.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Enumerations/UploadClientError.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Enumerations/UploadError.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Exceptions/ClientException.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Exceptions/Exception.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Exceptions/InvalidArgumentException.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Exceptions/RuntimeException.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/KeyPathHelper.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Model/Account.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Model/Domain.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Model/Identity.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Notifications.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Plugins/AbstractPlugin.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Plugins/Helper.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Plugins/Manager.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Plugins/Property.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/AbstractProvider.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/AddressBook.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/AddressBook/AddressBookInterface.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/AddressBook/Classes/Contact.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/AddressBook/Classes/Property.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/AddressBook/Classes/Tag.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/AddressBook/PdoAddressBook.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/ChangePassword.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/ChangePassword/ChangePasswordInterface.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Domain.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Domain/DefaultDomain.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Domain/DomainAdminInterface.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Domain/DomainInterface.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Files.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Files/DefaultStorage.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Files/FilesInterface.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Filters.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Filters/Classes/Filter.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Filters/Classes/FilterCondition.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Filters/Enumerations/ActionType.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Filters/Enumerations/ConditionField.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Filters/Enumerations/ConditionType.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Filters/Enumerations/FilterRulesType.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Filters/FiltersInterface.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Filters/SieveStorage.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Settings.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Settings/DefaultSettings.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Settings/SettingsInterface.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Storage.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Storage/DefaultStorage.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Storage/Enumerations/StorageType.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Storage/StorageInterface.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Suggestions.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/Suggestions/SuggestionsInterface.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/TwoFactorAuth.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/TwoFactorAuth/AbstractTwoFactorAuth.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/TwoFactorAuth/GoogleTwoFactorAuth.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Providers/TwoFactorAuth/TwoFactorAuthInterface.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Service.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/ServiceActions.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Settings.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Social.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/src/RainLoop/Utils.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/BadBrowser.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Error.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Index.html
@@ -760,7 +761,6 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Components/TextArea.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/About.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/ComposeAttachment.html
-%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/ComposeAttachmentInProcess.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/Login.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/MailFolderList.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/MailFolderListItem.html
@@ -790,9 +790,12 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsContacts.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsCustom.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFilters.html
-%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFiltersActionNoValue.html
-%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFiltersActionValueAsFolders.html
-%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFiltersActionWithValue.html
+%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFiltersActionDiscard.html
+%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFiltersActionForward.html
+%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
+%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFiltersActionNone.html
+%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFiltersActionReject.html
+%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFiltersActionVacation.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFiltersConditionDefault.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFolderItem.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsFolders.html
@@ -807,6 +810,7 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SettingsThemes.html
 %%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/User/SystemDropDown.html
 %%WWWDIR%%/rainloop/v/%%VER%%/check.php
+%%WWWDIR%%/rainloop/v/%%VER%%/include.php
 %%WWWDIR%%/rainloop/v/%%VER%%/index.php
 %%WWWDIR%%/rainloop/v/%%VER%%/index.php.root
 %%WWWDIR%%/rainloop/v/%%VER%%/langs/bg.ini
@@ -845,7 +849,6 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/adapters/jquery.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/build-config.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/ckeditor.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/ckeditor.orig.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/config.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/contents.css
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/lang/af.js
@@ -917,79 +920,10 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/base64image/LICENSE.md
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/base64image/README.md
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/base64image/dialogs/base64image.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/icons/bidiltr.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/icons/bidirtl.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/icons/hidpi/bidiltr.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/icons/hidpi/bidirtl.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/af.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/ar.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/bg.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/bn.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/bs.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/ca.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/cs.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/cy.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/da.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/de.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/el.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/en-au.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/en-ca.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/en-gb.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/en.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/eo.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/es.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/et.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/eu.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/fa.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/fi.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/fo.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/fr-ca.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/fr.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/gl.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/gu.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/he.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/hi.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/hr.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/hu.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/id.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/is.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/it.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/ja.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/ka.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/km.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/ko.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/ku.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/lt.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/lv.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/mk.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/mn.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/ms.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/nb.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/nl.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/no.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/pl.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/pt-br.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/pt.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/ro.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/ru.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/si.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/sk.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/sl.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/sq.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/sr-latn.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/sr.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/sv.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/th.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/tr.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/tt.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/ug.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/uk.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/vi.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/zh-cn.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/lang/zh.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/bidi/plugin.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/clipboard/dialogs/paste.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/dialog/dialogDefinition.js
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/fastimage/dialogs/fastimage.js
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/fastimage/images/noimage.png
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/icons.png
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/icons_hidpi.png
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/image/dialogs/image.js
@@ -1006,6 +940,8 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/plain/icons/plain-rtl.png
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/plain/icons/plain.png
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/plain/plugin.js
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/table/dialogs/table.js
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/tabletools/dialogs/tableCell.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/plugins/widget/images/handle.png
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/ajax.html
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/api.html
@@ -1026,15 +962,12 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/dialog/dialog.html
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/divarea/divarea.html
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/enterkey/enterkey.html
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/htmlwriter/outputforflash.html
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/htmlwriter/outputhtml.html
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/image2/assets/image1.jpg
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/image2/assets/image2.jpg
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/image2/image2.html
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/quicktable/quicktable.html
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/sharedspace/sharedspace.html
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/tableresize/tableresize.html
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/plugins/toolbar/toolbar.html
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/readonly.html
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/replacebyclass.html
@@ -1046,29 +979,33 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/uicolor.html
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/uilanguages.html
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/samples/xhtmlstyle.html
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/dialog.css
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/dialog_ie.css
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/dialog_ie7.css
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/dialog_ie8.css
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/dialog_iequirks.css
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/editor.css
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/editor_gecko.css
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/editor_ie.css
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/editor_ie7.css
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/editor_ie8.css
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/editor_iequirks.css
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/icons.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/icons_hidpi.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/images/arrow.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/images/close.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/images/hidpi/close.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/images/hidpi/lock-open.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/images/hidpi/lock.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/images/hidpi/refresh.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/images/lock-open.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/images/lock.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/images/refresh.png
-%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/moono/readme.md
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/bold.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/dialog.css
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/dialog_ie.css
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/dialog_ie7.css
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/dialog_ie8.css
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/dialog_iequirks.css
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/dialog_opera.css
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/editor.css
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/editor_gecko.css
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/editor_ie.css
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/editor_ie7.css
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/editor_ie8.css
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/editor_iequirks.css
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/find-rtl.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/icons.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/icons_hidpi.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/images/arrow.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/images/close.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/images/hidpi/close.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/images/hidpi/lock-open.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/images/hidpi/lock.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/images/hidpi/refresh.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/images/lock-open.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/images/lock.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/images/refresh.png
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/readme.md
+%%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/skins/icy_orange/scayt.png
 %%WWWDIR%%/rainloop/v/%%VER%%/static/ckeditor/styles.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/css/app.css
 %%WWWDIR%%/rainloop/v/%%VER%%/static/css/app.min.css