diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index be30b0b52..9776c268c 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -8,6 +8,7 @@ title = "SnappyMail Webmail"
; Text displayed on startup
loading_description = "SnappyMail"
favicon_url = ""
+app_path = ""
; Theme used by default
theme = "Default"
@@ -55,7 +56,6 @@ suggestions_limit = 30
; Enable CSRF protection (http://en.wikipedia.org/wiki/Cross-site_request_forgery)
csrf_protection = On
custom_server_signature = "SnappyMail"
-x_frame_options_header = "DENY"
x_xss_protection_header = "1; mode=block"
openpgp = Off
@@ -97,8 +97,6 @@ client_cert = ""
[capa]
quota = On
-search = On
-search_adv = On
dangerous_actions = On
message_actions = On
attachments_actions = On
@@ -110,7 +108,6 @@ default_domain = ""
allow_languages_on_login = On
determine_user_language = On
determine_user_domain = Off
-hide_submit_button = On
login_lowercase = On
; This option allows webmail to remember the logged in user
@@ -281,7 +278,6 @@ mail_func_additional_parameters = Off
folders_spec_limit = 50
curl_proxy = ""
curl_proxy_auth = ""
-in_iframe = Off
force_https = Off
custom_login_link = ""
custom_logout_link = ""
@@ -302,5 +298,5 @@ dev_email = ""
dev_password = ""
[version]
-current = "2.18.2"
-saved = "Fri, 04 Mar 2022 08:55:26 +0000"
+current = "2.18.3"
+saved = "Fri, 30 Sep 2022 12:34:56 +0000"
diff --git a/README.md b/README.md
index 15148c9b7..4985ede92 100644
--- a/README.md
+++ b/README.md
@@ -140,26 +140,26 @@ RainLoop 1.17 vs SnappyMail
|js/* |RainLoop |Snappy |
|--------------- |--------: |--------: |
-|admin.js |2.170.153 | 81.141 |
-|app.js |4.207.787 | 408.381 |
+|admin.js |2.170.153 | 80.884 |
+|app.js |4.207.787 | 402.446 |
|boot.js | 868.735 | 2.050 |
-|libs.js | 658.812 | 194.433 |
+|libs.js | 658.812 | 195.228 |
|sieve.js | 0 | 86.183 |
|polyfills.js | 334.608 | 0 |
|serviceworker.js | 0 | 285 |
-|TOTAL |8.240.095 | 772.473 |
+|TOTAL |8.240.095 | 767.076 |
|js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli |
|--------------- |--------: |--------: |------: |------: |--------: |--------: |
-|admin.min.js | 256.831 | 40.303 | 73.606 | 13.472 | 60.877 | 12.053 |
-|app.min.js | 515.367 | 189.969 |139.456 | 62.331 |110.485 | 53.607 |
+|admin.min.js | 256.831 | 40.146 | 73.606 | 13.410 | 60.877 | 12.018 |
+|app.min.js | 515.367 | 186.480 |139.456 | 61.516 |110.485 | 52.849 |
|boot.min.js | 84.659 | 1.252 | 26.998 | 778 | 23.643 | 628 |
-|libs.min.js | 584.772 | 92.953 |180.901 | 34.365 |155.182 | 30.882 |
+|libs.min.js | 584.772 | 93.444 |180.901 | 34.510 |155.182 | 30.966 |
|sieve.min.js | 0 | 41.961 | 0 | 10.493 | 0 | 9.462 |
|polyfills.min.js | 32.837 | 0 | 11.406 | 0 | 10.175 | 0 |
-|TOTAL user |1.217.635 | 284.174 |358.761 | 97.474 |299.485 | 85.117 |
-|TOTAL user+sieve |1.217.635 | 326.135 |358.761 |107.967 |299.485 | 94.579 |
-|TOTAL admin | 959.099 | 134.508 |292.911 | 48.615 |249.877 | 43.563 |
+|TOTAL user |1.217.635 | 281.176 |358.761 | 96.804 |299.485 | 84.443 |
+|TOTAL user+sieve |1.217.635 | 323.137 |358.761 |107.297 |299.485 | 93.905 |
+|TOTAL admin | 959.099 | 134.842 |292.911 | 48.698 |249.877 | 43.612 |
For a user its around 70% smaller and faster than traditional RainLoop.
@@ -187,12 +187,12 @@ For a user its around 70% smaller and faster than traditional RainLoop.
|css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli |
|------------ |-------: |------: |------: |------: |--------: |
-|app.css | 340.331 | 81.495 | 46.946 | 16.892 | 14.522 |
-|app.min.css | 274.947 | 65.432 | 39.647 | 15.014 | 13.129 |
+|app.css | 340.331 | 81.450 | 46.946 | 16.867 | 14.493 |
+|app.min.css | 274.947 | 65.395 | 39.647 | 14.975 | 13.106 |
|boot.css | | 1.326 | | 664 | 545 |
|boot.min.css | | 1.071 | | 590 | 474 |
-|admin.css | | 29.828 | | 6.788 | 5.889 |
-|admin.min.css | | 23.960 | | 6.148 | 5.393 |
+|admin.css | | 29.949 | | 6.793 | 5.898 |
+|admin.min.css | | 24.073 | | 6.157 | 5.414 |
### PGP
RainLoop uses the old OpenPGP.js v2
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index b657b8e95..66068fd1c 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail 2.18.2.
+This app packages SnappyMail 2.18.3.
SnappyMail is a simple, modern, lightweight & fast web-based email client.
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 23956d9d1..289564c4d 100644
--- a/integrations/cloudron/Dockerfile
+++ b/integrations/cloudron/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
WORKDIR /app/code
# If you change the extraction below, be sure to test on scaleway
-VERSION=2.18.2
+VERSION=2.18.3
RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
unzip /tmp/snappymail.zip -d /app/code && \
rm /tmp/snappymail.zip && \
diff --git a/integrations/nextcloud/snappymail/VERSION b/integrations/nextcloud/snappymail/VERSION
index e9187f6ee..826347705 100755
--- a/integrations/nextcloud/snappymail/VERSION
+++ b/integrations/nextcloud/snappymail/VERSION
@@ -1 +1 @@
-2.18.2
\ No newline at end of file
+2.18.3
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index ed82415cb..fc96964af 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -4,7 +4,7 @@
SnappyMail
SnappyMail Webmail
Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "SnappyMail webmail" section. There, click on the link to go to the SnappyMail admin panel. The default user/password is admin/12345. This version is based on SnappyMail 2.6.0 (2021-07).
- 2.18.2
+ 2.18.3
agpl
SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli
SnappyMail
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index 002fa0a71..1394609f7 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -20,7 +20,7 @@ return "SnappyMail Webmail is a browser-based multilingual IMAP client with an a
# script_snappymail_versions()
sub script_snappymail_versions
{
-return ( "2.18.2" );
+return ( "2.18.3" );
}
sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 4b42d9046..9ada57d54 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"title": "SnappyMail",
"description": "Simple, modern & fast web-based email client",
"private": true,
- "version": "2.18.2",
+ "version": "2.18.3",
"homepage": "https://snappymail.eu",
"author": {
"name": "DJ Maze",
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
index 3733f9b46..e2c35b7a1 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -247,7 +247,7 @@ abstract class Service
$CSP = new \SnappyMail\HTTP\CSP(\trim(Api::Config()->Get('security', 'content_security_policy', '')));
$CSP->report = Api::Config()->Get('security', 'csp_report', false);
$CSP->report_only = Api::Config()->Get('debug', 'enable', false); // '0.0.0' === APP_VERSION
-// $CSP->frame = \explode(' ', Api::Config()->Get('security', 'csp_iframe', ''));
+// $CSP->frame = \explode(' ', Api::Config()->Get('security', 'csp_frame', ''));
// Allow https: due to remote images in e-mails or use proxy
if (!Api::Config()->Get('security', 'use_local_proxy_for_external_images', '')) {
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
index cfe2254ad..8aff41d61 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@@ -454,7 +454,7 @@
"HELP_SHOW_HIDE_FOLDER": "Toon\/verberg map",
"HELP_CHECK_FOR_NEW_MESSAGES": "Controleer wel of niet op nieuwe berichten",
"HIDE_UNSUBSCRIBED": "Verberg niet geabonneerde mappen",
- "UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
+ "UNHIDE_KOLAB_FOLDERS": "Toon Kolab mappen",
"TYPE_CALENDAR": "Kalender",
"TYPE_CONFIGURATION": "Configuratie",
"TYPE_CONTACTS": "Contacten",
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 6a158d05e..452af6905 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -221,7 +221,7 @@