diff --git a/.docker/release/Dockerfile b/.docker/release/Dockerfile index 97757bb44..0e6473191 100644 --- a/.docker/release/Dockerfile +++ b/.docker/release/Dockerfile @@ -1,51 +1,192 @@ +# syntax=docker/dockerfile:1 + +FROM alpine:3.24.3 AS builder +RUN apk add --no-cache php85 php85-json php-phar php-zip +RUN apk add --no-cache npm +RUN npm install -g gulp yarn +WORKDIR /source +COPY package.json yarn.lock ./ +RUN yarn install +COPY . . +# Patch release.php with hotfix from: https://github.com/xgbstar1/snappymail-docker/blob/main/Dockerfile, so that release.php doesn't fail with error +RUN sed -i 's_^if.*rename.*snappymail.v.0.0.0.*$_if (!!system("mv snappymail/v/0.0.0 snappymail/v/{$package->version}")) {_' cli/release.php || true +RUN php release.php +RUN set -eux; \ + VERSION=$( ls build/dist/releases/webmail ); \ + ls -al build/dist/releases/webmail/$VERSION/snappymail-$VERSION.tar.gz; \ + mkdir -p /snappymail; \ + tar -zxvf build/dist/releases/webmail/$VERSION/snappymail-$VERSION.tar.gz -C /snappymail; \ + find /snappymail -type d -exec chmod 550 {} \; ; \ + find /snappymail -type f -exec chmod 440 {} \; ; \ + find /snappymail/data -type d -exec chmod 750 {} \; ; \ + # Remove unneeded files + rm -v /snappymail/README.md /snappymail/_include.php + # Inspired by the original Rainloop dockerfile from youtous on GitLab -FROM php:8.1-fpm-bullseye +FROM php:8.5-fpm-alpine AS final -ARG FILES_ZIP - - - -LABEL org.label-schema.description="SnappyMail webmail client image using nginx, php-fpm based on Debian Buster" - -ENV UID=991 GID=991 UPLOAD_MAX_SIZE=25M LOG_TO_STDERR=true MEMORY_LIMIT=128M SECURE_COOKIES=true -ENV fpm.pool.clear_env=false +LABEL org.label-schema.description="SnappyMail webmail client image using nginx, php-fpm on Alpine" # Install dependencies such as nginx -RUN mkdir -p /usr/share/man/man1/ /usr/share/man/man3/ /usr/share/man/man7/ && \ - apt-get update -q --fix-missing && \ - apt-get -y upgrade && \ - apt-get install --no-install-recommends -y \ - apt-transport-https gnupg openssl wget curl ca-certificates nginx supervisor sudo \ - unzip libzip-dev libxml2-dev libldb-dev libldap2-dev \ - sqlite3 libsqlite3-dev libsqlite3-0 libpq-dev postgresql-client mariadb-client logrotate \ - zip mlocate libpcre3-dev libicu-dev \ - build-essential chrpath libssl-dev \ - libxft-dev libfreetype6 libfreetype6-dev \ - libpng-dev libjpeg62-turbo-dev \ - libfontconfig1 libfontconfig1-dev \ - && \ - rm -rf /var/lib/apt/lists/* +RUN apk add --no-cache ca-certificates nginx supervisor bash # Install PHP extensions -RUN php -m && \ - docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ && \ - docker-php-ext-configure intl && \ - docker-php-ext-configure gd --with-freetype --with-jpeg && \ - docker-php-ext-install ldap opcache pdo_mysql pdo_pgsql zip intl gd && \ - php -m +# apcu +RUN set -eux; \ + apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \ + pecl install apcu; \ + docker-php-ext-enable apcu; \ + docker-php-source delete; \ + apk del .build-dependencies; + +# gd +RUN set -eux; \ + apk add --no-cache freetype libjpeg-turbo libpng; \ + apk add --no-cache --virtual .deps freetype-dev libjpeg-turbo-dev libpng-dev; \ + docker-php-ext-configure gd --with-freetype --with-jpeg; \ + docker-php-ext-install gd; \ + apk del .deps + +# gmagick +# RUN set -eux; \ +# apk add --no-cache graphicsmagick libgomp; \ +# apk add --no-cache --virtual .deps graphicsmagick-dev libtool; \ +# apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \ +# pecl install gmagick-2.0.6RC1; \ +# docker-php-ext-enable gmagick; \ +# docker-php-source delete; \ +# apk del .build-dependencies; \ +# apk del .deps + +# gnupg +RUN set -eux; \ + apk add --no-cache gnupg gpgme; \ + apk add --no-cache --virtual .deps gpgme-dev; \ + apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \ + pecl install gnupg; \ + docker-php-ext-enable gnupg; \ + docker-php-source delete; \ + apk del .build-dependencies; \ + apk del .deps + +# imagick +RUN set -eux; \ + apk add --no-cache imagemagick libgomp; \ + apk add --no-cache --virtual .deps imagemagick-dev; \ + apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \ + echo | pecl install imagick; \ + docker-php-ext-enable imagick; \ + docker-php-source delete; \ + apk del .build-dependencies; \ + apk del .deps + +# intl +RUN set -eux; \ + apk add --no-cache icu-libs; \ + apk add --no-cache --virtual .deps icu-dev; \ + docker-php-ext-configure intl; \ + docker-php-ext-install intl; \ + apk del .deps + +# ldap +RUN set -eux; \ + apk add --no-cache libldap; \ + apk add --no-cache --virtual .deps openldap-dev; \ + docker-php-ext-configure ldap; \ + docker-php-ext-install ldap; \ + apk del .deps + +# mysql +RUN docker-php-ext-install pdo_mysql + +# postgres +RUN set -eux; \ + apk add --no-cache postgresql-libs; \ + apk add --no-cache --virtual .deps postgresql-dev; \ + docker-php-ext-install pdo_pgsql; \ + apk del .deps + +# redis +RUN set -eux; \ + apk add --no-cache liblzf zstd-libs; \ + apk add --no-cache --virtual .deps zstd-dev; \ + apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \ + pecl install igbinary; \ + docker-php-ext-enable igbinary; \ + pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-lzf="yes" enable-redis-zstd="yes"' redis; \ + docker-php-ext-enable redis; \ + docker-php-source delete; \ + apk del .build-dependencies; \ + apk del .deps + +# sqlite +RUN set -eux; \ + apk add --no-cache sqlite-libs; \ + apk add --no-cache --virtual .deps sqlite-dev; \ + docker-php-ext-install pdo_sqlite; \ + apk del .deps + +# tidy +RUN set -eux; \ + apk add --no-cache tidyhtml; \ + apk add --no-cache --virtual .deps tidyhtml-dev; \ + docker-php-ext-install tidy; \ + apk del .deps + +# uuid +RUN set -eux; \ + apk add --no-cache libuuid; \ + apk add --no-cache --virtual .deps util-linux-dev; \ + apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \ + pecl install uuid; \ + docker-php-ext-enable uuid; \ + docker-php-source delete; \ + apk del .build-dependencies; \ + apk del .deps + +# xxtea - Manually install php8 compatible version from https://github.com/xxtea/xxtea-pecl master branch +RUN set -eux; \ + apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \ + wget -q https://github.com/xxtea/xxtea-pecl/tarball/3f5888a29045e12301254151737c5dab4523a1c1 -O xxtea.tar; \ + echo '9cbfd9c27255767deb26ddedf69e738d401d88ac9762d82c8510f9768842ca18 xxtea.tar' | sha256sum -c -; \ + tar -C /usr/src -xvf xxtea.tar; \ + cd /usr/src/xxtea-xxtea-pecl-3f5888a; \ + phpize; \ + ./configure --with-php-config=/usr/local/bin/php-config --enable-xxtea=yes; \ + make install; \ + docker-php-ext-enable xxtea; \ + cd -; \ + rm -fv xxtea.tar; \ + rm -rfv /usr/src/xxtea*; \ + apk del .build-dependencies; + +# zip +RUN set -eux; \ + apk add --no-cache libzip; \ + apk add --no-cache --virtual .deps libzip-dev; \ + docker-php-ext-install zip; \ + apk del .deps # Install snappymail -WORKDIR /tmp -COPY ${FILES_ZIP} . -RUN mkdir /snappymail && \ - unzip -q ${FILES_ZIP} -d /snappymail && \ - find /snappymail -type d -exec chmod 755 {} \; && \ - find /snappymail -type f -exec chmod 644 {} \; && \ - rm -rf ${FILES_ZIP} +# The 'www-data' user/group in alpine is 82:82. The 'nginx' user/group in alpine is 101:101, and is part of www-data group +COPY --chown=www-data:www-data --from=builder /snappymail /snappymail +# Use a custom snappymail data folder +RUN mv -v /snappymail/data /var/lib/snappymail; +# Setup configs +COPY --chown=root:root .docker/release/files / +RUN set -eux; \ + chown www-data:www-data /snappymail/include.php; \ + chmod 440 /snappymail/include.php; \ + chmod +x /entrypoint.sh; \ + # Disable the built-in php-fpm configs, since we're using our own config + mv -v /usr/local/etc/php-fpm.d/docker.conf /usr/local/etc/php-fpm.d/docker.conf.disabled; \ + mv -v /usr/local/etc/php-fpm.d/www.conf /usr/local/etc/php-fpm.d/www.conf.disabled; \ + mv -v /usr/local/etc/php-fpm.d/zz-docker.conf /usr/local/etc/php-fpm.d/zz-docker.conf.disabled; -# Install other content -COPY files / -RUN chmod +x /entrypoint.sh && chmod +x /logrotate-loop.sh -VOLUME /snappymail/data +USER root +WORKDIR /snappymail +VOLUME /var/lib/snappymail EXPOSE 8888 +EXPOSE 9000 +ENTRYPOINT [] CMD ["/entrypoint.sh"] diff --git a/.docker/release/files/entrypoint.sh b/.docker/release/files/entrypoint.sh old mode 100644 new mode 100755 index eed82bf5b..c0ed7df0c --- a/.docker/release/files/entrypoint.sh +++ b/.docker/release/files/entrypoint.sh @@ -1,23 +1,26 @@ #!/bin/sh +set -eu -# Create not root user -groupadd --gid "$GID" php-cli -f -adduser --uid "$UID" --disabled-password --gid "$GID" --shell /bin/bash --home /home/php-cli php-cli --force --gecos "" +DEBUG=${DEBUG:-} +if [ "$DEBUG" = 'true' ]; then + set -x +fi +UPLOAD_MAX_SIZE=${UPLOAD_MAX_SIZE:-25M} +MEMORY_LIMIT=${MEMORY_LIMIT:-128M} +SECURE_COOKIES=${SECURE_COOKIES:-true} +# Disable listening on ipv6 for ipv4-only environments, or nginx will fail to start +if ! ip a | grep 'inet6 ' > /dev/null; then + echo "[INFO] ipv6 is disabled. Configuring nginx to not listen on ipv6" + sed -i '/listen \[::\]:/d' /etc/nginx/nginx.conf +fi # Set attachment size limit sed -i "s//$UPLOAD_MAX_SIZE/g" /usr/local/etc/php-fpm.d/php-fpm.conf /etc/nginx/nginx.conf sed -i "s//$MEMORY_LIMIT/g" /usr/local/etc/php-fpm.d/php-fpm.conf -# Set log output to STDERR if wanted (LOG_TO_STDERR=true) -if [ "$LOG_TO_STDERR" = true ]; then - echo "[INFO] Logging to stderr activated" - sed -i "s/.*error_log.*$/error_log \/dev\/stderr warn;/" /etc/nginx/nginx.conf - sed -i "s/.*error_log.*$/php_admin_value[error_log] = \/dev\/stderr/" /usr/local/etc/php-fpm.d/php-fpm.conf -fi - # Secure cookies -if [ "${SECURE_COOKIES}" = true ]; then +if [ "${SECURE_COOKIES}" = 'true' ]; then echo "[INFO] Secure cookies activated" { echo 'session.cookie_httponly = On'; @@ -26,43 +29,58 @@ if [ "${SECURE_COOKIES}" = true ]; then } > /usr/local/etc/php/conf.d/cookies.ini; fi -# Copy snappymail default config if absent -SNAPPYMAIL_CONFIG_FILE=/snappymail/data/_data_/_default_/configs/application.ini +echo "[INFO] Snappymail version: $( ls /snappymail/snappymail/v )" + +# Set permissions on snappymail data +echo "[INFO] Setting permissions on /var/lib/snappymail" +chown -R www-data:www-data /var/lib/snappymail/ +chmod 550 /var/lib/snappymail/ +find /var/lib/snappymail/ -type d -exec chmod 750 {} \; + +# Create snappymail default config if absent +SNAPPYMAIL_CONFIG_FILE=/var/lib/snappymail/_data_/_default_/configs/application.ini if [ ! -f "$SNAPPYMAIL_CONFIG_FILE" ]; then - echo "[INFO] Creating default Snappymail configuration" - mkdir -p $(dirname $SNAPPYMAIL_CONFIG_FILE) - cp /usr/local/include/application.ini $SNAPPYMAIL_CONFIG_FILE + echo "[INFO] Creating default Snappymail configuration: $SNAPPYMAIL_CONFIG_FILE" + # Run snappymail and exit. This populates the snappymail data directory and generates the config file + # On error, print php exception and exit + EXITCODE= + su - www-data -s /bin/sh -c 'php /snappymail/index.php' > /tmp/out || EXITCODE=$? + if [ -n "$EXITCODE" ]; then + cat /tmp/out + exit "$EXITCODE" + fi fi +echo "[INFO] Overriding values in snappymail configuration: $SNAPPYMAIL_CONFIG_FILE" # Enable output of snappymail logs -if [ "${LOG_TO_STDERR}" = true ]; then - sed -z 's/\; Enable logging\nenable = Off/\; Enable logging\nenable = On/' -i $SNAPPYMAIL_CONFIG_FILE - sed 's/^filename = .*/filename = "errors.log"/' -i $SNAPPYMAIL_CONFIG_FILE - sed 's/^write_on_error_only = .*/write_on_error_only = Off/' -i $SNAPPYMAIL_CONFIG_FILE - sed 's/^write_on_php_error_only = .*/write_on_php_error_only = On/' -i $SNAPPYMAIL_CONFIG_FILE -else - sed -z 's/\; Enable logging\nenable = On/\; Enable logging\nenable = Off/' -i $SNAPPYMAIL_CONFIG_FILE -fi +sed '/^\; Enable logging/{ +N +s/enable = Off/enable = On/ +}' -i $SNAPPYMAIL_CONFIG_FILE +# Redirect snappymail logs to stderr /stdout +sed 's/^filename = .*/filename = "stderr"/' -i $SNAPPYMAIL_CONFIG_FILE +sed 's/^write_on_error_only = .*/write_on_error_only = Off/' -i $SNAPPYMAIL_CONFIG_FILE +sed 's/^write_on_php_error_only = .*/write_on_php_error_only = On/' -i $SNAPPYMAIL_CONFIG_FILE # Always enable snappymail Auth logging sed 's/^auth_logging = .*/auth_logging = On/' -i $SNAPPYMAIL_CONFIG_FILE sed 's/^auth_logging_filename = .*/auth_logging_filename = "auth.log"/' -i $SNAPPYMAIL_CONFIG_FILE sed 's/^auth_logging_format = .*/auth_logging_format = "[{date:Y-m-d H:i:s}] Auth failed: ip={request:ip} user={imap:login} host={imap:host} port={imap:port}"/' -i $SNAPPYMAIL_CONFIG_FILE -# Redirect snappymail logs to stderr /stdout -mkdir -p /snappymail/data/_data_/_default_/logs/ -# empty logs -cp /dev/null /snappymail/data/_data_/_default_/logs/errors.log -cp /dev/null /snappymail/data/_data_/_default_/logs/auth.log -chown -R php-cli:php-cli /snappymail/data/ +sed 's/^auth_syslog = .*/auth_syslog = Off/' -i $SNAPPYMAIL_CONFIG_FILE -# Fix permissions -chown -R $UID:$GID /snappymail/data /var/log /var/lib/nginx -chmod o+w /dev/stdout -chmod o+w /dev/stderr +( + while ! nc -vz -w 1 127.0.0.1 8888 > /dev/null 2>&1; do echo "[INFO] Checking whether nginx is alive"; sleep 1; done + while ! nc -vz -w 1 127.0.0.1 9000 > /dev/null 2>&1; do echo "[INFO] Checking whether php-fpm is alive"; sleep 1; done + # Create snappymail admin password if absent + SNAPPYMAIL_ADMIN_PASSWORD_FILE=/var/lib/snappymail/_data_/_default_/admin_password.txt + if [ ! -f "$SNAPPYMAIL_ADMIN_PASSWORD_FILE" ]; then + echo "[INFO] Creating Snappymail admin password file: $SNAPPYMAIL_ADMIN_PASSWORD_FILE" + wget -T 1 -qO- 'http://127.0.0.1:8888/?/AdminAppData/0/12345/' > /dev/null + echo "[INFO] Snappymail Admin Panel ready at http://localhost:8888/?admin. Login using password in $SNAPPYMAIL_ADMIN_PASSWORD_FILE" + fi - -# Touch supervisord PID file in order to fix permissions -touch /run/supervisord.pid -chown php-cli:php-cli /run/supervisord.pid + wget -T 1 -qO- 'http://127.0.0.1:8888/' > /dev/null + echo "[INFO] Snappymail ready at http://localhost:8888/" +) & # RUN ! -exec sudo -u php-cli -g php-cli /usr/bin/supervisord -c '/supervisor.conf' --pidfile '/run/supervisord.pid' +exec /usr/bin/supervisord -c /supervisor.conf --pidfile /run/supervisord.pid diff --git a/.docker/release/files/etc/logrotate.d/snappymail b/.docker/release/files/etc/logrotate.d/snappymail deleted file mode 100644 index 701631d98..000000000 --- a/.docker/release/files/etc/logrotate.d/snappymail +++ /dev/null @@ -1,5 +0,0 @@ -/snappymail/data/_data_/_default_/logs/* { - size 10M - rotate 0 - missingok -} \ No newline at end of file diff --git a/.docker/release/files/etc/nginx/nginx.conf b/.docker/release/files/etc/nginx/nginx.conf index 1bb643f23..aff3829cf 100644 --- a/.docker/release/files/etc/nginx/nginx.conf +++ b/.docker/release/files/etc/nginx/nginx.conf @@ -11,7 +11,7 @@ http { default_type application/octet-stream; access_log off; - error_log /tmp/ngx_error.log error; + error_log /dev/stderr error; sendfile on; keepalive_timeout 15; @@ -52,6 +52,8 @@ http { server { listen 8888; + listen [::]:8888; + #listen [::]:8888 ipv6only=off; root /snappymail; index index.php; charset utf-8; @@ -95,7 +97,7 @@ http { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param HTTP_PROXY ""; fastcgi_index index.php; - fastcgi_pass unix:/tmp/php-fpm.sock; + fastcgi_pass 127.0.0.1:9000; fastcgi_intercept_errors on; fastcgi_request_buffering off; fastcgi_param REMOTE_ADDR $http_x_real_ip; diff --git a/.docker/release/files/logrotate-loop.sh b/.docker/release/files/logrotate-loop.sh deleted file mode 100644 index ba1d42469..000000000 --- a/.docker/release/files/logrotate-loop.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash -# ---------------------------------------------------------------------- -# Simple script to invoke logrotate at regular intervals -# ---------------------------------------------------------------------- - -# from https://github.com/misho-kr/docker-appliances/blob/master/nginx-nodejs/logrotate-loop.sh - -LOGROTATE_BIN="logrotate" - -STATE="$HOME/logrotate.state" -CONF="/etc/logrotate.d/snappymail" - -export LOGROTATE_BIN STATE CONF - -RUN_INTERVAL="3600" # every hour - -# helper functions for logging -export FMT="%a %b %d %Y %H:%M:%S GMT%z (%Z)" - -function log_date() { - echo "$(date +"$FMT"): $*" -} - -# ---------------------------------------------------------------------- -# Main loop of the logrotate service: -# -# while True: -# sleep N seconds -# run logrotate -# -# ---------------------------------------------------------------------- - -function logrotate_loop() { - - trap on_terminate TERM INT - - local interval="${1}" - - log_date "====================================================" - log_date - log_date "logrotate service starting (pid=$$)" - log_date "logrotate process will run every ${interval} seconds" - - while true; do - - current_time=$(date "+%s") - next_run_time=$(( current_time + interval )) - - while (( current_time < next_run_time )) - do - logrotate_sleep $(( next_run_time - current_time )) - current_time=$(date "+%s") - done - - logrotate_run - done -} - -# helper function to execute logrotate and pass it the right parameters -function logrotate_run() { - - log_date "logrotate will run now" - ${LOGROTATE_BIN} -s ${STATE} ${CONF} -} - -# ---------------------------------------------------------------------- -# Procedure to idle the execution for a number of seconds -# -# There are two requirements: -# -# - export the PID of the sleep command so that it can be terminated -# in case the logrotate service is being shutdown -# - keep this (bash) process responsive to SIGTERM while in sleep -# mode (normally the signal will be masked and will not be delivered -# until the subprocess completes) -# ---------------------------------------------------------------------- - -proc_sleep_pid="" - -function logrotate_sleep() { - - local sleep_interval=${1} - - log_date "logrotate will sleep for ${sleep_interval} seconds" - - ( exec -a "logrotate: sleep" sleep ${sleep_interval} )& - - proc_sleep_pid=$! - wait ${proc_sleep_pid} -} - -# ---------------------------------------------------------------------- -# Signal handler for logrotate service to make sure the process exits: -# -# - properly by terminating the sleep process that is used to idle -# the service -# - gracefully by writing a message in the log -# ---------------------------------------------------------------------- - -function on_terminate() { - - log_date "logrotate will terminate" - log_date - - kill -TERM ${proc_sleep_pid} - exit 0 -} - -# ---------------------------------------------------------------------- -# main -# ---------------------------------------------------------------------- - -logrotate_loop ${1:-RUN_INTERVAL} diff --git a/.docker/release/files/snappymail/include.php b/.docker/release/files/snappymail/include.php new file mode 100644 index 000000000..53ba30722 --- /dev/null +++ b/.docker/release/files/snappymail/include.php @@ -0,0 +1,3 @@ + diff --git a/.docker/release/files/supervisor.conf b/.docker/release/files/supervisor.conf index da6c6aefe..13a12a290 100644 --- a/.docker/release/files/supervisor.conf +++ b/.docker/release/files/supervisor.conf @@ -1,10 +1,13 @@ [supervisord] nodaemon=true +user=root +logfile=/dev/null +logfile_maxbytes=0 [program:nginx] command=nginx -c /etc/nginx/nginx.conf -g 'daemon off;' process_name=%(program_name)s_%(process_num)02d -user=php-cli +user=root numprocs=1 autostart=true autorestart=false @@ -17,7 +20,7 @@ stderr_logfile_maxbytes=0 [program:php-fpm] command=php-fpm -F process_name=%(program_name)s_%(process_num)02d -user=php-cli +user=root numprocs=1 autostart=true autorestart=false @@ -27,34 +30,11 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 -; reads snappymail logs -[program:snappymail-auth] -command=tail -f /snappymail/data/_data_/_default_/logs/auth.log -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - -[program:snappymail-errors] -command=tail -f /snappymail/data/_data_/_default_/logs/errors.log -# everything is an error -stdout_logfile=/dev/stderr -stdout_logfile_maxbytes=0 -redirect_stderr=true - -[program:logrotate] -command=/logrotate-loop.sh -autorestart=true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - [eventlistener:subprocess-stopped] command=php /listener.php process_name=%(program_name)s_%(process_num)02d -user=php-cli +user=root numprocs=1 events=PROCESS_STATE_EXITED,PROCESS_STATE_STOPPED,PROCESS_STATE_FATAL autostart=true -autorestart=unexpected \ No newline at end of file +autorestart=unexpected diff --git a/.docker/release/files/usr/local/etc/php-fpm.d/php-fpm.conf b/.docker/release/files/usr/local/etc/php-fpm.d/php-fpm.conf index 456fdb798..fbee3d4e0 100644 --- a/.docker/release/files/usr/local/etc/php-fpm.d/php-fpm.conf +++ b/.docker/release/files/usr/local/etc/php-fpm.d/php-fpm.conf @@ -1,15 +1,21 @@ [global] daemonize = no +error_log = /dev/stderr +log_buffering = no [default] -listen = /tmp/php-fpm.sock +listen = 9000 +user = www-data +listen.owner = www-data +listen.group = www-data pm = ondemand pm.max_children = 30 pm.process_idle_timeout = 10s pm.max_requests = 500 catch_workers_output = yes +decorate_workers_output = no chdir = / -php_admin_value[error_log] = /tmp/php_error.log +pm.status_path = /status php_admin_value[log_errors] = On php_admin_value[expose_php] = Off php_admin_value[display_errors] = Off diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini deleted file mode 100644 index 2a8958eea..000000000 --- a/.docker/release/files/usr/local/include/application.ini +++ /dev/null @@ -1,309 +0,0 @@ -; SnappyMail configuration file -; Please don't add custom parameters here, those will be overwritten - -[webmail] -; Text displayed as page title -title = "SnappyMail Webmail" - -; Text displayed on startup -loading_description = "SnappyMail" -favicon_url = "" -app_path = "" - -; Theme used by default -theme = "Default" - -; Allow theme selection on settings screen -allow_themes = On -allow_user_background = Off - -; Language used by default -language = "en" - -; Admin Panel interface language -language_admin = "en" - -; Allow language selection on settings screen -allow_languages_on_settings = On -allow_additional_accounts = On -allow_additional_identities = On - -; Number of messages displayed on page by default -messages_per_page = 20 - -; Mark message read after N seconds -message_read_delay = 5 - -; File size limit (MB) for file upload on compose screen -; 0 for unlimited. -attachment_size_limit = 2 - -[interface] -show_attachment_thumbnail = On - -[contacts] -; Enable contacts -enable = Off -allow_sync = Off -sync_interval = 20 -type = "sqlite" -pdo_dsn = "host=127.0.0.1;port=3306;dbname=snappymail" -pdo_user = "root" -pdo_password = "" -suggestions_limit = 30 - -[security] -; Enable CSRF protection (http://en.wikipedia.org/wiki/Cross-site_request_forgery) -csrf_protection = On -custom_server_signature = "SnappyMail" -x_xss_protection_header = "1; mode=block" -openpgp = Off - -; Login and password for web admin panel -admin_login = "admin" -admin_password = "" -admin_totp = "" - -; Access settings -allow_admin_panel = On -hide_x_mailer_header = On -admin_panel_host = "" -admin_panel_key = "admin" - -; For example to allow all images use "img-src https:". More info at https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy#directives -content_security_policy = "" - -; Report CSP errors to PHP and/or SnappyMail Log -csp_report = Off - -; A valid cipher method from https://php.net/openssl_get_cipher_methods -encrypt_cipher = "aes-256-cbc-hmac-sha1" - -; Strict, Lax or None -cookie_samesite = "Strict" - -; Additional allowed Sec-Fetch combinations separated by ";". -; For example: -; * Allow iframe on same domain in any mode: dest=iframe,site=same-origin -; * Allow navigate to iframe on same domain: mode=navigate,dest=iframe,site=same-origin -; * Allow navigate to iframe on (sub)domain: mode=navigate,dest=iframe,site=same-site -; * Allow navigate to iframe from any domain: mode=navigate,dest=iframe,site=cross-site -; -; Default is "site=same-origin;site=none" -secfetch_allow = "" - -[admin_panel] -allow_update = Off - -[ssl] -; Require verification of SSL certificate used. -verify_certificate = Off - -; Allow self-signed certificates. Requires verify_certificate. -allow_self_signed = On - -; https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_set_security_level.html -security_level = 1 - -; Location of Certificate Authority file on local filesystem (/etc/ssl/certs/ca-certificates.crt) -cafile = "" - -; capath must be a correctly hashed certificate directory. (/etc/ssl/certs/) -capath = "" - -; Location of client certificate file (pem format with private key) on local filesystem -local_cert = "" - -; This can help mitigate the CRIME attack vector. -disable_compression = On - -[capa] -quota = On -dangerous_actions = On -message_actions = On -attachments_actions = On - -[login] -; If someone logs in without "@domain.tld", this value will be used -; When this value is HTTP_HOST, the $_SERVER["HTTP_HOST"] value is used. -; When this value is SERVER_NAME, the $_SERVER["SERVER_NAME"] value is used. -; When this value is gethostname, the gethostname() value is used. -; -default_domain = "" - -; Allow language selection on webmail login screen -allow_languages_on_login = On -determine_user_language = On -determine_user_domain = Off -login_lowercase = On - -; This option allows webmail to remember the logged in user -; once they closed the browser window. -; -; Values: -; "DefaultOff" - can be used, disabled by default; -; "DefaultOn" - can be used, enabled by default; -; "Unused" - cannot be used -sign_me_auto = "DefaultOff" - -[plugins] -; Enable plugin support -enable = Off - -; Comma-separated list of enabled plugins -enabled_list = "" - -[defaults] -; Editor mode used by default (Plain, Html) -view_editor_type = "Html" - -; layout: 0 - no preview, 1 - side preview, 2 - bottom preview -view_layout = 1 -view_use_checkboxes = On -autologout = 30 -view_html = On -show_images = Off -contacts_autosave = On -mail_use_threads = Off -allow_draft_autosave = On -mail_reply_same_folder = Off - -[logs] -; Enable logging -enable = Off - -; Path where log files will be stored -path = "" - -; Log messages of set RFC 5424 section 6.2.1 Severity level and higher (0 = highest, 7 = lowest). -; 0 = Emergency -; 1 = Alert -; 2 = Critical -; 3 = Error -; 4 = Warning -; 5 = Notice -; 6 = Informational -; 7 = Debug -level = 4 - -; Required for development purposes only. -; Disabling this option is not recommended. -hide_passwords = On -time_zone = "UTC" - -; Log filename. -; For security reasons, some characters are removed from filename. -; Allows for pattern-based folder creation (see examples below). -; -; Patterns: -; {date:Y-m-d} - Replaced by pattern-based date -; Detailed info: http://www.php.net/manual/en/function.date.php -; {user:email} - Replaced by user's email address -; If user is not logged in, value is set to "unknown" -; {user:login} - Replaced by user's login (the user part of an email) -; If user is not logged in, value is set to "unknown" -; {user:domain} - Replaced by user's domain name (the domain part of an email) -; If user is not logged in, value is set to "unknown" -; {user:uid} - Replaced by user's UID regardless of account currently used -; -; {user:ip} -; {request:ip} - Replaced by user's IP address -; -; Others: -; {imap:login} {imap:host} {imap:port} -; {smtp:login} {smtp:host} {smtp:port} -; -; Examples: -; filename = "log-{date:Y-m-d}.txt" -; filename = "{date:Y-m-d}/{user:domain}/{user:email}_{user:uid}.log" -; filename = "{user:email}-{date:Y-m-d}.txt" -; filename = "syslog" -filename = "log-{date:Y-m-d}.txt" - -; Enable auth logging in a separate file (for fail2ban) -auth_logging = Off -auth_logging_filename = "fail2ban/auth-{date:Y-m-d}.txt" -auth_logging_format = "[{date:Y-m-d H:i:s}] Auth failed: ip={request:ip} user={imap:login} host={imap:host} port={imap:port}" - -; Enable auth logging to syslog for fail2ban -auth_syslog = On - -[debug] -; Special option required for development purposes -enable = Off - -[cache] -; The section controls caching of the entire application. -; -; Enables caching in the system -enable = On - -; Path where cache files will be stored -path = "" - -; Additional caching key. If changed, cache is purged -index = "v1" - -; Can be: files, APCU, memcache, redis (beta) -fast_cache_driver = "files" - -; Additional caching key. If changed, fast cache is purged -fast_cache_index = "v1" - -; Browser-level cache. If enabled, caching is maintainted without using files -http = On - -; Browser-level cache time (seconds, Expires header) -http_expires = 3600 - -; Caching message UIDs when searching and sorting (threading) -server_uids = On - -[imap] -use_force_selection = Off -use_expunge_all_on_delete = Off -message_list_fast_simple_search = On -message_list_permanent_filter = "" -message_all_headers = Off -show_login_alert = On - -[labs] -cache_system_data = On -date_from_headers = On -allow_message_append = Off -login_fault_delay = 1 -log_ajax_response_write_limit = 300 -allow_html_editor_biti_buttons = Off -allow_ctrl_enter_on_compose = On -try_to_detect_hidden_images = Off -use_app_debug_js = Off -use_app_debug_css = Off -smtp_show_server_errors = Off -sieve_auth_plain_initial = On -sieve_allow_fileinto_inbox = Off -mail_func_clear_headers = On -mail_func_additional_parameters = Off -folders_spec_limit = 50 -curl_proxy = "" -curl_proxy_auth = "" -force_https = Off -custom_login_link = "" -custom_logout_link = "" -http_client_ip_check_proxy = Off -fast_cache_memcache_host = "127.0.0.1" -fast_cache_memcache_port = 11211 -fast_cache_redis_host = "127.0.0.1" -fast_cache_redis_port = 6379 -use_local_proxy_for_external_images = On -image_exif_auto_rotate = Off -cookie_default_path = "" -cookie_default_secure = Off -check_new_messages = On -replace_env_in_configuration = "" -boundary_prefix = "" -dev_email = "" -dev_password = "" - -[version] -current = "2.24.5" -saved = "Sun, 18 Dec 2022 22:10:48 +0000" diff --git a/.docker/release/test/build_and_test.sh b/.docker/release/test/build_and_test.sh new file mode 100755 index 000000000..f332ad2c2 --- /dev/null +++ b/.docker/release/test/build_and_test.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# This script uses docker buildx to build a docker image, and loads it into the docker daemon. Then it executes ./test.sh to test the docker image +# It is useful for testing release builds in development +set -eu +IMAGE=snappymail/snappymail:test +DOCKER_BUILDX=1 docker build -t "$IMAGE" -f .docker/release/Dockerfile . +.docker/release/test/test.sh "$IMAGE" diff --git a/.docker/release/test/config.yaml b/.docker/release/test/config.yaml new file mode 100644 index 000000000..47cf00ea9 --- /dev/null +++ b/.docker/release/test/config.yaml @@ -0,0 +1,29 @@ +# See: https://github.com/GoogleContainerTools/container-structure-test +# See: https://github.com/GoogleContainerTools/container-structure-test/issues/78 +schemaVersion: 2.0.0 +commandTests: + - name: Integration test + command: /bin/sh + args: + - -c + - | + set -eux + DEBUG=true /entrypoint.sh > /tmp/test 2>&1 & + sleep 5 + cat /tmp/test + pidof supervisord + pidof nginx + pidof php-fpm + ls -al /var/lib/snappymail/_data_/_default_/configs/application.ini + ls -al /var/lib/snappymail/_data_/_default_/admin_password.txt + nc -vz 127.0.0.1 8888 + nc -vz 127.0.0.1 9000 + wget -S -T 3 -O /dev/null http://127.0.0.1:8888 + kill `pidof supervisord` +metadataTest: + exposedPorts: ["8888", "9000"] + volumes: ["/var/lib/snappymail"] + entrypoint: [] + cmd: ["/entrypoint.sh"] + workdir: /snappymail + user: root diff --git a/.docker/release/test/test.sh b/.docker/release/test/test.sh new file mode 100755 index 000000000..1981cb358 --- /dev/null +++ b/.docker/release/test/test.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# This script tests a given docker image using https://github.com/GoogleContainerTools/container-structure-test +set -eu +SCRIPT_DIR=$( cd "$(dirname "$0")" && pwd ) +IMAGE=${1:-} +echo "Testing image: $IMAGE" +docker run --rm -i \ + -v /var/run/docker.sock:/var/run/docker.sock:ro \ + -v "$SCRIPT_DIR/config.yaml:/config.yaml:ro" \ + gcr.io/gcp-runtimes/container-structure-test:latest test --image "$IMAGE" --config config.yaml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..16ef81459 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +/.git +/node_modules diff --git a/.eslintrc.js b/.eslintrc.js index 06370b344..e22cb986d 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -3,7 +3,7 @@ module.exports = { // extends: ['eslint:recommended', 'plugin:prettier/recommended'], extends: ['eslint:recommended'], parserOptions: { - ecmaVersion: 6, + ecmaVersion: 11, sourceType: 'module' }, env: { @@ -35,10 +35,17 @@ module.exports = { // vendors/bootstrap/bootstrap.native.js 'BSN': "readonly", // Mailvelope - 'mailvelope': "readonly" + 'mailvelope': "readonly", + // Punycode + 'IDN': "readonly", + // Turndown + 'TurndownService': "readonly", + // Marked + 'marked': "readonly" }, // http://eslint.org/docs/rules/ rules: { + 'no-cond-assign': 0, // plugins 'no-mixed-spaces-and-tabs': 'off', 'max-len': [ diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index fc1bece3e..b37d3418e 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,2 @@ -community_bridge: SnappyMail +github: the-djmaze custom: ["https://www.paypal.me/thedjmaze", "https://snappymail.eu"] diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 2f48abb98..998692964 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -28,9 +28,11 @@ If applicable, add screenshots to help explain your problem. - IMAP daemon: [e.g. courier, dovecot] - PHP version: - SnappyMail Version: +- Mode: [e.g. standalone, nextcloud, cyberpanel, docker] -**[Debug/logging information](https://github.com/the-djmaze/snappymail/wiki/FAQ#how-do-i-enable-logging)** -Place them here (few lines) or as attachments (many lines) +**Debug/logging information** +[Read here how to log](https://github.com/the-djmaze/snappymail/wiki/FAQ#how-do-i-enable-logging) +- [ ] I've placed them here (few lines) or as attachments (many lines) **Additional context** Add any other context about the problem here. diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml new file mode 100644 index 000000000..af069cdf6 --- /dev/null +++ b/.github/workflows/docker-pr.yml @@ -0,0 +1,93 @@ +name: docker-pr + +on: + pull_request: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + # This step generates the docker tags + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + env: + # This env var ensures {{sha}} is a real commit SHA for type=ref,event=pr + DOCKER_METADATA_PR_HEAD_SHA: 'true' + with: + images: | + djmaze/snappymail + ghcr.io/${{ github.repository }} + # type=ref,event=pr generates tag(s) on PRs only. E.g. 'pr-123', 'pr-123-abc0123' + tags: | + type=ref,event=pr + type=ref,suffix=-{{sha}},event=pr + # The rest of the org.opencontainers.image.xxx labels are dynamically generated + labels: | + org.opencontainers.image.description=SnappyMail + org.opencontainers.image.licenses=AGPLv3 + + # See: https://github.com/docker/build-push-action/blob/v2.6.1/docs/advanced/cache.md#github-cache + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v2 + + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + + # See: https://github.com/docker/buildx/issues/59 + - name: Build + id: build + uses: docker/build-push-action@v3 + with: + context: '.' + file: ./.docker/release/Dockerfile + platforms: linux/amd64 + push: false + load: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max + + - name: Docker images + run: | + docker images + + - name: Test + run: | + TAG=$( echo "${{ steps.meta.outputs.tags }}" | head -n1 ) + .docker/release/test/test.sh "$TAG" + + - name: Build all archs + uses: docker/build-push-action@v3 + with: + context: '.' + file: ./.docker/release/Dockerfile + platforms: linux/386,linux/amd64,linux/arm64 + push: false + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max + + # Temp fix + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 + - name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 000000000..b957e2fc8 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,117 @@ +name: docker + +on: + push: + tags: + - 'v2.*' + +# This is needed to push to GitHub Container Registry. See https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry +permissions: + contents: read + packages: write + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + # This step generates the docker tags + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + env: + # This env var ensures {{sha}} is a real commit SHA for type=ref,event=pr + DOCKER_METADATA_PR_HEAD_SHA: 'true' + with: + images: | + djmaze/snappymail + ghcr.io/${{ github.repository }} + # type=ref,event=branch generates tag(s) on branch only. E.g. 'master', 'master-abc0123' + # type=ref,event=tag generates tag(s) on tags only. E.g. 'v0.0.0', 'v0.0.0-abc0123', and 'latest' + tags: | + type=ref,event=branch + type=ref,event=tag + # The rest of the org.opencontainers.image.xxx labels are dynamically generated + labels: | + org.opencontainers.image.description=SnappyMail + org.opencontainers.image.licenses=AGPLv3 + + # See: https://github.com/docker/build-push-action/blob/v2.6.1/docs/advanced/cache.md#github-cache + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v2 + + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + + - name: Login to Docker Hub registry + if: startsWith(github.ref, 'refs/tags/') # Login only on tags + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Login to GitHub Container Registry + if: startsWith(github.ref, 'refs/tags/') # Login only on tags + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + # See: https://github.com/docker/buildx/issues/59 + - name: Build + id: build + uses: docker/build-push-action@v3 + with: + context: '.' + file: ./.docker/release/Dockerfile + platforms: linux/amd64 + push: false + load: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max + + - name: Docker images + run: | + docker images + + - name: Test + run: | + TAG=$( echo "${{ steps.meta.outputs.tags }}" | head -n1 ) + .docker/release/test/test.sh "$TAG" + + - name: Build and push + id: build-and-push + uses: docker/build-push-action@v3 + with: + context: '.' + file: ./.docker/release/Dockerfile + # TODO: Add more arches? + # platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x + platforms: linux/386,linux/amd64,linux/arm64 + push: ${{ startsWith(github.ref, 'refs/tags/') }} # Push only on tags + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max + + # Temp fix + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 + - name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache diff --git a/.gitignore b/.gitignore index 46428042c..5f49d65d5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ /data /MULTIPLY /include.php +/issues .idea/ .env /test @@ -24,6 +25,8 @@ /vendors/knockout/spec /vendors/openpgp-5 !/vendors/openpgp-5/dist +/vendors/squire2 +!/vendors/squire2/dist /vendors/vanillaqr.js/ /integrations/nextcloud/rainloop /integrations/owncloud/rainloop diff --git a/.gitmodules b/.gitmodules index cfb771834..ccf1009a6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,7 @@ [submodule "vendors/openpgp-5"] path = vendors/openpgp-5 url = git@github.com:the-djmaze/openpgpjs.git +[submodule "vendors/squire2"] + path = vendors/squire2 + url = git@github.com:the-djmaze/Squire.git + branch = snappymail diff --git a/.htaccess b/.htaccess index 449dcc730..71041371a 100644 --- a/.htaccess +++ b/.htaccess @@ -1,7 +1,15 @@ + + AcceptPathInfo On + + RewriteEngine On # Redirect cPanel RewriteRule cpsess.* https://%{HTTP_HOST}/ [L,R=301] + + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule ^(.+)$ index.php/$1 [L,QSA] @@ -26,7 +34,6 @@ # Header set Strict-Transport-Security "max-age=31536000" Header set imagetoolbar "no" # Header set X-Content-Type-Options "nosniff" -# Header set X-Frame-Options "DENY" # Header set X-XSS-Protection "1; mode=block" Header set Service-Worker-Allowed "/" diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cd8494e0..d31a1b771 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,43 +1,1638 @@ +## 2.38.2 – 2024-10-09 +### Fixed +- error '$index is not defined' in Settings > Accounts + [#1797](https://github.com/the-djmaze/snappymail/issues/1797) + + +## 2.38.1 – 2024-10-08 + +### Added +- Admin - Extensions search filter +- Options to unset current font family and size + [#1726](https://github.com/the-djmaze/snappymail/issues/1726) +- Option to allow insecure cryptkey + [#1746](https://github.com/the-djmaze/snappymail/issues/1746) +- Save vCard FN property + [#1761](https://github.com/the-djmaze/snappymail/issues/1761) +- Docker Nginx should listen on IPv6 addresses in addition to IPv4 + [#1770](https://github.com/the-djmaze/snappymail/issues/1770) +- Full-screen Message View on Double-Click + [#1787](https://github.com/the-djmaze/snappymail/issues/1787) + +### Changed +- Use the custom Squire as submodule vendors/squire2 +- Disallow noembed and noframes HTML elements +- Keep 1 space between HTML elements in compressed templates +- Squire: sanitizeToDOMFragment now uses cleanHTML() +- Squire: improved handling of BR elements + [#1389](https://github.com/the-djmaze/snappymail/issues/1389) +- Nextcloud border-radius by @gnilebein + [#1790](https://github.com/the-djmaze/snappymail/pull/1790) +- Compose window sentFolder handling for + [#1793](https://github.com/the-djmaze/snappymail/pull/1793) +- Update Portuguese by @ner00 +- Update Polish by @tinola +- Update French by @hguilbert +- Update Portuguese (Brazil) by @mstolf + +### Fixed +- Composer dialog scroll got broken in v2.28 +- Composer dialog "from" triangle button wrong position due to font changes +- Admin - Config `search` should be ko.observable() not ko.observableArray() +- Squire: paste images + [#1389](https://github.com/the-djmaze/snappymail/issues/1389) +- Domain whitelist failures on login + [#1706](https://github.com/the-djmaze/snappymail/issues/1706) +- Sieve parse errors +- Sieve support `index` was not optional for + [#1709](https://github.com/the-djmaze/snappymail/issues/1709) +- Pagination problem for large mailbox after 2.36.1 + [#1716](https://github.com/the-djmaze/snappymail/issues/1716) +- Undefined constant "LOG_ERROR" + [#1754](https://github.com/the-djmaze/snappymail/issues/1754) +- Search Filter Capital "B" not working + [#1780](https://github.com/the-djmaze/snappymail/issues/1780) +- PHP 8.4: Implicitly nullable parameter declarations deprecated + + +## 2.38.0 – 2024-09-16 + +### Added +- Remove `tel:` links when converting HTML to plain + [#1724](https://github.com/the-djmaze/snappymail/issues/1724) +- Convert HTML to Markdown instead of plain, by using [Turndown](https://github.com/mixmark-io/turndown) + [#1604](https://github.com/the-djmaze/snappymail/issues/1604) +- Check HTMLInputElement.validity() for + [#1733](https://github.com/the-djmaze/snappymail/issues/1733) + +### Changed +- Use a modified [Squire 2.3.2](https://github.com/the-djmaze/Squire/commits/snappymail/) +- cleanHtml use allowedTags instead of disallowedTags and improved CSS handling +- Update Portuguese by @ner00 + +### Fixed +- mXSS exploit found by SonarSource + [CVE-2024-45800](https://github.com/the-djmaze/snappymail/security/advisories/GHSA-2rq7-79vp-ffxm) +- Call to a member function Email() on null + [#1706](https://github.com/the-djmaze/snappymail/issues/1706) +- IMAP capabilities via IMAP Proxy + [#1725](https://github.com/the-djmaze/snappymail/issues/1725) +- Messages on page setting is not validated against 999 max + [#1733](https://github.com/the-djmaze/snappymail/issues/1733) + + +## 2.37.3 – 2024-08-27 + +### Added +- Mark images with width=1 as tracking pixel +- Show warning in Admin -> About when PHP runs in 32bit +- Edit ACL rules + [#157](https://github.com/the-djmaze/snappymail/issues/157) +- Show GnuPG version for + [#1560](https://github.com/the-djmaze/snappymail/issues/1560) +- Make sure only scalar values are allowed in $_ENV for + [#1560](https://github.com/the-djmaze/snappymail/issues/1560) +- Change minimum new mail check interval + [#1678](https://github.com/the-djmaze/snappymail/issues/1678) +- Sieve editor does not support "index" extension + [#1709](https://github.com/the-djmaze/snappymail/issues/1709) + +### Changed +- Improved domain autoconfig interaction +- MS autodiscover priorities DNS over subdomain +- Simplify sieve scripts list + [#1675](https://github.com/the-djmaze/snappymail/issues/1675) +- Handling of (token) errors due to + [#1706](https://github.com/the-djmaze/snappymail/issues/1706) +- Sabre/Xml to v4.0.5 +- Update Chinese by @Artoria2e5 +- Update French by @hguilbert + +### Fixed +- Thread sorting visible after disabling the imap capability + [#1574](https://github.com/the-djmaze/snappymail/issues/1574) +- Creating new message impossible as long as a draft exists? + [#1710](https://github.com/the-djmaze/snappymail/issues/1710) +- InvalidToken error at login + [#1706](https://github.com/the-djmaze/snappymail/issues/1706) + +### Nextcloud +- Force Nextcloud personal language by default + [#1428](https://github.com/the-djmaze/snappymail/issues/1428) + + +## 2.37.2 – 2024-08-13 + +### Added +- Validate Fetch JSON response + +### Fixed +- PATH_INFO bug due to Office365 OAuth login +- Prevent logout loop on error + +### Nextcloud +- Failed loading due to Office365 OAuth2 attempt + [#1703](https://github.com/the-djmaze/snappymail/issues/1703) + + +## 2.37.1 – 2024-08-12 + +### Fixed +- Gulp v5 broke the fonts + +### Nextcloud +- Support v30 + + +## 2.37.0 – 2024-08-12 + +### Added +- JavaScript event `rl-vm-visible` +- Detailed error message on account switch failure for + [#1594](https://github.com/the-djmaze/snappymail/issues/1594) +- Workarounds for Microsoft OAuth2 (currently requires Apache AcceptPathInfo) + [#1645](https://github.com/the-djmaze/snappymail/issues/1645) +- Support "mark for deletion" + [#1657](https://github.com/the-djmaze/snappymail/issues/1657) by @smsoft-ru +- Invoke "Update Identity" pop up right after login (when not initialized) + [#1689](https://github.com/the-djmaze/snappymail/issues/1689) +- Keyboard shortcut for "Swap default (background) color" + [#1690](https://github.com/the-djmaze/snappymail/issues/1690) + +### Changed +- Updated gulp to v5 +- Replaced vulnerable gulp-header with gulp-append-prepend +- Removed abandoned vulnerable rollup-plugin-html +- Align save button in admin security settings +- Made registerProtocolHandler('mailto') optional by activating at Settings -> General +- Improved InvalidToken handling for + [#1653](https://github.com/the-djmaze/snappymail/issues/1653) +- Cleanup localizations +- Update French by @hguilbert +- Update German by @tkasch +- Update Polish by @tinola +- Update Portuguese by @ner00 + +### Fixed +- prevent multiple afterShow() and afterHide() due to `transitionend` on multiple CSS properties +- Attempt to read property "smimeSigned" on null +- Refreshing mail list doesn't update current message + [#1654](https://github.com/the-djmaze/snappymail/issues/1654) +- Deletion of CACHE folder causing error + [#1660](https://github.com/the-djmaze/snappymail/issues/1660) +- Multiple line breaks are not displayed + [#1666](https://github.com/the-djmaze/snappymail/issues/1666) +- RainLoop\Exceptions\ClientException::__construct(): Argument #2 ($oPrevious) must be of type ?Throwable, string given + [#1686](https://github.com/the-djmaze/snappymail/issues/1686) +- SpamAssassin Division by zero + [#1694](https://github.com/the-djmaze/snappymail/issues/1694) +- Failed to parse RFC 2822 date '6 Jul 2024 16:42:09 +0200' + [#1694](https://github.com/the-djmaze/snappymail/issues/1694) +- Fix capabilities when THREAD is disabled + [#1698](https://github.com/the-djmaze/snappymail/pull/1698) by @akhil1508 + +### Nextcloud +- Failed loading due to incorrect `app_path` +- Bugfix language detection +- Allow multi-account in nc with oauth login + [#1699](https://github.com/the-djmaze/snappymail/pull/1699) by @akhil1508 + + +## 2.36.4 – 2024-06-25 + +### Added +- Customize private key passphrase expiration interval + [#1545](https://github.com/the-djmaze/snappymail/discussions/1545) +- AdvancedSearch support for filtering mails before a given date + [#1606](https://github.com/the-djmaze/snappymail/pull/1606) by @codiflow +- Control valid spam and virus headers + [#1607](https://github.com/the-djmaze/snappymail/issues/1607) +- Remember S/MIME private Key without function + [#1611](https://github.com/the-djmaze/snappymail/issues/1611) +- Resize compose dialog +- Magnetic theme + [#1637](https://github.com/the-djmaze/snappymail/pull/1637) by @TheCuteFoxxy + +### Changed +- Improved signing messages by allowing to choose between the options +- Improved language detection code +- More detailed Decrypt errors +- Update French by @hguilbert +- Update Polish by @tinola +- Update Portuguese by @ner00 +- Update Spanish by @huloza + +### Fixed +- Default language error +- Undefined $sEmail in DoAdminDomainMatch +- Handling Autocrypt header failed on `=` + [#1608](https://github.com/the-djmaze/snappymail/issues/1608) +- Blank lines are inserted when editing draft + [#1609](https://github.com/the-djmaze/snappymail/issues/1609) +- Workaround Cyrus MAILBOXID bug (disable OBJECTID capability by default due to impact) + [#1640](https://github.com/the-djmaze/snappymail/issues/1640) +- Workaround HTML with multiple body elements or MIME with multiple text/html + [#1641](https://github.com/the-djmaze/snappymail/issues/1641) + +### Nextcloud +- OIDC stay logged in + [#1620](https://github.com/the-djmaze/snappymail/pull/1620) by @avinash-0007 + + +## 2.36.3 – 2024-05-27 + +### Changed +- UserAuth prevent plugin errors (like the Nextcloud plugin did) + +### Fixed +- Undefined variable $aTokenData + [#1567](https://github.com/the-djmaze/snappymail/issues/1567) + + +## 2.36.2 – 2024-05-26 + +### Added +- "copy to" action in menu's for + [#1559](https://github.com/the-djmaze/snappymail/issues/1559) +- Log signal info for + [#1569](https://github.com/the-djmaze/snappymail/issues/1569) +- OpenPGP.js automatically import backup keys from server + +### Changed +- Improved "remember me" cookie handling +- Update Basque by @Thadah +- Update Portuguese by @ner00 + +### Fixed +- "Account already exists" + [#1561](https://github.com/the-djmaze/snappymail/issues/1561) +- Properly escape path separator in tar.php file list regex + [#1562](https://github.com/the-djmaze/snappymail/pull/1562) by @sevmonster +- Prevent mkdir() error + [#1565](https://github.com/the-djmaze/snappymail/issues/1565) +- SCRAM Exception when trying to log in to SMTP + [#1575](https://github.com/the-djmaze/snappymail/issues/1575) +- Error when redirected back to instance after Gmail OAuth + [#1580](https://github.com/the-djmaze/snappymail/issues/1580) +- Uncaught TypeError: hasPublicKeyForEmails(...).then is not a function + [#1589](https://github.com/the-djmaze/snappymail/issues/1589) +- Undefined variable $sFilename +- GPG/PGP exec() return false handling + +### Nextcloud +- OIDC login active again + [#1572](https://github.com/the-djmaze/snappymail/pull/1572) by @avinash-0007 + + +## 2.36.1 – 2024-04-23 + +### Added +- Autoconfig detect through DNS SRV (RFC 6186 & 8314) and disable MX +- Have I Been Pwned class to check breached passwords and email addresses +- Handle RFC 5987 in Content-Disposition header +- Ignore text/x-amp-html +- Show SMTP error to user + [#1521](https://github.com/the-djmaze/snappymail/issues/1521) +- OAuth2 for login using gmail (and others) + +### Changed +- logMask all AUTHENTICATE requests +- ErrorTip use white-space: pre +- Simplify LoginProcess handling +- ES2020 everywhere (require Safari 13.1) +- Modified Squire to be more in line with v2.2.8 +- CSS set min-width for .attachmentParent and .flagParent to line them up +- cPanel use extension login-cpanel instead of login-remote +- Improved login credentials handling +- Speedup Knockout a bit and removed `with($context)` scope +- Update Belarusian by @spoooyders +- Update Chinese by @mayswind +- Update French by @hguilbert +- Update Polish by @tinola +- Update Portuguese by @ner00 + +### Fixed +- Content encoding and type detection in JavaScript could fail due to case-sensitivity. +- Extensions set logger failed +- GnuPG check open_basedir and if shell_exec is disabled + [#1385](https://github.com/the-djmaze/snappymail/issues/1385) + [#1496](https://github.com/the-djmaze/snappymail/issues/1496) + [#1555](https://github.com/the-djmaze/snappymail/issues/1555) +- Hide pagination when search result has no messages +- Prevent mbstring error before setup.php +- Prevent MessagesPerPage Infinity + [#1540](https://github.com/the-djmaze/snappymail/issues/1540) +- Reseal CryptKey failed + [#1543](https://github.com/the-djmaze/snappymail/issues/1543) + +### Nextcloud +- Add an occ command to set up the login settings + [#1552](https://github.com/the-djmaze/snappymail/issues/1552) + + +## 2.36.0 – 2024-03-18 + +### Added +- Allow setting the supported THREAD algorithm +- Icon to system folders +- Remove remembered password after 15 minutes of inactivity + [#1142](https://github.com/the-djmaze/snappymail/issues/1142) +- Swap background and text color for unreadable text on dark background + [#1486](https://github.com/the-djmaze/snappymail/issues/1486) +- Generate TOTP code at ?Admin -> Security + [#1501](https://github.com/the-djmaze/snappymail/issues/1501) +- Button to change S/MIME private key passphrase + [#1505](https://github.com/the-djmaze/snappymail/issues/1505) +- Belarusian + [#1512](https://github.com/the-djmaze/snappymail/pull/1512) by @spoooyders +- Log some domain idn_to_ascii issues + [#1513](https://github.com/the-djmaze/snappymail/issues/1513) + +### Changed +- On folder/mailbox rename, also rename all children instead of reloading all +- Seal MainAccount CryptKey and on error ask old login passphrase to reseal key. +- Moved cache drivers outside core into extensions +- Sieve always allow fileinto INBOX + [#1510](https://github.com/the-djmaze/snappymail/issues/1510) +- Moved application.ini `sieve_auth_plain_initial` to per domain config +- Languages use rfc5646, by using the shortest ISO 639 code by default +- Update French by @hguilbert +- Update Portuguese by @ner00 + +### Fixed +- On folder/mailbox rename, the old fullName must be removed from cache +- On folder/mailbox rename, the checkable option was not renamed +- Sort accounts drag & drop +- S/MIME encrypted and opaque signed not visible + [#1450](https://github.com/the-djmaze/snappymail/issues/1450) +- Wrong last UID of thread + [#1507](https://github.com/the-djmaze/snappymail/issues/1507) +- Creation of dynamic property SnappyMail\DAV\Client::$HTTP + [#1509](https://github.com/the-djmaze/snappymail/issues/1509) +- "Download as ZIP" fails for messages + [#1514](https://github.com/the-djmaze/snappymail/issues/1514) +- SMTP "Authentication failed" when IMAP uses `shortLogin` and SMTP not + [#1517](https://github.com/the-djmaze/snappymail/issues/1517) + + +## 2.35.4 – 2024-03-16 + +### Added +- \SnappyMail\IDN::toAscii() + +### Changed +- OpenPGP.js to v5.11.1 +- punycode.js lowercase domain names +- application.ini `login_lowercase` removed and now configurable per domain JSON `lowerLogin` +- Update Portuguese by @ner00 + +### Fixed +- Raise JS TypeEroor "toLowerCase" after update + [#1491](https://github.com/the-djmaze/snappymail/issues/1491) +- Call to undefined function shell_exec + [#1496](https://github.com/the-djmaze/snappymail/issues/1496) +- Download attachments as ZIP doesn't work for PGP encrypted mail + [#1499](https://github.com/the-djmaze/snappymail/issues/1499) +- Importing or downloading a PGP public key attachment from a PGP encrypted message doesn't work + [#1500](https://github.com/the-djmaze/snappymail/issues/1500) +- VCard PHP Notice: Undefined index: ENCODING + +### Nextcloud +- Changed stored password handling +- Can't login from nextcloud with 2.35.3 bug Nextcloud + [#1490](https://github.com/the-djmaze/snappymail/issues/1490) + + +## 2.35.3 – 2024-03-12 + +### Added +- GnuPG can be disabled +- Missing strings for localization inside identity popup (Cryptography > S/MIME) + [#1458](https://github.com/the-djmaze/snappymail/issues/1458) +- Automatically verify PGP and S/MIME signed messages +- TNEFDecoder for + [#1012](https://github.com/the-djmaze/snappymail/discussions/1012) +- RTF to HTML converter for + [#1012](https://github.com/the-djmaze/snappymail/discussions/1012) +- Polyfill for PHP ctype + [#1250](https://github.com/the-djmaze/snappymail/issues/1250) + +### Changed +- `new Error()` to `Error()` +- Reduce KnockoutJS footprint by removing unused code +- CSS reposition rainloopErrorTip location +- Improved error handling on PGP and S/MIME decrypt +- Improved OpenPGP.js import keys +- Use Identity S/MIME key and certificate from server instead of POST +- application.ini `[webmail]language_admin` to `[admin_panel]language` +- application.ini `[security]admin_panel_host` to `[admin_panel]host` +- application.ini `[security]admin_panel_key` to `[admin_panel]key` +- Drop deprecated Domain::SetConfig() +- Internationalized domain names are now handled as punycode +- Cacher->Get() can now return NULL +- Update French by @hguilbert +- Update Polish by @tinola +- Update Portuguese by @ner00 + +### Fixed +- Handling of Internationalized Domain Names in several areas +- Decrypt error message +- Stalwart ManageSieve Error 352 when getting Filters + [#1455](https://github.com/the-djmaze/snappymail/issues/1455) +- Nextcloud V25+ theme slightly broken + [#1463](https://github.com/the-djmaze/snappymail/issues/1463) +- PGP decryption fails with "Not armored text" + [#1462](https://github.com/the-djmaze/snappymail/issues/1462) +- AUTH_BASIC falling through as AUTH_BEARER; change AUTH_BEARER to a different value + [#1461](https://github.com/the-djmaze/snappymail/issues/1461) +- SetPassword expects \SnappyMail\SensitiveString +- Crash on importing corrupt OpenPGP keys +- Crash on old browsers instead of showing error +- Ignore popups on logoutReload() + [#1467](https://github.com/the-djmaze/snappymail/issues/1467) +- Custom SASLMechanisms fail in IMAP when the connection is secure + [#1484](https://github.com/the-djmaze/snappymail/pull/1484) by @botsarenthuman + + +## 2.35.2 – 2024-02-27 + +### Added +- GnuPG error handling +- Missing strings for localization inside identity popup (Cryptography > S/MIME) + [#1458](https://github.com/the-djmaze/snappymail/issues/1458) + +### Changed +- Update Portuguese by @ner00 + +### Fixed +- Drop support for gnupg PECL extension as it fails with "no passphrase" issues +- Error 352 when getting Filters + [#1455](https://github.com/the-djmaze/snappymail/issues/1455) + +### Nextcloud +- SetPassword(): Argument #1 must be of type SensitiveString, string given + [#1456](https://github.com/the-djmaze/snappymail/issues/1456) + + +## 2.35.1 – 2024-02-26 + +### Added +- Search functionality in Admin -> Config +- Cache S/MIME passphrases when "remember" is checked +- Import S/MIME certificate popup +- pre-verify S/MIME opaque signed messages so we have a body to view +- Sort PGP keys and S/MIME certificates on email address +- Optionally use existing private key to generate S/MIME certificate + +### Changed +- Better handling to detect which PGP or S/MIME sign/encrypt to use +- Improved StorageType handling +- Cleanup and improved Capa handling +- OPEN_PGP should be OPENPGP as it is one word +- Use get_debug_type() instead of gettype() +- Require OpenSSL due to S/MIME +- AbstractProvider::IsActive() is now an abstract method and must be defined in child class +- Make better use of SnappyMail\SensitiveString +- Update Polish translation by @tinola + +### Fixed +- Verify S/MIME signatures got broken allong the way while implementing this +- Generate S/MIME self-signed certificate failed to keep existing private key +- MIME parser RegExp didn't escape boundary which caused issues +- TypeError: b64Encode(...).match(...) is null on saving compose draft +- Fix timestampToString() for future dates + + +## 2.35.0 – 2024-02-20 + +### Added +- S/MIME support + [#259](https://github.com/the-djmaze/snappymail/issues/259) + +### Changed +- Disable IMAP METADATA by default (hardly used) +- Update Polish translation by @tinola +- Rename CSS .openpgp-control to .crypto-control +- Renamed some methods in PHP + +### Fixed +- When moving a folder/mailbox check for parent delimiter +- Mask `passphrase` in the logs for PHP < 8.2 +- Added some missing translations +- Sign messages using PGP +- Check for CONDSTORE or QRESYNC to get the HIGHESTMODSEQ +- Unable to login on certain IMAP server since 2.34.2 + [#1438](https://github.com/the-djmaze/snappymail/issues/1438) + +### Nextcloud +- Save as .eml + [#1425](https://github.com/the-djmaze/snappymail/issues/1425) + + +## 2.34.2 – 2024-02-14 + +### Fixed +- Message was sent but not saved to sent items folder + [#1432](https://github.com/the-djmaze/snappymail/issues/1432) +- Login with scram failed + [#1433](https://github.com/the-djmaze/snappymail/issues/1433) + + +## 2.34.1 – 2024-02-13 + +### Added +- Autocrypt support + [#342](https://github.com/the-djmaze/snappymail/issues/342) +- Load the mailboxes/folders of all namespaces (other users, global, shared, etc.) +- Load keys from server into OpenPGP.js + [#973](https://github.com/the-djmaze/snappymail/issues/973) +- Import PGP Keys from remote key servers +- Sort Inbox Folders with Unread Messages First + [#1427](https://github.com/the-djmaze/snappymail/issues/1427) +- Define JMAP FolderModel.myRights +- Identity Management: add identity display name + [#1405](https://github.com/the-djmaze/snappymail/issues/1405) +- Identity Management: add per-identity "sent" folder + [#1404](https://github.com/the-djmaze/snappymail/issues/1404) +- Some support for JSON-LD / Structured Email + [#1422](https://github.com/the-djmaze/snappymail/issues/1422) +- Domain Autoconfig and Microsoft's autodiscover (and also as extension/plugin) +- View MMS messages that are received via email + [#1294](https://github.com/the-djmaze/snappymail/issues/1294) +- Draft code for S/MIME + [#259](https://github.com/the-djmaze/snappymail/issues/259) + +### Changed +- Many OpenPGP improvements + [#89](https://github.com/the-djmaze/snappymail/issues/89) +- Allow CSP connect-src CORS for keys.openpgp.org to directly fetch PGP keys +- Improved handling of visible folders +- KnockoutJS Replace some ko.exportSymbol('*') in favour of ko['*'] +- KnockoutJS use Symbol for isObservableArray() +- Simplify generating folderListVisible +- Drop the bSearchSecretWords param from logger +- Transparent background for text + [#1412](https://github.com/the-djmaze/snappymail/issues/1412) +- Enable OpenPGP.js by default at install +- Added folder edit popup for improved IMAP ACL Support + [#157](https://github.com/the-djmaze/snappymail/issues/157) +- Process all IMAP namespaces +- Update Polish by @tinola +- Update Portuguese by @ner00 + +### Fixed +- Make time_zone a select list due to PEBKAC +- Workaround Outlook generated double spacing + [#1415](https://github.com/the-djmaze/snappymail/issues/1415) +- HTML Parser is not picking up the full Unsubscribe URL in the attached text file + [#1225](https://github.com/the-djmaze/snappymail/issues/1225) +- Contacts - it auto "Select All", after entry delete + [#1411](https://github.com/the-djmaze/snappymail/issues/1411) +- Message header parsing issue + [#1403](https://github.com/the-djmaze/snappymail/issues/1403) +- apple-touch-icon should not be transparent + [#1408](https://github.com/the-djmaze/snappymail/issues/1408) +- Creation of dynamic property is deprecated + [#1409](https://github.com/the-djmaze/snappymail/issues/1409) +- Ask/send readReceipt was broken +- OpenPGP public key can not be removed anymore after importing private key of subkey + [#1384](https://github.com/the-djmaze/snappymail/issues/1384) +- KnockoutJS failed to output text '0' +- JavaScript friendlySize() failed on 0 +- Workaround Dovecot `PREAUTH [CAPABILITY (null)]` issue +- Workaround disabled ACL could cause "Disconnected: Too many invalid IMAP commands" + +### Nextcloud +- Save multiple as .eml + [#1425](https://github.com/the-djmaze/snappymail/issues/1425) +- Disabled support for Nextcloud OpenID Connect + [#1420](https://github.com/the-djmaze/snappymail/issues/1420) + + +## 2.33.0 – 2024-01-22 + +### Added +- Feature to use the SQLite AddressBook per login account instead of global (on by default). +- Return all fetched messages headers in JSON. + +### Changed +- Docker hub use Alpine linux 3.18.5 and PHP 8.2 +- Some InvalidArgumentException to the better suited ValueError +- Removed some unused KnockoutJS code +- KnockoutJS drop unused rateLimit method +- Cleanup some data-bind="" +- Drop the disabled KnockoutJS twoWayBindings +- Drop support for KnockoutJS _ko_property_writers and for two-way binding they must be observables +- Login form use method="POST" to prevent uri exposure when javascript fails +- Merge code to generate MIME PGP parts and MIME Plain parts +- SMTP sendRequestWithCheck for future support of RFC's +- Cleanup mime header handling + +### Fixed +- Sorting not supported since 2.32.0 + [#1373](https://github.com/the-djmaze/snappymail/issues/1373) +- FILE_ON_SAVING_ERROR is not defined + [#1379](https://github.com/the-djmaze/snappymail/issues/1379) +- Saving EML files with same subject result in only saving latest email + [#1381](https://github.com/the-djmaze/snappymail/issues/1381) +- Some Sieve parser issues +- Handling of RainLoop Sieve script +- Sieve rfc5429 RejectCommand and ErejectCommand +- KnockoutJS title:value was removed, use attr:{title:value} +- dataBaseUpgrade() always runs on sqlite and pgsql +- Message was sent but not saved to sent items folder + [#1397](https://github.com/the-djmaze/snappymail/issues/1397) +- DKIM `pass` detection sometimes failed + + +## 2.32.0 – 2023-12-26 + +### Added +- Run full GetUids() in background when message_list_limit is set +- MessageListThreadsMap as background task when message_list_limit is set +- Properly set CACHEDIR.TAG +- Sending group email to all contact addresses + [#1286](https://github.com/the-djmaze/snappymail/pull/1286) by @rezaei92 + +### Changed +- Default IMAP message_list_limit to 10000 +- DoMessageCopy() return toFolder hash/etag +- Improved Squire WYSIWYG +- Sort real attachments and inline attachments for + [#1360](https://github.com/the-djmaze/snappymail/issues/1360) +- Nextcloud Theme fixes and improvements + [#1363](https://github.com/the-djmaze/snappymail/pull/1363) by @hampoelz +- Improve display of attachments + [#1361](https://github.com/the-djmaze/snappymail/issues/1361) +- Rename messageVisibility to messageVisible +- All CSS font-size to % instead of px +- Flip source code view of .eml attachments + [#1332](https://github.com/the-djmaze/snappymail/issues/1332) + +### Fixed +- Folders array_filter(): Argument 1 must be of type array, null given +- At upgrade set `static` and `themes` folder to 0755 +- Preview tooltip shows "null" when PREVIEW capability is disabled + +### Nextcloud +- Improved language handling + [#1362](https://github.com/the-djmaze/snappymail/pull/1362) by @avinash-0007 +- FilterLanguage had wrong parameter order +- Use NextcloudV25+ theme by default + + +## 2.31.0 – 2023-12-08 + +### Added +- PHP Hook `filter.language` to allow remote language selection + +### Changed +- Cleaner language detection +- Get Squire in sync with v2.2.5 and some bugfixes +- Update French by @Cwpute +- Squire: drop support for iPod + +### Fixed +- Call to undefined method FolderMyRights() + [#1344](https://github.com/the-djmaze/snappymail/issues/1344) +- NO Mailbox does not exist, or must be subscribed to") + [#1354](https://github.com/the-djmaze/snappymail/issues/1354) +- Flag indicators are added to wrong message + [#1347](https://github.com/the-djmaze/snappymail/pull/1347) by @SergeyMosin +- Squire: issue when using the enter key in a reply window + [#1296](https://github.com/the-djmaze/snappymail/issues/1296) +- Squire: crash on cut/delete range + +### Nextcloud +- Use language as defined in Nextcloud settings + [#1293](https://github.com/the-djmaze/snappymail/issues/1293) +- Plugin Call to undefined method RainLoop\Model\MainAccount::ImapConnectAndLoginHelper() +- SnappyMail failed due to Nextcloud Symfony polyfill + + +## 2.30.0 – 2023-12-04 + +### Added +- SnappyMail\SensitiveString class to secure passwords +- Allow to disable all IMAP features through Admin -> Domain +- Setting to open mails in a tab or new window + [#951](https://github.com/the-djmaze/snappymail/issues/951) +- Fully support IMAP PREVIEW + [#1338](https://github.com/the-djmaze/snappymail/issues/1338) +- Disable "Mark message as read after", offer manual toggle + [#1289](https://github.com/the-djmaze/snappymail/issues/1289) +- A "Move to" button inside message view as an icon/button and in the drop down menu. + [#1295](https://github.com/the-djmaze/snappymail/issues/1295) +- Support for IMAP WITHIN +- Support \noinferiors to disallow creating subfolders +- A test due to Failed loading libs.min.js + [#358](https://github.com/the-djmaze/snappymail/issues/358), + [#862](https://github.com/the-djmaze/snappymail/issues/862), + [#890](https://github.com/the-djmaze/snappymail/issues/890), + [#895](https://github.com/the-djmaze/snappymail/issues/895), + [#1238](https://github.com/the-djmaze/snappymail/issues/1238), + [#1320](https://github.com/the-djmaze/snappymail/issues/1320) + +### Changed +- Split PHP 8 polyfills from include.php +- Disable snappymail/v/0.0.0/static/.htaccess for now as many servers have issues with it +- Merged all Domain `disable_*` settings into `disabled_capabilities:[]` +- Prioritize LIST-EXTENDED over LSUB (LSUB deprecated in IMAP4rev2) +- Removed unused ImapClient::IsSupported() +- Removed obsolete `$_ENV['SNAPPYMAIL_NEXTCLOUD']` +- Removed unused Plugin->replaceTemplate() +- Removed openDropdownTrigger + +### Fixed +- Move to button does not work + [#1328](https://github.com/the-djmaze/snappymail/issues/1328) +- Mark passwords as sensitive information + [#1343](https://github.com/the-djmaze/snappymail/issues/1343) +- Account sSmtpPassword wrong value +- SCRAM sign-in failed + [#1245](https://github.com/the-djmaze/snappymail/issues/1245) +- Squire generates to many `

` + [#1339](https://github.com/the-djmaze/snappymail/issues/1339) +- Creation of dynamic property SnappyMail\Stream\ZipEntry::$compression is deprecated +- `json.after-*` hooks didn't send $aResponse as recursive array +- Sieve: Move to folder with trailing space does not work + [#1329](https://github.com/the-djmaze/snappymail/issues/1329) +- Squire: cantFocusEmptyTextNodes var is always undefined + [#1337](https://github.com/the-djmaze/snappymail/issues/1337) +- Squire: Remove redundant after replacing styles +- Squire: Handle empty nodes in moveRangeBoundariesDownTree +- Theme "Nextcloud V25+" can't be translated + [#1331](https://github.com/the-djmaze/snappymail/issues/1331) + + +## 2.29.4 – 2023-11-21 + +### Fixed +- Contacts not work + [#1319](https://github.com/the-djmaze/snappymail/issues/1319) + + +## 2.29.3 – 2023-11-21 + +### Added +- Docker Hub image + [#965](https://github.com/the-djmaze/snappymail/pull/965) by @leojonathanoh + +### Changed +- Sabre/VObject 4.5.4 and Sabre/Xml 4.0.4 + [#1311](https://github.com/the-djmaze/snappymail/issues/1311) + +### Fixed +- '#/mailbox/folder/mUID/search' uri/route handling + [#1301](https://github.com/the-djmaze/snappymail/pull/1301) by @SergeyMosin +- "Remember me" doesn't work when browser is closed + [#1313](https://github.com/the-djmaze/snappymail/issues/1313) +- Blank email displayed when "Prefer HTML to plain text" is unchecked and the message is html only + [#1302](https://github.com/the-djmaze/snappymail/issues/1302) +- Parent folder of Sub folder not useable. + [#1008](https://github.com/the-djmaze/snappymail/issues/1008) +- Large detailed header don't display body + [#1284](https://github.com/the-djmaze/snappymail/issues/1284) + +### Nextcloud +- Improvements for Install / update issues #929 + [#929](https://github.com/the-djmaze/snappymail/issues/929) +- Should use language as defined in cloud settings #1293 + [#1293](https://github.com/the-djmaze/snappymail/issues/1293) + + +## 2.29.2 – 2023-11-14 + +### Added +- Show size of folders in folders list #1303 + [#1303](https://github.com/the-djmaze/snappymail/issues/1303) + +### Fixed +- Configuration failed when using special chars in MySQL password #1308 + [#1308](https://github.com/the-djmaze/snappymail/issues/1308) +- With email open, "delete" doesn't delete #1274 + [#1274](https://github.com/the-djmaze/snappymail/issues/1274) +- Fix threading view in Thunderbird (others?) + [#1304](https://github.com/the-djmaze/snappymail/pull/1304) by @tkasch + + +## 2.29.1 – 2023-10-02 + +### Fixed +- Some small messages list bugs + + +## 2.29.0 – 2023-10-02 + +### Added +- Modern UI / Nextcloud Theme + [#629](https://github.com/the-djmaze/snappymail/pull/629) by @hampoelz +- "Add/Edit signature" label to PopupsIdentity.html + [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin +- use calendar icon in message list for messages with '.ics' or 'text/calendar' attachments by @SergeyMosin + [#1248](https://github.com/the-djmaze/snappymail/pull/1248) +- Show unseen message count when the message list is threaded + [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin +- in mobile mode hide folders(left) panel when a folder is clicked + [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin +- spellcheck the subject when 'allowSpellcheck' setting is true + [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin +- 'collapse_blockquotes', 'allow_spellcheck' and 'mail_list_grouped' to admin settings ('defaults' section) + [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin +- Browser support for autocompleting TOTP code + [#1251](https://github.com/the-djmaze/snappymail/issues/1251) + +### Changed +- URL strip tracking for + [#1225](https://github.com/the-djmaze/snappymail/issues/1225) +- Color picker use color blind palette "Tableau 10" by Maureen Stone by default + [#1199](https://github.com/the-djmaze/snappymail/issues/1199) +- Draft code to improve mobile breakpoints + [#1150](https://github.com/the-djmaze/snappymail/issues/1150) +- address input: space character can trigger '_parseValue' if the email address looks complete + [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin +- if applicable set '\\answered' or '$forwarded' flag after a message is sent so the proper icon is shown in the message list view + [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin + +### Fixed +- CHARSET is not valid in UTF8 mode + [#1230](https://github.com/the-djmaze/snappymail/issues/1230) +- Spam score is always "acceptable" + [#1228](https://github.com/the-djmaze/snappymail/issues/1228) +- Undefined constant PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT + [#1205](https://github.com/the-djmaze/snappymail/issues/1205) +- Fetch controller.abort(reason) handling + [#1220](https://github.com/the-djmaze/snappymail/issues/1220) +- "Request failed" on message move + [#1220](https://github.com/the-djmaze/snappymail/issues/1220) +- Unwrapped text nodes attached to squire._root + [#1234](https://github.com/the-djmaze/snappymail/pull/1234) by @SergeyMosin +- Extra wrapper div is added in Squire every time a Draft is open (or closed) after save. + [#1208](https://github.com/the-djmaze/snappymail/issues/1208) +- foreach() argument must be of type array|object + [#1237](https://github.com/the-djmaze/snappymail/issues/1237) +- `` tag 'style' is lost in replies + [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin +- unseen indicator is not shown in thread view when 'listGrouped' settings is false + [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin +- TOTP plugin is dependent on ctype + [#1250](https://github.com/the-djmaze/snappymail/issues/1250) + +### Nextcloud +- iFrame mode: click on unified search result opens inner iFrame + [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin +- set 'smremember' cookie if 'sign_me_auto' is set to 'DefaultOn' when using 'snappymail-autologin*', otherwise nextcloud users need to re-login when the browser is re-opened + [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin +- Improve UX of "Put in Calendar" option in plugin + [#1259](https://github.com/the-djmaze/snappymail/pull/1259) by @theronakpatel + + +## 2.28.4 – 2023-07-10 + +### Added +- application.ini msg_default_action + [#1204](https://github.com/the-djmaze/snappymail/pull/1204) by @SergeyMosin +- application.ini view_show_next_message + [#1204](https://github.com/the-djmaze/snappymail/pull/1204) by @SergeyMosin +- application.ini view_images + [#1204](https://github.com/the-djmaze/snappymail/pull/1204) by @SergeyMosin +- nextcloud add ability to include custom php file in InstallStep migration + [#1197](https://github.com/the-djmaze/snappymail/pull/1197) by @SergeyMosin +- Support plugin for Squire editor + [#1192](https://github.com/the-djmaze/snappymail/issues/1192) + +### Changed +- only show 'Add "domain.tld" as an application for mailto links?' message after login (firefox shows the message on every reload otherwise). + [#1204](https://github.com/the-djmaze/snappymail/issues/1204) +- Convert getPdoAccessData() : array to a RainLoop\Pdo\Settings object instance +- New bidi buttons to Squire editor + [#1200](https://github.com/the-djmaze/snappymail/pull/1200) by @rezaei92 + +### Fixed +- Undefined constant PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT + [#1205](https://github.com/the-djmaze/snappymail/issues/1205) +- 'reloadTime' function result is passed into 'setInterval' instead of the function + [#1204](https://github.com/the-djmaze/snappymail/pull/1204) by @SergeyMosin +- UNKNOWN-CTE Invalid data in MIME part + [#1186](https://github.com/the-djmaze/snappymail/issues/1186) + + +## 2.28.3 – 2023-06-22 + +### Added +- Attachments in "new window" view + [#1166](https://github.com/the-djmaze/snappymail/issues/1166) + +### Changed +- Update Portuguese by @ner00 +- Update French by @hguilbert + +### Fixed +- Some emails with inline CSS break the UI + [#1187](https://github.com/the-djmaze/snappymail/issues/1187) +- Remote.get() Promise broken by previous change + [#1185](https://github.com/the-djmaze/snappymail/issues/1185) +- Class "MailSo\Base\Exceptions\InvalidArgumentException" not found + [#1182](https://github.com/the-djmaze/snappymail/issues/1182) +- First account not showed in the right list (dropbox) + [#1180](https://github.com/the-djmaze/snappymail/issues/1180) + + +## 2.28.2 – 2023-06-19 + +### Added +- Detailed error for "Cannot access the repository at the moment" + [#1164](https://github.com/the-djmaze/snappymail/issues/1164) +- Bidi in Squire editor + [#1158](https://github.com/the-djmaze/snappymail/issues/1158) +- Translate Squire UI +- Nextcloud 27 compatibility by @LarsBel +- JWT class for handling JSON Web Tokens + +### Changed +- Update German by @cm-schl +- Update French by @hguilbert +- Update Polish by @tinola +- Merge handling of local Account Settings. Found while investigating + [#1170](https://github.com/the-djmaze/snappymail/issues/1170) +- Image max-width now 100% instead of 90vw + +### Fixed +- Cannot modify header information + [#929](https://github.com/the-djmaze/snappymail/issues/929) (comment) +- Admin Panel broken when admin_panel_host is set + [#1169](https://github.com/the-djmaze/snappymail/issues/1169) +- Invalid CSP report-uri +- Prevent MessageList multiple request at the same time + [#1071](https://github.com/the-djmaze/snappymail/issues/1071) +- Error in Addressbook Sync + [#1179](https://github.com/the-djmaze/snappymail/issues/1179) +- base64_decode() second parameter must be true + + +## 2.28.1 – 2023-06-05 + +### Changed +- Optical issue with input fields for mail and folder search + [#1149](https://github.com/the-djmaze/snappymail/issues/1149) +- Update Chinese translation + [#1157](https://github.com/the-djmaze/snappymail/pull/1157) by @mayswind +- Update Polish translation + [#1156](https://github.com/the-djmaze/snappymail/pull/1156) by @tinola + +### Fixed +- Undefined SIG constants + [#1147](https://github.com/the-djmaze/snappymail/issues/1147) + + +## 2.28.0 – 2023-05-30 + +### Added +- Threaded view make number orange when unread sub-messages + [#1028](https://github.com/the-djmaze/snappymail/issues/1028) +- Handle PHP pctnl messages +- addEventListener('rl-view-model') missing for Settings + [#1013](https://github.com/the-djmaze/snappymail/issues/1013) +- CSS `--btn-border-radius` + +### Changed +- Improved RTL languages support + [#1056](https://github.com/the-djmaze/snappymail/issues/1056) +- Composer text/attachments as tabs + [#1119](https://github.com/the-djmaze/snappymail/issues/1119) +- Filter dialog doesn't refer to folder names consistently + [#1111](https://github.com/the-djmaze/snappymail/issues/1111) +- TLS connection for MYSQL contact db + [#1078](https://github.com/the-djmaze/snappymail/issues/1078) +- Allow empty message body when there are attachments + [#1052](https://github.com/the-djmaze/snappymail/issues/1052) +- PHP inherit logger as Trait +- Update Portuguese + [#1124](https://github.com/the-djmaze/snappymail/pull/1124) by @ner00 +- Update Traditional Chinese (Taiwan) + [#1107](https://github.com/the-djmaze/snappymail/pull/1107) by @chiyi4488 +- Update Russian + [#1108](https://github.com/the-djmaze/snappymail/pull/1108) by @konkere +- Update Italian + [#1094](https://github.com/the-djmaze/snappymail/pull/1094) by @cm-schl +- Update French + [#1102](https://github.com/the-djmaze/snappymail/pull/1102) by @hguilbert +- Update German + [#1087](https://github.com/the-djmaze/snappymail/pull/1087) by @cm-schl + +### Fixed +- Show messagelist timeout/abort error for + [#1071](https://github.com/the-djmaze/snappymail/issues/1071) +- DesktopNotifications setting not saved + [#1137](https://github.com/the-djmaze/snappymail/issues/1137) +- PHP Deprecation warning for $_openPipes + [#1141](https://github.com/the-djmaze/snappymail/issues/1141) +- Images size wrong + [#1134](https://github.com/the-djmaze/snappymail/issues/1134) +- Unable to preview body of encrypted mail in mailvelope reply-to + [#1130](https://github.com/the-djmaze/snappymail/issues/1130) +- Replace ` diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html index 96f289b6a..b52152d44 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html @@ -15,11 +15,14 @@

+ +
+
@@ -28,7 +31,7 @@
-
+
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html index 63b96d0a5..130d710dc 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html @@ -1,36 +1,36 @@ - - + + - + - + - + - - + + - +
- + - - + + - - + + diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html index 2e5e27c57..d96bf34bf 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html @@ -1,19 +1,38 @@
+
+
+
+
+
+
+
@@ -46,12 +65,14 @@ + 

 	

 	

+		
 		
 	

diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index 086401273..b78891e18 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -11,8 +11,12 @@
 			
 			

+			
 		

-		

+		

 	

 
 	

@@ -20,9 +24,10 @@
 
 			
 			
 			

+				

 				

 					

 						
@@ -35,8 +40,8 @@
 						

 						
 					

 					

@@ -58,7 +63,16 @@
 						value: imapShortLogin
 					}
 				}">

-				 (user@domain.com → user)
+				 (user@example.com → user)
+				

+				

+				 (USER@example.com → user@example.com)
 
 				
SSL/TLS

 				

 
-				

-				

-				

-				

-				

-				

+				

+					
+					ⓘ
+				

+
+				

+					

+						
+					

+				

 
 				

 				

@@ -129,15 +123,27 @@
         "fast_simple_search": true,
         "force_select": false,
         "message_all_headers": false,
-        "search_filter": null,
+				

+					
+					
+				

 -->
+				

+					
+					
+				

+				

+					
+					
+				

 			

 
 			
 			
 			
 

 	
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html b/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html
index b7ebf668b..5d8177992 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html
@@ -1,3 +1,3 @@
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html
index 137c4f95c..8c5e2a30a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html
@@ -8,6 +8,23 @@
 	

 		
 		
+	

+		

+		

+			

 	

 	
 

diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
index 0df6a301b..7df69e7f7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
@@ -4,7 +4,7 @@
 
 

 	
 

diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html b/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
index ca4a720a0..9886a2963 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
@@ -1,8 +1,9 @@
-

-	

-		

+

+
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
index aed43eaa0..e1dfbbf3d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
@@ -7,7 +7,7 @@
 		
 	

 

-

 	

 		✉
@@ -25,7 +25,7 @@
 	

 	

 	

-		

+		

 			
 			
 		

diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
index aa4958b4c..3103049a1 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
@@ -1,5 +1,5 @@
-

-	

+

+	

 		
 			
 			
@@ -11,7 +11,7 @@
 			
  • 
 				
+					attr: { 'data-icon': icon, 'data-unread': unreadCount }">
 					
 					
 					
@@ -20,18 +20,24 @@
 			
    • 
 		
 		
    
-		
-		
      
+		
      
+			
+			✕
+		
      
+		
      
+			
+			
+		
      
+		
        
 		
        
 	
        
-	
        
-	
        
+	
        
 		
        
-			
+			
 		
        
 		
        
 			
-			⚙
+			⚙
 		
        
 	
        
 
        
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html
index 18e417992..35bb12f22 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html
@@ -1,13 +1,11 @@
-
 
      • 
 	
+	   css: { 'selected': selected() && !isSystemFolder(), 'system': isSystemFolder, 'selectable': canBeSelected, 'unread-sub': hasUnreadInSub, 'anim-action-class': actionBlink },
+	   attr: { 'data-unread': unreadCount, href: href }">
 		
 		
 	
-	
-	
          
+	
+	
            
 	
 
            • 
-
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index e3458780b..42521ef43 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -1,28 +1,27 @@
-
            
-	
-	❮
-	
+
            
+	
+	
 		
 	
-	
-	
+	
 		
 	
-	
            
-		
-			
-			📁
-		
-	
            
-	
            
+	
+		
+		📁
+	
+	
            
 		🗄
-		⚠
+		⚠
 		
 			
 		
 		🗑
+
 	
            
-	
            
+	
            
 		☰
 		
 			
          • 
@@ -44,7 +43,7 @@
 				
 			
            • 
 			
          • 
-				
+				
 			
            • 
 			
          • 
 				
@@ -52,6 +51,9 @@
 			
            • 
+			
 			
          • 
 				🗄
 			
            • 
@@ -64,6 +66,9 @@
 			
          • 
 				
 			
            • 
+			
          • 
+				
+			
            • 
 			
          • 
 				
 			
            • 
@@ -72,7 +77,10 @@
 			
 		            
 	
            
-	
            
+	
            
+		
            ✖⬇
            
+	
            
+	
            
 		⬇
 		
 			
          • 
@@ -99,6 +107,12 @@
 			
          • 
 				
 			
            • 
+			
+			
          • 
+				
+			
            • 
 		            
 	
            
 
            
@@ -133,19 +147,19 @@
 		
            
 			
            
 			
-			
            
+			
            
 				
            
 					
            
 				
            
 					
            
-					
            
-					
            
-					
            
+					
            
+					
            
+					
            
+					
            
 						
 					
            
-					
            
-					
            
-					
+					
            
+					
 				
            
 			
            
 			
@@ -153,19 +167,19 @@
 		
 		
 		
            
-			
            
+			
            
 				
            
 					
            
 				
            
 					
            
-					
            
-					
            
-					
            
+					
            
+					
            
+					
            
+					
            
 						
 					
            
-					
            
-					
            
-					
+					
            
+					
 				
            
 			
            
 		
            
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 0a1b44d14..f3aa8517c 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
@@ -1,147 +1,176 @@
-
            
-	
            
-		
            
-			
            
-				✖
-			
            
-			
            
-				🖉
-			
            
-			
            
-				🗄
-				⚠
-				
-					
-				
-				🗑
-			
            
-			
            
-				❮
-				❯
-			
            
-		
            
+
            
+	
            
+		✖
 	
            
-	
            
-		
            
-			
            
-		
            
-		
            
+	
            
+		🖉
+	
            
+	
            
+		🗄
+		⚠
+		
+			
+		
+		🗑
+		
            🗑
            
+	
            
+	
            
+		❮
+		❯
+	
            
+
            
+
            
+	
            
+		
            
+	
            
+	
            
 
-		
            
-		
            
+	
            
+	
            
 
-		
            
-		
            
+	
            
+	
            
 
-		
-		
            
-			
            
-				🖉
-				
            
-					
-						←
-						↞
-					
-					
            
-						☰
-						
-							
            
-								
          • 
-									
-								
            • 
-								
          • 
-									
-								
            • 
-								
          • 
-									
-								
            • 
-								
          • 
-									
-								
            • 
-								
          • 
-									
-								
            • 
-							
            
-							
            
-								
          • 
-									
-								
            • 
-								
          • 
-									
-								
            • 
-								
          • 
-									
-								
            • 
-								
          • 
-									
-										
-										
-									
-								
            • 
-								
          • 
-									
-								
            • 
-								
          • 
-									
-								
            • 
-								
-							
            
-							
            
-								
          • 
-									
-								
            • 
-								
          • 
-									
-										
-										
-									
-								
            • 
-								
          • 
-									
-								
            • 
-								
          • 
-									
-								
            • 
-								
          • 
-									
-								
            • 
-								
-								
          • 
-									
-								
            • 
-							
            
-						            
-					
            
+	
            
+		
            
+			🖉
+			
            
+				
+					←
+					↞
+				
+				
            
+					☰
+					
+						
            
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+						
            
+						
            
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
          • 
+								
+									
+									
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
+						
            
+						
            
+							
          • 
+								
+							
            • 
+							
          • 
+								
+									
+									
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
          • 
+								
+							
            • 
+							
+							
          • 
+								
+							
            • 
+						
            
+					            
 				
            
 			
            
+		
            
 
-			
            
-				
            
-					ℹ
-					
-					
-					×
-				
            
-				
            
-					
-					
+		
            
+			
            
+				ℹ
+				
+				
+				×
+			
            
+			
            
+				
+				
+				
+				
+			
            
+		
            
+		
            
+			
            
+				
            
+					
+					
            
+						
            
+							:
+							
+						
            
+						
            
+							:
+							
+						
            
+					
            
+					
            
+						:
+						
+					
            
 				
            
 				
            
 					
-							
+							
@@ -159,12 +188,12 @@
 							
-						
+						
@@ -177,102 +206,73 @@
 						
            
 						
            
 							
-								
-							
 						
            
 						
            
 							
 							
 						
            
 							
 							
-								
+								
 								 
-								()
+								()
 							
 						
            
 						
            
 					
            
 				
            
-			
            
-			
            
-				
            
-					
            
-						
-						
            
-							
            
-								:
-								
-							
            
-							
            
-								:
-								
-							
            
-						
            
-						
            
-							:
-							
-						
            
-					
            
-					
            
-					
-					
            
-						:
-						
-						
            
-							🏷
-							
-								
            
-									
          • 
-										
-									
            • 
-								
            
-								
+						            
 					
            
-					
 				
            
-				
            
+				
+			
            
+			
            
 
-					
            
-						
-						
-					
            
+				
            
+					
+					
+				
            
 
-					
            
-						
            
-							
            
-							
            
-								
-								
-								
              
-									
            • 
-										
              
-											
-											
              
-												
-													
-													
              
-													
              👁
              
-												              
-											
              
-											
              
-												
-												
              ▶
              
-											
              
+				
              
+					
              
+						
              
+						
              
+							
+							
+							
-								
-								
-								
                
-									
              • 
-										
-										
-									
                • 
-								
              
-								
-								⚙
-							
              
-
-							
              
-
+									
              
+									
              
+										
              
+										
              
+									
              
+									
              
+								
              • 
+							
            
+							
+							
+							
              
+								
            • 
+									
+									
+								
              • 
+							
            
+							
+							⚙
+							
            
 								
 									✖
 									
 								
 							
            
+						
            
 
-							
            
+						
            
+							
            
+							
            
+								 ▼
+								
+									
+									
          • 
+										
+									
            • 
+									
+								            
+							
            
 						
            
 
-						
            
-							
-							
-						
            
-						
            
-							
-							
+						
            
+							
            
+							
            
 						
            
 
-						
            
+						
            
+							
            
+								
+								
+								
            
+							
            
+						
            
+						
            
+							
            
+								
+								
+								
            
+							
            
+						
            
+
+						
            
+							
            
+								
+								
+								
            
+							
            
+						
            
+						
            
+							
            
+								
+								
+							
            
+						
            
 					
            
+
+					
            
 				
            
 			
            
 		
            
-		
 	
            
 
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
index caeb2294a..8707b7cfa 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
@@ -12,18 +12,18 @@
 	
            
 		
 		
-		
 	
            
 	
            
 		
-		
 	
            
 	
            
 		
-		
+		
 	
            
 
 
            
@@ -31,6 +31,6 @@
 		
 		
 		
-		
+		
 	
 
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
index acda0b238..c92e56714 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
@@ -1,4 +1,4 @@
-
            
+
            
 	
 		
 		
@@ -12,64 +12,70 @@
 	
 
 	
            
-		
-		
+		
+		
 		📇
 		
            
 			☰
 			
-				
          • 
+				
          • 
 					
 						
 						
 					
 				
            • 
-				
          • 
+				
          • 
 					
 						
 						
 					
 				
            • 
-				
          • 
+				
          • 
 					
 						
 						
 					
 				
            • 
-				
          • 
+				
          • 
 					
 						
 						
 					
 				
            • 
-				
          • 
+				
          • 
 					
 						
 						
 					
 				
            • 
-				
          • 
+				
          • 
+					
+						
+						
+					
+				
            • 
+				
          • 
 					
 						
 						
 					
 				
            • 
-				
          • 
-					
-						
-						
+				
          • 
+					
+						
+						
 					
 				
            • 
-				
          • 
-					
-						
-						
+				
          • 
+					
+						
+						
 					
 				
            • 
 			            
 		
            
 		
-		×
+		×
 	
            
 
            
 
            
@@ -79,11 +85,11 @@
 				
 				
 					
-					
+					
 					
 					
 					
-					
            
+					
            
 						
 						
 							
          • 
@@ -104,54 +110,37 @@
 				
 			
 			
-				
            • 
+				
 				
 					
 				
 			
 			
-				
            
+				
 				
 					
 				
 			
 			
-				
            
+				
 				
 					
 				
 			
 			
-				
            
+				
 				
-					
+					
 				
 			
 		
 		
            
-			
            
-				
-				
-				
-			
            
+			
            
 			
            
-				
+				
 					✍
 				
-				
+				
 					🔒
 				
 			
            
@@ -164,28 +153,64 @@
 		
            
 	
            
 
-	
            
-		
            
-		
              
-			
            • 
-				
              
-					
-					
              
-					
              
-				
              
-				
              
-					×
-					
              
-					
-				
              
-			
              • 
-		
            
-		
            
+	
            
+		
+		
+		
            
+			
            
+		
            
+
+		
+		
+		
+
+		
+		
+		
 	
            
-
-	
            
-
-	
            
 
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
index bc6381caf..cfd3ee2ac 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
@@ -63,7 +63,7 @@
 				
            
 					
            
 						
            
-						
            
+						
            
 					
            
 				
            
 			
            
@@ -91,49 +91,56 @@
 					
            
 						
 						
            
-							
            
+							
            
 								
 								
+									data-bind="textInput: givenName" data-i18n="[placeholder]CONTACTS/FIRST_NAME">
 							
            
-							
            
+							
            
 								
 								
+									data-bind="textInput: surName" data-i18n="[placeholder]CONTACTS/LAST_NAME">
 							
            
-
+							
            
 							
            
 								
 								
+									data-bind="textInput: nickname" data-i18n="[placeholder]CONTACTS/NICK_NAME">
 							
            
 						
            
 					
            
-					
            
+					
            
 						
 						
            
+							
+
 							
            
 								
            
 									
@@ -247,7 +254,7 @@
 					data-i18n="CONTACTS/TAB_CRYPTO">
 				
            
 					
            
-						
+						
 						
 					
            
 					
            
-						
+						
 						
 	
            
 		
            
-			
            
+			
            
 			🗑
 		
            
@@ -37,8 +37,8 @@
 
 	
            
 	
-	
            
+	
            
 
 
            
-	
+	
 
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolder.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolder.html
new file mode 100644
index 000000000..2f9636029
--- /dev/null
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolder.html
@@ -0,0 +1,87 @@
+
            
+	×
+	
            
+
            
+
            
+	
            
+		
+		
+	
            
+	
            
+		
+		
+	
            
+	
            
+		
+		
            
+			
+			
            
+		
            
+		
+		
            
+			
+			
+		
            
+		
            
+			
+			
+			/ 
+		
            
+		
+		
            
+			
+			
            
+		
            
+		
+		
+		
            
+			
+			
+		
            
+		
+	
            
+	
            
+		
+		
            
+			
+				
+				
+					
+					
+				
+				
+				
+			
            
+						
+						
+						
+					
            
+					
+				
            
+		
            
+	
            
+
            
+
            
+	
+
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderACL.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderACL.html
new file mode 100644
index 000000000..17ee2f43e
--- /dev/null
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderACL.html
@@ -0,0 +1,78 @@
+
            
+	×
+	
            ACL: 
            
+
            
+
            
+	
            
+		
+		
+		
+	
            
+	
            
+		
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+
+		
+			
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+
+		
+			
+			
+		
+		
+			
+			
+		
+		
            
+	
            
+
            
+
            
+	
+	
+
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
index 1044964b2..3d45ab8b3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
@@ -5,20 +5,21 @@
 
            
 	
            
 		
-		
 	
            
 	
            
 		
-		
+			required="" pattern="^[^\\/]+$" data-bind="textInput: name">
 	
            
 	
            
 
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
index 34a09d9b6..b8d8ad6cc 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
@@ -6,27 +6,27 @@
 	
            
 		
            
 		
            
-			
+			
 			
 		
            
 		
            
-			
+			
 			
 		
            
 		
            
-			
+			
 			
 		
            
 		
            
-			
+			
 			
 		
            
 		
            
-			
+			
 			
 		
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
index 39f0d5034..6d0855ff3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
@@ -1,72 +1,145 @@
 
            
-	×
+	×
 	
            
 	
            
 
            
 
            
-	
            
-		
            
-			×
-			
-		
            
-		
            
-			
-			
            
-				
            
-				
+		×
+		
+	
            
+
+	
            
+		
+		
+		
            
+			
            
+				
+				
+					data-bind="value: name, hasfocus: $root.nameFocused">
+			
            
+			
            
+				
+				
            
+					
            
+					
+				
            
+			
            
+			
            
+				
+				
            
+					
+				
            
 			
            
 		
            
-		
            
-			
-			
+
+		
+		
+		
            
+			
            
+			
            
 		
            
-		
            
-			
-			
+
+		
+		
+		
            
+			
            
+				
            
+			
            
+			
            
+				
            
+			
            
+
+			
            
+				S/MIME
+				
            
+					
+					
+				
            
+
+				
            
+					
+					
+				
            
+				
            
+					
+					
+				
            
+				
            
+					
+					
+				
            
+				
            
+					
+					
+				
            
+			
            
 		
            
-		
            
-			
-			
-		
            
-		
            
-			
            
-				
-					
-					  
-				
-				
-					
-				
+
+		
+		
+		
            
+			
            
+				
+				
+			
            
+			
            
+				
+				
+			
            
+			
            
+				
+				
 			
            
 		
            
 	
            
-	
            
-	
            
-		
            
-	
            
-	
            
 
 
            
 	
 
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsKeyboardShortcutsHelp.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsKeyboardShortcutsHelp.html
index 45fd10da8..fe72daaee 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsKeyboardShortcutsHelp.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsKeyboardShortcutsHelp.html
@@ -21,7 +21,7 @@
 				↞A, Shift + Reply
 				→F, Fwd
 				→Shift + F, Shift + Fwd
-				F1, Help
+				F1, Help
 			
 			
 		
            
@@ -65,6 +65,7 @@
 			
 				Enter, Open
 				B
+				Shift + B
 				Esc, Close
 				Esc, Close
 				Shift + Tab, Esc
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html
index 53a4a90ae..77f0a3ec8 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html
@@ -35,7 +35,7 @@
 		
            
@@ -43,7 +43,7 @@
 		
            
@@ -51,7 +51,7 @@
 		
            
@@ -59,7 +59,7 @@
 		
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html
index bb06dc592..c90fb4d73 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpImport.html
@@ -2,13 +2,17 @@
 	×
 	
            
 
-
            
+
 	
            
+	
            
+		
+		
+		
+	
            
 	
            
-		
+		
 	
            
 	
            
-
 		
            
 
 
            
-	
            
-		
            
-			
            
-		
            
-	
            
+	
            
 
            
 
            
 	
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSMimeImport.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSMimeImport.html
new file mode 100644
index 000000000..c7a80814c
--- /dev/null
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSMimeImport.html
@@ -0,0 +1,13 @@
+
            
+	×
+	
            
+
            
+
+	
            
+	
            
+		
+	
            
+
+
            
+	
+
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
index f162bc8af..3c0e2ff12 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
@@ -11,7 +11,7 @@
 
 	
            
 		
 	
            
@@ -61,7 +61,7 @@
 							data-i18n="GLOBAL/ARE_YOU_SURE">
 					
 					
-						🗑
+						🗑
 					
 				
 			
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
index 5065cad36..9b5c1689c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
@@ -16,13 +16,13 @@
 		
 	
 	
-		
-			
-			
-		
-			
-			
+			
+				
+				
+				
+				
+				
@@ -39,8 +39,8 @@
 				
+				
-			
            
 		
            
 				
 					⬍
 				
 					🗑
 				
 			
            
 		            
 	
            
 
            
@@ -52,14 +52,13 @@
 	
 	
-			
+			
-		
-			
-			
+			
+			
@@ -34,14 +33,14 @@
 		
-			
-			
+			
+			
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html
index a9992de2e..ad5a4ca84 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html
@@ -3,7 +3,7 @@
 		name: 'Checkbox',
 		params: {
 			label: 'POPUPS_FILTER/STOP_LABEL',
-			value: actionNoStop
+			value: stop
 		}
 	}">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
index de2297a29..5d8b2392f 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
@@ -8,21 +8,21 @@
 			name: 'Checkbox',
 			params: {
 				label: 'POPUPS_FILTER/KEEP_LABEL',
-				value: actionKeep
+				value: keep
 			}
 		}">
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
index dc0fa8b31..2493b15e7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
@@ -8,14 +8,14 @@
 			name: 'Checkbox',
 			params: {
 				label: 'POPUPS_FILTER/MARK_AS_READ_LABEL',
-				value: actionMarkAsRead
+				value: markAsRead
 			}
 		}">
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html
index a9992de2e..ad5a4ca84 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html
@@ -3,7 +3,7 @@
 		name: 'Checkbox',
 		params: {
 			label: 'POPUPS_FILTER/STOP_LABEL',
-			value: actionNoStop
+			value: stop
 		}
 	}">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
index f3783c4bb..d96367be2 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
@@ -6,7 +6,7 @@
 			name: 'Checkbox',
 			params: {
 				label: 'POPUPS_FILTER/STOP_LABEL',
-				value: actionNoStop
+				value: stop
 			}
 		}">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
index 1a2275c23..1c84affd4 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
@@ -28,7 +28,7 @@
 		name: 'Checkbox',
 		params: {
 			label: 'POPUPS_FILTER/STOP_LABEL',
-			value: actionNoStop
+			value: stop
 		}
 	}">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
index 9e5357f2d..4dbbac6ed 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
@@ -1,13 +1,8 @@
 
-	
            
 		
            
 				
 					⬍
 				
 				
-					
-					  
-					
+					
+					
 				
 				
 					
 	
+	
            
+		
+		
+	
            
+	
            
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
index 63599556c..c1472276f 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
@@ -23,10 +23,9 @@
 	
            
 	
 		
            
 		
            		
 			
 			
 		
            
 		
 		
            		
 			
-				
 			
 			
-				🗑
+				🗑
 			
 		
            
 		
 
 		
 		
 	
 		
 	
 
 	
 
            
-		
-		
-		 
-		
+	
+		
+		
+		
 	
 	
 		
-	
            
+	
            
 	
            
 		
 		
@@ -36,6 +36,27 @@
 			}
 		}">
            
 	
+	
            
+		
+		
            
+			
+			
+			
+		
            
+	
            
+	
            
+		
            
+			
            
+		
            
+	
            
+
+	
            
 	
            
 		
 		
            
@@ -44,6 +65,11 @@
 			
 		
            
 	
            
+	
            
+		
+		
+		
+	
            
 	
            
 		
            
 			
            
-			
            
 		
            
 	
            
-
-	
            
-	
            
-		
-		
            
-	
            
-	
            
-		
            
-			
            
-			
            
-			
            
-			
            
-			
            
-		
            
+	
            
+		
+		
 	
            
 
 	
            
 	
            
-		
+		
            
 		
            
 			
 			 
@@ -166,15 +141,8 @@
 			
            
-			
            
 			
            
+			
            
+			
            
 			
            
 			
+			
            
+			
            
 		
            
 	
            
+	
            
+		
+		
            
+			
+			px 
+			
+		
            
+	
            
+	
            
+		
+		
            
+			
+			 
+			
+		
            
+	
            
+
+	
            
+		
+		
            
+			
+		
            
+	
            
+	
            
+		
+		
            
+			
+		
            
+	
            
+
+	
            
+	
            
+		
+		
            
+	
            
+	
            
+		
+		
            
+	
            
+
+	
            
+		
            
+			
            
+			
            
+			
            
+			
            
+			
            
+			
            
+			
            
+			
            
+		
            
+	
            
+
+	
 
 	
            
 	
            
@@ -210,7 +330,7 @@
 					name: 'Checkbox',
 					params: {
 						label: 'SETTINGS_GENERAL/CHROME_NOTIFICATION_DESC',
-						value: desktopNotification,
+						value: desktopNotifications,
 						enable: isDesktopNotificationAllowed
 					}
 				}">
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
index a2143ff34..ecb58d083 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
@@ -1,7 +1,7 @@
-
            
 	
+	
            
+		
+		
            
+	
            
 
 
 
            OpenPGP
            
@@ -22,29 +35,16 @@
 
 
 
-
            
-
            
-
            
-	
            
-
            
-
            
-
 
-
            
-GnuPG
+
            
+GnuPG
 
+		
+			
+			
+			
+		
            
 	
            Private keys
            
 	
 		
            
 			
-				✍
-				🔓
+				✍
+				🔓
 				
 				
 				
@@ -58,13 +58,27 @@
 				🗑
 			
 		
            
+				🔒
+				
+				🔑
+			
+				
+			
+				🗑
+			
            
 	            
 	
            Public keys
            
 	
 		
            
 			
-				✔
-				🔒
+				✔
+				🔒
 				
 				
 				
@@ -84,8 +98,8 @@
 
 
 
-
            
-OpenPGP.js
+
            
+OpenPGP.js
 
@@ -105,6 +119,20 @@
 				🗑
+		
+			
+			
+			
+		
@@ -126,11 +154,42 @@
 		
            
 	
            Private keys
            
 	
 			
 		
            
+				🔒
+				
+				🔑
+			
+				
+			
+				🗑
+			
            
 	            
 	
            Public keys
            
 	
 	
 
            
+
 
            
 
 
-
            
-Mailvelope
+
            
+Mailvelope
 
 
            
 
            
+
+
            
+
+
+
+
+	
+		
+			
+
+		
+	
+
            
+				✔
+				🔒
+				
+				
+				
            
+				:
+				
+			
            
+
            
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
index 6b6d78fd5..b274a0821 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
@@ -15,7 +15,7 @@
 	
            
 		
 		
-			
+			
 			
 			
 			
@@ -35,7 +35,7 @@
 	
            
 		
 		
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
index 6d920eb77..dbc72954d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
@@ -4,10 +4,10 @@
 		
            
 		⏸
 	
            
-	
            
-	
            
+	
            
 		
-			👤
+			
+			👤
 
 			
          • 
-				
 			
            • 
 			
@@ -30,16 +30,12 @@
 				
 			
 			
          • 
-				
+				
 			
            • 
 			
          • 
-				
+				
 			
            • 
 			
-			
          • 
 				
 			
            • 
 		
diff --git a/snappymail/v/0.0.0/cpanel.php b/snappymail/v/0.0.0/cpanel.php
index 03ed67ac2..4159a4a2d 100644
--- a/snappymail/v/0.0.0/cpanel.php
+++ b/snappymail/v/0.0.0/cpanel.php
@@ -1,21 +1,18 @@
 Set('plugins', 'enable', true);
-	$oConfig->Set('plugins', 'enabled_list', \implode(',', \array_unique($aList)));
 	$oConfig->Set('login', 'default_domain', 'cpanel');
 	$oConfig->Set('logs', 'path', $_ENV['HOME'] . '/logs/snappymail');
 	$oConfig->Set('cache', 'path', $_ENV['TMPDIR'] . '/snappymail');
-	$oConfig->Save();
+
+	\SnappyMail\Repository::installPackage('plugin', 'login-cpanel');
+	\SnappyMail\Repository::enablePackage('login-cpanel');
 
 	$sFile = APP_PRIVATE_DATA.'domains/cpanel.json';
 	if (!file_exists($sFile)) {
@@ -25,9 +22,9 @@ if (defined('APP_PLUGINS_PATH') && !empty($_ENV['CPANEL']) && !is_dir(APP_PLUGIN
 		file_put_contents($sFile, json_encode($config, JSON_PRETTY_PRINT));
 	}
 
-//	\RainLoop\Api::Actions()->Plugins()->loadPlugin('login-remote');
+//	\RainLoop\Api::Actions()->Plugins()->loadPlugin('login-cpanel');
 	if (!isset($_GET['installed'])) {
-		\header('Location: ?RemoteAutoLogin&installed');
+		\header('Location: ?cPanelAutoLogin&installed');
 		exit;
 	}
 
diff --git a/snappymail/v/0.0.0/imapsync.php b/snappymail/v/0.0.0/imapsync.php
index 2325afc73..3fcc1012c 100755
--- a/snappymail/v/0.0.0/imapsync.php
+++ b/snappymail/v/0.0.0/imapsync.php
@@ -13,7 +13,7 @@ imapsync.php \
 
 use MailSo\Net\Enumerations\ConnectionSecurityType as SecurityType;
 
-if (4 > \count($_SERVER['argv']) || \in_array('--help', $_SERVER['argv'])) {
+if ('cli' !== PHP_SAPI || 4 > \count($_SERVER['argv']) || \in_array('--help', $_SERVER['argv'])) {
 echo 'OPTIONS
 
     usage: imapsync.php [options]
@@ -154,8 +154,6 @@ function getImapClient(int $host)
 {
 	global $options;
 
-	$oConfig = \RainLoop\API::Config();
-
 	$type = SecurityType::AUTO_DETECT;
 	if (isset($options["tls{$host}"])) {
 		$type = SecurityType::STARTTLS;
@@ -168,6 +166,7 @@ function getImapClient(int $host)
 		'host' => $options["host{$host}"] ?? 'localhost',
 		'port' => $options["port{$host}"] ?? 143,
 		'type' => $type,
+//		'sasl' => [],
 		'ssl' => []
 	]);
 	if (993 === $ImapSettings->port) {
@@ -178,24 +177,13 @@ function getImapClient(int $host)
 	if (isset($options["timeout{$host}"])) {
 		$ImapSettings->timeout = (int) $options["timeout{$host}"];
 	}
-	if ($oConfig->Get('labs', 'sasl_allow_scram_sha', false)) {
-		\array_push($ImapSettings->SASLMechanisms, 'SCRAM-SHA3-512', 'SCRAM-SHA-512', 'SCRAM-SHA-256', 'SCRAM-SHA-1');
-	}
-	if ($oConfig->Get('labs', 'sasl_allow_cram_md5', false)) {
-		$ImapSettings->SASLMechanisms[] = 'CRAM-MD5';
-	}
-	if ($oConfig->Get('labs', 'sasl_allow_plain', true)) {
-		$ImapSettings->SASLMechanisms[] = 'PLAIN';
-	}
-	$ImapSettings->Login = $options["user{$host}"];
+	$ImapSettings->Login = $options["user{$host}"]; // convert to punycode?
 	$ImapSettings->Password = $options["password{$host}"];
-//	$ImapSettings1->ProxyAuthUser = '';
-//	$ImapSettings1->ProxyAuthPassword = '';
 	$ImapSettings->useAuth = true;
 
 	$oImapClient = new \MailSo\Imap\ImapClient;
 //	$oAccount = new \RainLoop\Model\Account;
-	$oImapClient->SetLogger(\RainLoop\API::Logger());
+	$oImapClient->SetLogger(\RainLoop\Api::Logger());
 //	$oPlugins->RunHook('imap.before-connect', array($oAccount, $oImapClient, $ImapSettings));
 	$oImapClient->Connect($ImapSettings);
 //	$oPlugins->RunHook('imap.after-connect', array($oAccount, $oImapClient, $ImapSettings));
diff --git a/snappymail/v/0.0.0/include.php b/snappymail/v/0.0.0/include.php
index 98d5b3b6c..724c81312 100644
--- a/snappymail/v/0.0.0/include.php
+++ b/snappymail/v/0.0.0/include.php
@@ -3,35 +3,12 @@ if (defined('APP_VERSION_ROOT_PATH')) {
 	return;
 }
 
-if (function_exists('sys_getloadavg')) {
-	$load = sys_getloadavg();
-	if ($load && $load[0] > 95) {
-		header('HTTP/1.1 503 Service Unavailable');
-		header('Retry-After: 120');
-		exit('Mailserver too busy. Please try again later.');
-	}
-	unset($load);
+if (!extension_loaded('ctype')) {
+	require __DIR__ . '/app/libraries/polyfill/ctype.php';
 }
 
-// PHP 8
-if (!function_exists('str_contains')) {
-	function str_contains(string $haystack, string $needle) : bool
-	{
-		return false !== strpos($haystack, $needle);
-	}
-}
-if (!function_exists('str_starts_with')) {
-	function str_starts_with(string $haystack, string $needle) : bool
-	{
-		return 0 === strncmp($haystack, $needle, strlen($needle));
-	}
-}
-if (!function_exists('str_ends_with')) {
-	function str_ends_with(string $haystack, string $needle) : bool
-	{
-		$length = strlen($needle);
-		return $length ? substr($haystack, -$length) === $needle : true;
-	}
+if (!extension_loaded('intl')) {
+	require __DIR__ . '/app/libraries/polyfill/intl.php';
 }
 
 if (!defined('APP_VERSION')) {
@@ -48,8 +25,8 @@ if (!defined('APP_INDEX_ROOT_PATH')) {
 // revoke permissions
 umask(0077);
 
-ini_set('register_globals', 0);
-ini_set('xdebug.max_nesting_level', 500);
+ini_set('register_globals', '0');
+ini_set('xdebug.max_nesting_level', '500');
 
 define('APP_VERSION_ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 
@@ -84,14 +61,13 @@ if (!defined('APP_CONFIGURATION_NAME')) {
 }
 unset($sCustomConfiguration);
 
-$sData = is_file(APP_DATA_FOLDER_PATH.'DATA.php') ? file_get_contents(APP_DATA_FOLDER_PATH.'DATA.php') : '';
-define('APP_PRIVATE_DATA', APP_DATA_FOLDER_PATH.'_data_'.($sData ? md5($sData) : '').'/'.APP_PRIVATE_DATA_NAME.'/');
+//$sData = is_file(APP_DATA_FOLDER_PATH.'DATA.php') ? file_get_contents(APP_DATA_FOLDER_PATH.'DATA.php') : '';
+//define('APP_PRIVATE_DATA', APP_DATA_FOLDER_PATH.'_data_'.($sData ? md5($sData) : '').'/'.APP_PRIVATE_DATA_NAME.'/');
+define('APP_PRIVATE_DATA', APP_DATA_FOLDER_PATH.'_data_/'.APP_PRIVATE_DATA_NAME.'/');
 define('APP_PLUGINS_PATH', APP_PRIVATE_DATA.'plugins/');
 
 ini_set('default_charset', 'UTF-8');
 ini_set('internal_encoding', 'UTF-8');
-mb_internal_encoding('UTF-8');
-mb_language('uni');
 
 if (!defined('SNAPPYMAIL_LIBRARIES_PATH')) {
 	define('SNAPPYMAIL_LIBRARIES_PATH', rtrim(realpath(__DIR__), '\\/').'/app/libraries/');
@@ -120,6 +96,9 @@ if (APP_VERSION !== (is_file(APP_DATA_FOLDER_PATH.'INSTALLED') ? file_get_conten
 	include __DIR__ . '/setup.php';
 }
 
+mb_internal_encoding('UTF-8');
+mb_language('uni');
+
 $sSalt = is_file(APP_DATA_FOLDER_PATH.'SALT.php') ? trim(file_get_contents(APP_DATA_FOLDER_PATH.'SALT.php')) : '';
 if (!$sSalt) {
 	// random salt
@@ -140,36 +119,15 @@ if (empty($_SERVER['HTTPS']) || 'off' === $_SERVER['HTTPS']) {
 if (isset($_SERVER['REQUEST_SCHEME']) && 'https' === $_SERVER['REQUEST_SCHEME']) {
 	$_SERVER['HTTPS'] = 'on';
 }
-if (isset($_SERVER['HTTPS'])) {
+if (isset($_SERVER['HTTPS']) && !headers_sent()) {
 	header('Strict-Transport-Security: max-age=31536000');
 }
 
-// See https://github.com/kjdev/php-ext-brotli
-if (!ini_get('zlib.output_compression') && !ini_get('brotli.output_compression')) {
-	if (defined('USE_BROTLI') && is_callable('brotli_compress_add') && false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br')) {
-		ob_start(function(string $buffer, int $phase){
-			static $resource;
-			if ($phase & PHP_OUTPUT_HANDLER_START) {
-				header('Content-Encoding: br');
-				$resource = brotli_compress_init(/*int $quality = 11, int $mode = BROTLI_GENERIC*/);
-			}
-			return brotli_compress_add($resource, $buffer, ($phase & PHP_OUTPUT_HANDLER_FINAL) ? BROTLI_FINISH : BROTLI_PROCESS);
-		});
-	} else if (defined('USE_GZIP')) {
-		ob_start('ob_gzhandler');
-	}
-}
-
 // cPanel https://github.com/the-djmaze/snappymail/issues/697
 if (!empty($_ENV['CPANEL']) && !is_dir(APP_PLUGINS_PATH.'login-remote')) {
 	require __DIR__ . '/cpanel.php';
 }
 
-if (class_exists('RainLoop\\Api')) {
-	RainLoop\Api::Handle();
-	// NextCloud/OwnCloud?
-	if (empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API'])) {
-		RainLoop\Service::Handle();
-		exit(0);
-	}
+if (empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API'])) {
+	RainLoop\Service::Handle();
 }
diff --git a/snappymail/v/0.0.0/setup.php b/snappymail/v/0.0.0/setup.php
index 0853856c0..e02250ab3 100644
--- a/snappymail/v/0.0.0/setup.php
+++ b/snappymail/v/0.0.0/setup.php
@@ -1,65 +1,21 @@
 [301] ' . $result . '
            ';
+	exit(301);
+}
+
+$result = \SnappyMail\Integrity::phpExtensions();
+if ($result) {
+	echo '
            [302] The following PHP extensions are not available in your PHP configuration!
            ';
+	echo '
            • ' . \implode('
              • li>
            • ', $result) . '
            ';
+	exit(302);
+}
+
 if (defined('APP_VERSION')) {
-	if (PHP_VERSION_ID < 70400) {
-		echo '
            ';
-		echo '[301] Your PHP version ('.PHP_VERSION.') is lower than the minimal required 7.4.0!';
-		echo '
            ';
-		exit(301);
-	}
-	if (PHP_INT_SIZE < 8) {
-		echo '
            ';
-		echo '[301] Your PHP version is 32bit, 64bit is required!';
-		echo '
            ';
-		exit(301);
-	}
-
-	$aOptional = array(
-		'cURL'    => extension_loaded('curl'),
-		'exif'    => extension_loaded('exif'),
-		'finfo'   => class_exists('finfo'),
-		'gd'      => extension_loaded('gd'),
-		'gnupg'   => extension_loaded('gnupg'),
-		'gmagick' => extension_loaded('gmagick'),
-		'imagick' => extension_loaded('imagick'),
-		'iconv'   => function_exists('iconv'),
-		'intl'    => function_exists('idn_to_ascii'),
-		'ldap'    => extension_loaded('ldap'),
-		'OpenSSL' => extension_loaded('openssl'),
-		'mysql'   => extension_loaded('pdo_mysql'),
-		'pgsql'   => extension_loaded('pdo_pgsql'),
-		'redis'   => extension_loaded('redis'),
-		'Sodium'  => extension_loaded('sodium'),
-		'sqlite'  => extension_loaded('pdo_sqlite'),
-		'tidy'    => extension_loaded('tidy'),
-		'uuid'    => extension_loaded('uuid'),
-		'xxtea'   => extension_loaded('xxtea'),
-		'zip'     => extension_loaded('zip')
-	);
-
-	$aRequirements = array(
-		'mbstring' => extension_loaded('mbstring'),
-		'Zlib'     => extension_loaded('zlib'),
-		// enabled by default:
-		'json'     => function_exists('json_decode'),
-		'libxml'   => function_exists('libxml_use_internal_errors'),
-		'dom'      => class_exists('DOMDocument')
-		// https://github.com/the-djmaze/snappymail/issues/392
-//		'phar'     => class_exists('PharData')
-	);
-
-	if (in_array(false, $aRequirements)) {
-		echo '
            [302] The following PHP extensions are not available in your PHP configuration!
            ';
-		echo '
              ';
-		foreach ($aRequirements as $sKey => $bValue) {
-			if (!$bValue) {
-				echo '
            • '.$sKey.'
              • ';
-			}
-		}
-		echo '
            ';
-		exit(302);
-	}
-
 	$sCheckName = 'delete_if_you_see_it_after_install';
 	$sCheckFolder = APP_DATA_FOLDER_PATH.$sCheckName;
 	$sCheckFilePath = APP_DATA_FOLDER_PATH.$sCheckName.'/'.$sCheckName.'.file';
@@ -67,10 +23,12 @@ if (defined('APP_VERSION')) {
 	is_file($sCheckFilePath) && unlink($sCheckFilePath);
 	is_dir($sCheckFolder) && rmdir($sCheckFolder);
 
-	if (!is_dir(APP_DATA_FOLDER_PATH)) {
-		mkdir(APP_DATA_FOLDER_PATH, 0700, true);
-	} else {
-		chmod(APP_DATA_FOLDER_PATH, 0700);
+	if (is_writable(dirname(APP_DATA_FOLDER_PATH))) {
+		if (is_dir(APP_DATA_FOLDER_PATH)) {
+			chmod(APP_DATA_FOLDER_PATH, 0700);
+		} else {
+			mkdir(APP_DATA_FOLDER_PATH, 0700, true);
+		}
 	}
 
 	$sTest = '';
@@ -78,31 +36,36 @@ if (defined('APP_VERSION')) {
 	{
 		case !is_dir(APP_DATA_FOLDER_PATH):
 			$sTest = 'is_dir';
+			error_log('Data folder permission error is_dir('.APP_DATA_FOLDER_PATH.')');
 			break;
 		case !is_readable(APP_DATA_FOLDER_PATH):
 			$sTest = 'is_readable';
+			error_log('Data folder permission error is_readable('.APP_DATA_FOLDER_PATH.')');
 			break;
-		case !is_writable(APP_DATA_FOLDER_PATH):
-			$sTest = 'is_writable';
-			break;
+//		case !is_writable(APP_DATA_FOLDER_PATH):
+//			$sTest = 'is_writable';
+//			error_log('Data folder permission error is_writable('.APP_DATA_FOLDER_PATH.')');
+//			break;
 		case !mkdir($sCheckFolder, 0700):
 			$sTest = 'mkdir';
+			error_log("Data folder permission error mkdir({$sCheckFolder})");
 			break;
 		case false === file_put_contents($sCheckFilePath, time()):
+			error_log("Data folder permission error file_put_contents({$sCheckFilePath})");
 			$sTest = 'file_put_contents';
 			break;
 		case !unlink($sCheckFilePath):
+			error_log("Data folder permission error unlink({$sCheckFilePath})");
 			$sTest = 'unlink';
 			break;
 		case !rmdir($sCheckFolder):
+			error_log("Data folder permission error rmdir({$sCheckFolder})");
 			$sTest = 'rmdir';
 			break;
 	}
 
-	if (!empty($sTest))
-	{
-		echo '[202] Data folder permissions error ['.$sTest.']';
-		error_log("Data folder permission error {$sTest}({$sCheckFolder})");
+	if (!empty($sTest)) {
+		echo "[202] {$sTest}() failed";
 		exit(202);
 	}
 
@@ -146,7 +109,7 @@ if (defined('APP_VERSION')) {
 			}
 		}
 
-		$sName = \SnappyMail\IDN::toAscii(mb_strtolower(gethostname()));
+		$sName = idn_to_ascii(mb_strtolower(gethostname()));
 		$sFile = APP_PRIVATE_DATA.'domains/'.$sName.'.json';
 		if (!file_exists($sFile) && !file_exists(APP_PRIVATE_DATA.'domains/'.$sName.'.ini')) {
 			$config = json_decode(file_get_contents(__DIR__ . '/app/domains/default.json'), true);
diff --git a/assets/android-icon.png b/snappymail/v/0.0.0/static/android-icon.png
similarity index 100%
rename from assets/android-icon.png
rename to snappymail/v/0.0.0/static/android-icon.png
diff --git a/snappymail/v/0.0.0/static/apache.htaccess b/snappymail/v/0.0.0/static/apache.htaccess
new file mode 100644
index 000000000..765213af9
--- /dev/null
+++ b/snappymail/v/0.0.0/static/apache.htaccess
@@ -0,0 +1,52 @@
+
+	
+		
+			RewriteEngine On
+
+			RewriteCond %{HTTP:Accept-encoding} br
+			RewriteCond "%{REQUEST_FILENAME}.br" -s
+			RewriteRule "^(.+\.js)$" "%{REQUEST_URI}.br" [L,T=application/javascript,QSA]
+
+			RewriteCond %{HTTP:Accept-encoding} gzip
+			RewriteCond "%{REQUEST_FILENAME}.gz" -s
+			RewriteRule "^(.+\.js)$" "%{REQUEST_URI}.gz" [L,T=application/javascript,QSA]
+
+			RewriteCond %{HTTP:Accept-encoding} br
+			RewriteCond "%{REQUEST_FILENAME}.br" -s
+			RewriteRule "^(.+\.css)$" "%{REQUEST_URI}.br" [L,T=text/css,QSA]
+
+			RewriteCond %{HTTP:Accept-encoding} gzip
+			RewriteCond "%{REQUEST_FILENAME}.gz" -s
+			RewriteRule "^(.+\.css)$" "%{REQUEST_URI}.gz" [L,T=text/css,QSA]
+
+			
+				SetEnv no-gzip 1
+				SetEnv no-brotli 1
+				# Serve correct encoding type.
+				Header append Content-Encoding br
+				# Force proxies to cache brotli &
+				# non-brotli css/js files separately.
+				Header append Vary Accept-Encoding
+			
+
+			
+				SetEnv no-gzip 1
+				SetEnv no-brotli 1
+				# Serve correct encoding type.
+				Header append Content-Encoding gzip
+				# Force proxies to cache gzipped &
+				# non-gzipped css/js files separately.
+				Header append Vary Accept-Encoding
+			
+
+			
+				Header set Content-Type "application/javascript; charset=utf-8"
+				ForceType application/javascript
+			
+			
+				Header set Content-Type "text/css; charset=utf-8"
+				ForceType text/css
+			
+		
+	
+
diff --git a/snappymail/v/0.0.0/static/apple-touch-icon.png b/snappymail/v/0.0.0/static/apple-touch-icon.png
new file mode 100644
index 000000000..a0f4c3c34
Binary files /dev/null and b/snappymail/v/0.0.0/static/apple-touch-icon.png differ
diff --git a/assets/favicon-light.ico b/snappymail/v/0.0.0/static/favicon-light.ico
similarity index 100%
rename from assets/favicon-light.ico
rename to snappymail/v/0.0.0/static/favicon-light.ico
diff --git a/assets/favicon-light.png b/snappymail/v/0.0.0/static/favicon-light.png
similarity index 100%
rename from assets/favicon-light.png
rename to snappymail/v/0.0.0/static/favicon-light.png
diff --git a/assets/favicon.ico b/snappymail/v/0.0.0/static/favicon.ico
similarity index 100%
rename from assets/favicon.ico
rename to snappymail/v/0.0.0/static/favicon.ico
diff --git a/assets/favicon.png b/snappymail/v/0.0.0/static/favicon.png
similarity index 100%
rename from assets/favicon.png
rename to snappymail/v/0.0.0/static/favicon.png
diff --git a/assets/favicon.svg b/snappymail/v/0.0.0/static/favicon.svg
similarity index 100%
rename from assets/favicon.svg
rename to snappymail/v/0.0.0/static/favicon.svg
diff --git a/assets/css/images/icon-message-notification.png b/snappymail/v/0.0.0/static/images/icon-message-notification.png
similarity index 100%
rename from assets/css/images/icon-message-notification.png
rename to snappymail/v/0.0.0/static/images/icon-message-notification.png
diff --git a/assets/css/images/snappymail-logo.png b/snappymail/v/0.0.0/static/images/snappymail-logo.png
similarity index 100%
rename from assets/css/images/snappymail-logo.png
rename to snappymail/v/0.0.0/static/images/snappymail-logo.png
diff --git a/assets/logo-512.png b/snappymail/v/0.0.0/static/logo-512.png
similarity index 100%
rename from assets/logo-512.png
rename to snappymail/v/0.0.0/static/logo-512.png
diff --git a/assets/manifest.json b/snappymail/v/0.0.0/static/manifest.json
similarity index 100%
rename from assets/manifest.json
rename to snappymail/v/0.0.0/static/manifest.json
diff --git a/assets/sounds/alert.mp3 b/snappymail/v/0.0.0/static/sounds/alert.mp3
similarity index 100%
rename from assets/sounds/alert.mp3
rename to snappymail/v/0.0.0/static/sounds/alert.mp3
diff --git a/assets/sounds/alert.ogg b/snappymail/v/0.0.0/static/sounds/alert.ogg
similarity index 100%
rename from assets/sounds/alert.ogg
rename to snappymail/v/0.0.0/static/sounds/alert.ogg
diff --git a/assets/sounds/new-mail.mp3 b/snappymail/v/0.0.0/static/sounds/new-mail.mp3
similarity index 100%
rename from assets/sounds/new-mail.mp3
rename to snappymail/v/0.0.0/static/sounds/new-mail.mp3
diff --git a/assets/sounds/new-mail.ogg b/snappymail/v/0.0.0/static/sounds/new-mail.ogg
similarity index 100%
rename from assets/sounds/new-mail.ogg
rename to snappymail/v/0.0.0/static/sounds/new-mail.ogg
diff --git a/assets/sounds/ping.mp3 b/snappymail/v/0.0.0/static/sounds/ping.mp3
similarity index 100%
rename from assets/sounds/ping.mp3
rename to snappymail/v/0.0.0/static/sounds/ping.mp3
diff --git a/assets/sounds/ping.ogg b/snappymail/v/0.0.0/static/sounds/ping.ogg
similarity index 100%
rename from assets/sounds/ping.ogg
rename to snappymail/v/0.0.0/static/sounds/ping.ogg
diff --git a/snappymail/v/0.0.0/themes/A/styles.css b/snappymail/v/0.0.0/themes/A/styles.css
index 30d605e6d..19d877924 100644
--- a/snappymail/v/0.0.0/themes/A/styles.css
+++ b/snappymail/v/0.0.0/themes/A/styles.css
@@ -4,6 +4,7 @@
 	--main-color: #333;
 	--main-bg-color: #48525C;
 	--main-bg-image: url("images/background.jpg");
+	--main-bg-size: cover;
 
 	/* LOADING */
 	--loading-color: #fff;
diff --git a/snappymail/v/0.0.0/themes/BlackWood/images/background.jpg b/snappymail/v/0.0.0/themes/BlackWood/images/background.jpg
new file mode 100644
index 000000000..6f06bb677
Binary files /dev/null and b/snappymail/v/0.0.0/themes/BlackWood/images/background.jpg differ
diff --git a/snappymail/v/0.0.0/themes/BlackWood/images/preview.png b/snappymail/v/0.0.0/themes/BlackWood/images/preview.png
new file mode 100644
index 000000000..f7bb199d4
Binary files /dev/null and b/snappymail/v/0.0.0/themes/BlackWood/images/preview.png differ
diff --git a/snappymail/v/0.0.0/themes/BlackWood/styles.css b/snappymail/v/0.0.0/themes/BlackWood/styles.css
new file mode 100644
index 000000000..e1ecf4126
--- /dev/null
+++ b/snappymail/v/0.0.0/themes/BlackWood/styles.css
@@ -0,0 +1,138 @@
+:root {
+	color-scheme: dark;
+
+	/* MAIN */
+	--main-color: #fff;
+	--main-bg-color: #48525C;
+	--main-bg-image: url("images/background.jpg");
+	--main-bg-size: cover;
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #333;
+
+	/* LOADING */
+	--loading-color: #ddd;
+	--loading-text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+
+	/* LOGIN */
+	--login-color: #eee;
+	--login-bg-color: rgba(0,0,0,0.5);
+	--login-box-shadow: 0px 2px 10px rgba(0,0,0,0.5);
+	--login-border: none;
+	--login-border-radius: 7px;
+
+	/* MENU */
+	--dropdown-menu-color: #999;
+	--dropdown-menu-bg-color: #333;
+	--dropdown-menu-hover-bg-color: #48525C;
+	--dropdown-menu-hover-color: #eee;
+	--dropdown-menu-disable-color: #999;
+
+	/* FOLDERS */
+	--folders-color: #fff;
+	--folders-disabled-color: #aaa;
+	--folders-selected-color: #fff;
+	--folders-selected-bg-color: #444;
+	--folders-focused-color: #fff;
+	--folders-focused-bg-color: rgba(0,0,0,0.7);
+	--folders-hover-color: #fff;
+	--folders-hover-bg-color: rgba(0,0,0,0.5);
+	--folders-drop-color: #fff;
+	--folders-drop-bg-color: rgba(0,0,0,0.5);
+
+	/* SETTINGS */
+	--settings-menu-color: #fff;
+	--settings-menu-selected-color: #fff;
+	--settings-menu-selected-bg-color: #444;
+	--settings-menu-hover-color: #fff;
+	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
+
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #111;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #333;
+	--dialog-border-clr: #555;
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #222;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #222;
+	--input-border-clr: #aaa;
+}
+
+::-webkit-scrollbar {
+	width: 0.8em;
+}
+::-webkit-scrollbar-track {
+	background-color: #000;
+}
+::-webkit-scrollbar-thumb {
+	background: #666;
+	border-radius: 5px;
+	box-shadow: inset 0 0 3px #000;
+}
+
+.dropdown-menu {
+	padding: 0;
+}
+
+.dropdown-menu *+.dividerbar {
+	margin-top: 0 !important;
+	padding-top: 0 !important;
+}
+
+#V-SystemDropDown .accountPlace {
+	color: #ccc;
+}
+
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
+	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
+	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
+}
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
+	box-shadow: inset 0 2px 4px rgba(255,255,255,.5), 0 1px 2px rgba(255,255,255,.25);
+}
+.btn .icon-spinner {
+    border-color: #333;
+    border-top-color: #ccc;
+}
+
+.messageListItem {
+	border-left-color: #111;
+}
+
+.table-hover tbody tr:hover td,
+.table-hover tbody tr:hover th {
+	background-color: #333;
+}
+
+.table-striped tbody tr:nth-child(2n+1) td,
+.table-striped tbody tr:nth-child(2n+1) th {
+	background-color: #111;
+}
+
+#V-Settings-About .rl-logo {
+	filter: invert(1);
+}
+
+.tabs [id^="tab"]:checked + label {
+	background: linear-gradient(#555 0%, #000 100%);
+}
+
+.select, select {
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
+}
+
+#messageItem .b-text-part blockquote,
+.b-settings-general .editMainIdentity {
+    border-color: #999;
+}
diff --git a/snappymail/v/0.0.0/themes/BlurredDark/images/background.jpg b/snappymail/v/0.0.0/themes/BlurredDark/images/background.jpg
new file mode 100644
index 000000000..43c95df59
Binary files /dev/null and b/snappymail/v/0.0.0/themes/BlurredDark/images/background.jpg differ
diff --git a/snappymail/v/0.0.0/themes/BlurredDark/images/preview.png b/snappymail/v/0.0.0/themes/BlurredDark/images/preview.png
new file mode 100644
index 000000000..2a174335f
Binary files /dev/null and b/snappymail/v/0.0.0/themes/BlurredDark/images/preview.png differ
diff --git a/snappymail/v/0.0.0/themes/BlurredDark/styles.css b/snappymail/v/0.0.0/themes/BlurredDark/styles.css
new file mode 100644
index 000000000..34ad09cdb
--- /dev/null
+++ b/snappymail/v/0.0.0/themes/BlurredDark/styles.css
@@ -0,0 +1,139 @@
+
+:root {
+	color-scheme: dark;
+
+	/* MAIN */
+	--main-color: #fff;
+	--main-bg-color: #48525C;
+	--main-bg-image: url("images/background.jpg");
+	--main-bg-size: cover;
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #333;
+
+	/* LOADING */
+	--loading-color: #ddd;
+	--loading-text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+
+	/* LOGIN */
+	--login-color: #eee;
+	--login-bg-color: rgba(0,0,0,0.5);
+	--login-box-shadow: 0px 2px 10px rgba(0,0,0,0.5);
+	--login-border: none;
+	--login-border-radius: 7px;
+
+	/* MENU */
+	--dropdown-menu-color: #999;
+	--dropdown-menu-bg-color: #333;
+	--dropdown-menu-hover-bg-color: #48525C;
+	--dropdown-menu-hover-color: #eee;
+	--dropdown-menu-disable-color: #999;
+
+	/* FOLDERS */
+	--folders-color: #fff;
+	--folders-disabled-color: #aaa;
+	--folders-selected-color: #fff;
+	--folders-selected-bg-color: #444;
+	--folders-focused-color: #fff;
+	--folders-focused-bg-color: rgba(0,0,0,0.7);
+	--folders-hover-color: #fff;
+	--folders-hover-bg-color: rgba(0,0,0,0.5);
+	--folders-drop-color: #fff;
+	--folders-drop-bg-color: rgba(0,0,0,0.5);
+
+	/* SETTINGS */
+	--settings-menu-color: #fff;
+	--settings-menu-selected-color: #fff;
+	--settings-menu-selected-bg-color: #444;
+	--settings-menu-hover-color: #fff;
+	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
+
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #111;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #333;
+	--dialog-border-clr: #555;
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #222;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #222;
+	--input-border-clr: #aaa;
+}
+
+::-webkit-scrollbar {
+	width: 0.8em;
+}
+::-webkit-scrollbar-track {
+	background-color: #000;
+}
+::-webkit-scrollbar-thumb {
+	background: #666;
+	border-radius: 5px;
+	box-shadow: inset 0 0 3px #000;
+}
+
+.dropdown-menu {
+	padding: 0;
+}
+
+.dropdown-menu *+.dividerbar {
+	margin-top: 0 !important;
+	padding-top: 0 !important;
+}
+
+#V-SystemDropDown .accountPlace {
+	color: #ccc;
+}
+
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
+	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
+	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
+}
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
+	box-shadow: inset 0 2px 4px rgba(255,255,255,.5), 0 1px 2px rgba(255,255,255,.25);
+}
+.btn .icon-spinner {
+    border-color: #333;
+    border-top-color: #ccc;
+}
+
+.messageListItem {
+	border-left-color: #111;
+}
+
+.table-hover tbody tr:hover td,
+.table-hover tbody tr:hover th {
+	background-color: #333;
+}
+
+.table-striped tbody tr:nth-child(2n+1) td,
+.table-striped tbody tr:nth-child(2n+1) th {
+	background-color: #111;
+}
+
+#V-Settings-About .rl-logo {
+	filter: invert(1);
+}
+
+.tabs [id^="tab"]:checked + label {
+	background: linear-gradient(#555 0%, #000 100%);
+}
+
+.select, select {
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
+}
+
+#messageItem .b-text-part blockquote,
+.b-settings-general .editMainIdentity {
+    border-color: #999;
+}
diff --git a/snappymail/v/0.0.0/themes/Default/styles.css b/snappymail/v/0.0.0/themes/Default/styles.css
index d85886fed..25d873842 100644
--- a/snappymail/v/0.0.0/themes/Default/styles.css
+++ b/snappymail/v/0.0.0/themes/Default/styles.css
@@ -1,5 +1,7 @@
 
 :root {
+	color-scheme: light;
+
 	/* MAIN */
 	--main-color: #333;
 	--main-bg-color: #48525C;
diff --git a/snappymail/v/0.0.0/themes/Love/styles.css b/snappymail/v/0.0.0/themes/Love/styles.css
index 4f52c4f2f..1145d1563 100644
--- a/snappymail/v/0.0.0/themes/Love/styles.css
+++ b/snappymail/v/0.0.0/themes/Love/styles.css
@@ -4,6 +4,7 @@
 	--main-color: #333;
 	--main-bg-color: #B3274E;
 	--main-bg-image: url("images/background.jpg");
+	--main-bg-size: cover;
 
 	/* LOADING */
 	--loading-color: #fff;
diff --git a/snappymail/v/0.0.0/themes/LoveDark/images/background.jpg b/snappymail/v/0.0.0/themes/LoveDark/images/background.jpg
new file mode 100644
index 000000000..85a59b2d5
Binary files /dev/null and b/snappymail/v/0.0.0/themes/LoveDark/images/background.jpg differ
diff --git a/snappymail/v/0.0.0/themes/LoveDark/images/preview.png b/snappymail/v/0.0.0/themes/LoveDark/images/preview.png
new file mode 100644
index 000000000..c8d3e3dce
Binary files /dev/null and b/snappymail/v/0.0.0/themes/LoveDark/images/preview.png differ
diff --git a/snappymail/v/0.0.0/themes/LoveDark/styles.css b/snappymail/v/0.0.0/themes/LoveDark/styles.css
new file mode 100644
index 000000000..fd221a07b
--- /dev/null
+++ b/snappymail/v/0.0.0/themes/LoveDark/styles.css
@@ -0,0 +1,139 @@
+:root {
+	color-scheme: dark;
+
+	/* MAIN */
+	--main-color: #fff;
+	--main-bg-color: #48525C;
+	--main-bg-image: url("images/background.jpg");
+	--main-bg-size: cover;
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #333;
+
+	/* LOADING */
+	--loading-color: #ddd;
+	--loading-text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+
+	/* LOGIN */
+	--login-color: #eee;
+	--login-bg-color: rgba(0,0,0,0.5);
+	--login-box-shadow: 0px 2px 10px rgba(0,0,0,0.5);
+	--login-border: none;
+	--login-border-radius: 7px;
+
+	/* MENU */
+	--dropdown-menu-color: #999;
+	--dropdown-menu-bg-color: #333;
+	--dropdown-menu-hover-bg-color: #48525C;
+	--dropdown-menu-hover-color: #eee;
+	--dropdown-menu-disable-color: #999;
+
+	/* FOLDERS */
+	--folders-color: #fff;
+	--folders-disabled-color: #aaa;
+	--folders-selected-color: #fff;
+	--folders-selected-bg-color: #444;
+	--folders-focused-color: #fff;
+	--folders-focused-bg-color: rgba(0,0,0,0.7);
+	--folders-hover-color: #fff;
+	--folders-hover-bg-color: rgba(0,0,0,0.5);
+	--folders-drop-color: #fff;
+	--folders-drop-bg-color: rgba(0,0,0,0.5);
+
+	/* SETTINGS */
+	--settings-menu-color: #fff;
+	--settings-menu-selected-color: #fff;
+	--settings-menu-selected-bg-color: #444;
+	--settings-menu-hover-color: #fff;
+	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
+
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #111;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #333;
+	--dialog-border-clr: #555;
+
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #222;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #222;
+	--input-border-clr: #aaa;
+}
+
+::-webkit-scrollbar {
+	width: 0.8em;
+}
+::-webkit-scrollbar-track {
+	background-color: #000;
+}
+::-webkit-scrollbar-thumb {
+	background: #666;
+	border-radius: 5px;
+	box-shadow: inset 0 0 3px #000;
+}
+
+.dropdown-menu {
+	padding: 0;
+}
+
+.dropdown-menu *+.dividerbar {
+	margin-top: 0 !important;
+	padding-top: 0 !important;
+}
+
+#V-SystemDropDown .accountPlace {
+	color: #ccc;
+}
+
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
+	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
+	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
+}
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
+	box-shadow: inset 0 2px 4px rgba(255,255,255,.5), 0 1px 2px rgba(255,255,255,.25);
+}
+.btn .icon-spinner {
+    border-color: #333;
+    border-top-color: #ccc;
+}
+
+.messageListItem {
+	border-left-color: #111;
+}
+
+.table-hover tbody tr:hover td,
+.table-hover tbody tr:hover th {
+	background-color: #333;
+}
+
+.table-striped tbody tr:nth-child(2n+1) td,
+.table-striped tbody tr:nth-child(2n+1) th {
+	background-color: #111;
+}
+
+#V-Settings-About .rl-logo {
+	filter: invert(1);
+}
+
+.tabs [id^="tab"]:checked + label {
+	background: linear-gradient(#555 0%, #000 100%);
+}
+
+.select, select {
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
+}
+
+#messageItem .b-text-part blockquote,
+.b-settings-general .editMainIdentity {
+    border-color: #999;
+}
diff --git a/snappymail/v/0.0.0/themes/Magnetic/images/background.png b/snappymail/v/0.0.0/themes/Magnetic/images/background.png
new file mode 100644
index 000000000..f1862451b
Binary files /dev/null and b/snappymail/v/0.0.0/themes/Magnetic/images/background.png differ
diff --git a/snappymail/v/0.0.0/themes/Magnetic/images/preview.png b/snappymail/v/0.0.0/themes/Magnetic/images/preview.png
new file mode 100644
index 000000000..bae302d94
Binary files /dev/null and b/snappymail/v/0.0.0/themes/Magnetic/images/preview.png differ
diff --git a/snappymail/v/0.0.0/themes/Magnetic/styles.css b/snappymail/v/0.0.0/themes/Magnetic/styles.css
new file mode 100644
index 000000000..18b1a2b07
--- /dev/null
+++ b/snappymail/v/0.0.0/themes/Magnetic/styles.css
@@ -0,0 +1,129 @@
+
+:root {
+	color-scheme: dark;
+
+	/* MAIN */
+	--main-color: #fff;
+	--main-bg-color: #3C454D;
+	--main-bg-image: url("images/background.png");
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #000;
+
+	/* LOADING */
+	--loading-color: #ddd;
+	--loading-text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+
+	/* LOGIN */
+	--login-color: #eee;
+	--login-bg-color: rgba(0,0,0,0.5);
+	--login-box-shadow: 0px 2px 10px rgba(0,0,0,0.5);
+	--login-border: none;
+	--login-border-radius: 7px;
+
+	/* MENU */
+	--dropdown-menu-color: #333;
+	--dropdown-menu-bg-color: #fff;
+	--dropdown-menu-hover-bg-color: #48525C;
+	--dropdown-menu-hover-color: #eee;
+	--dropdown-menu-disable-color: #999;
+
+	/* FOLDERS */
+	--folders-color: #fff;
+	--folders-disabled-color: #aaa;
+	--folders-selected-color: #fff;
+	--folders-selected-bg-color: rgba(0,0,0,0.5);
+	--folders-focused-color: #fff;
+	--folders-focused-bg-color: rgba(0,0,0,0.7);
+	--folders-hover-color: #fff;
+	--folders-hover-bg-color: rgba(0,0,0,0.5);
+	--folders-drop-color: #fff;
+	--folders-drop-bg-color: rgba(0,0,0,0.5);
+
+	/* SETTINGS */
+	--settings-menu-color: #fff;
+	--settings-menu-selected-color: #fff;
+	--settings-menu-selected-bg-color: rgba(0,0,0,0.5);
+	--settings-menu-hover-color: #fff;
+	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
+
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #222;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #000;
+	--dialog-border-clr: #555;
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #000;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #000;
+	--input-border-clr: #aaa;
+}
+
+::-webkit-scrollbar {
+	width: 0.8em;
+}
+::-webkit-scrollbar-track {
+	background-color: #000;
+}
+::-webkit-scrollbar-thumb {
+	background: #666;
+	border-radius: 5px;
+	box-shadow: inset 0 0 3px #000;
+}
+
+.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar {
+	background-image: linear-gradient(to bottom,#444,#111) !important;
+}
+
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
+	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
+	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
+}
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
+	box-shadow: inset 0 2px 4px rgba(255,255,255,.5), 0 1px 2px rgba(255,255,255,.25);
+}
+.btn .icon-spinner {
+	border-color: #333;
+	border-top-color: #ccc;
+}
+
+.messageListItem {
+	border-left-color: #111;
+}
+
+.table-hover tbody tr:hover td,
+.table-hover tbody tr:hover th {
+	background-color: #333;
+}
+
+.table-striped tbody tr:nth-child(2n+1) td,
+.table-striped tbody tr:nth-child(2n+1) th {
+	background-color: #111;
+}
+
+#V-Settings-About .rl-logo {
+	filter: invert(1);
+}
+
+.tabs [id^="tab"]:checked + label {
+	background: linear-gradient(#555 0%, #000 100%);
+}
+
+.select, select {
+	background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
+}
+
+#messageItem .b-text-part blockquote,
+.b-settings-general .editMainIdentity {
+	border-color: #999;
+}
diff --git a/snappymail/v/0.0.0/themes/NextcloudV25+/images/preview.png b/snappymail/v/0.0.0/themes/NextcloudV25+/images/preview.png
new file mode 100644
index 000000000..4e57a8824
Binary files /dev/null and b/snappymail/v/0.0.0/themes/NextcloudV25+/images/preview.png differ
diff --git a/snappymail/v/0.0.0/themes/NextcloudV25+/styles.css b/snappymail/v/0.0.0/themes/NextcloudV25+/styles.css
new file mode 100644
index 000000000..6a307ebc9
--- /dev/null
+++ b/snappymail/v/0.0.0/themes/NextcloudV25+/styles.css
@@ -0,0 +1,2598 @@
+/**
+ * Nextcloud - SnappyMail mail plugin
+ *
+ * @author Rene Hampölz (@hampoelz), SnappyMail, Nextcloud Team
+ */
+
+/*
+ * Default Nextcloud (v25+) theme variables and colors
+ * based on https://github.com/nextcloud/server/blob/master/core/css/variables.scss
+ */
+/* #region theme */
+
+:root {
+	--border-color: var(--nc-color-border);
+	--dialog-border-clr: var(--nc-color-border);
+}
+
+:not([data-themes~="dark"]) {
+	--nc-color-main-background: var(--color-main-background, #ffffff);
+	--nc-color-main-background-rgb: var(--color-main-background-rgb, 255, 255, 255);
+	--nc-color-main-background-blur: var(--color-main-background-blur, rgba(var(--nc-color-main-background-rgb), .8));
+	--nc-filter-background-blur: var(--filter-background-blur, blur(25px));
+	--nc-color-background-hover: var(--color-background-hover, #f5f5f5);
+	--nc-color-background-dark: var(--color-background-dark, #ededed);
+	--nc-color-background-darker: var(--color-background-darker, #dbdbdb);
+	--nc-color-placeholder-light: var(--color-placeholder-light, #e6e6e6);
+	--nc-color-placeholder-dark: var(--color-placeholder-dark, #cccccc);
+	--nc-color-main-text: var(--color-main-text, #222222);
+	--nc-color-text-light: var(--color-text-light, #222222);
+	--nc-color-text-lighter: var(--color-text-lighter, #767676);
+	--nc-color-text-maxcontrast: var(--color-text-maxcontrast, #767676);
+	--nc-color-scrollbar: var(--color-scrollbar, rgba(34, 34, 34, .15));
+	--nc-color-error: var(--color-error, #e9322d);
+	--nc-color-error-rgb: var(--color-error-rgb, 233, 50, 45);
+	--nc-color-error-hover: var(--color-error-hover, #ed5a56);
+	--nc-color-warning: var(--color-warning, #eca700);
+	--nc-color-warning-rgb: var(--color-warning-rgb, 236, 167, 0);
+	--nc-color-warning-hover: var(--color-warning-hover, #efb832);
+	--nc-color-success: var(--color-success, #46ba61);
+	--nc-color-success-rgb: var(--color-success-rgb, 70, 186, 97);
+	--nc-color-success-hover: var(--color-success-hover, #6ac780);
+	--nc-color-loading-light: var(--color-loading-light, #cccccc);
+	--nc-color-loading-dark: var(--color-loading-dark, #444444);
+	--nc-color-box-shadow-rgb: var(--color-box-shadow-rgb, 77, 77, 77);
+	--nc-color-box-shadow: var(--color-box-shadow, rgba(var(--nc-color-box-shadow-rgb), 0.5));
+	--nc-color-border: var(--color-border, #ededed);
+	--nc-color-border-dark: var(--color-border-dark, #dbdbdb);
+	--nc-color-border-maxcontrast: var(--color-border-maxcontrast, #949494);
+	--nc-font-face: var(--font-face, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, sans-serif, 'Noto Color Emoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol');
+	--nc-default-font-size: var(--default-font-size, 15px);
+	--nc-default-line-height: var(--default-line-height, 24px);
+	--nc-animation-quick: var(--animation-quick, 100ms);
+	--nc-animation-slow: var(--animation-slow, 300ms);
+	--nc-border-radius: var(--border-radius, 3px);
+	--nc-border-radius-large: var(--border-radius-large, 8px);
+	--nc-border-radius-pill: var(--border-radius-pill, 100px);
+	--nc-default-grid-baseline: var(--default-grid-baseline, 4px);
+	--nc-navigation-width: var(--navigation-width, 300px);
+	--nc-sidebar-min-width: var(--sidebar-min-width, 300px);
+	--nc-sidebar-max-width: var(--sidebar-max-width, 500px);
+	--nc-list-min-width: var(--list-min-width, 200px);
+	--nc-list-max-width: var(--list-max-width, 300px);
+	--nc-breakpoint-mobile: var(--breakpoint-mobile, 1024px);
+	--nc-color-primary: var(--color-primary, #00639a);
+	--nc-color-primary-default: var(--color-primary-default, #0082c9);
+	--nc-color-primary-text: var(--color-primary-text, #ffffff);
+	--nc-color-primary-hover: var(--color-primary-hover, #3282ae);
+	--nc-color-primary-light: var(--color-primary-light, #e5eff4);
+	--nc-color-primary-light-text: var(--color-primary-light-text, #00273d);
+	--nc-color-primary-light-hover: var(--color-primary-light-hover, #dbe4e9);
+	--nc-color-primary-text-dark: var(--color-primary-text-dark, #ededed);
+	--nc-color-primary-element: var(--color-primary-element, #00639a);
+	--nc-color-primary-element-text: var(--color-primary-element-text, #ffffff);
+	--nc-color-primary-element-hover: var(--color-primary-element-hover, #3282ae);
+	--nc-color-primary-element-light: var(--color-primary-element-light, #e5eff4);
+	--nc-color-primary-element-light-text: var(--color-primary-element-light-text, #00273d);
+	--nc-color-primary-element-light-hover: var(--color-primary-element-light-hover, #dbe4e9);
+	--nc-color-primary-element-text-dark: var(--color-primary-element-text-dark, #ededed);
+}
+
+@media (prefers-color-scheme: dark) {
+	:not([data-themes~="light"]) {
+		--nc-color-main-background: var(--color-main-background, #171717);
+		--nc-color-main-background-rgb: var(--color-main-background-rgb, 23, 23, 23);
+		--nc-color-main-background-blur: var(--color-main-background-blur, rgba(var(--nc-color-main-background-rgb), .8));
+		--nc-filter-background-blur: var(--filter-background-blur, blur(25px));
+		--nc-color-background-hover: var(--color-background-hover, #212121);
+		--nc-color-background-dark: var(--color-background-dark, #292929);
+		--nc-color-background-darker: var(--color-background-darker, #3b3b3b);
+		--nc-color-placeholder-light: var(--color-placeholder-light, #313131);
+		--nc-color-placeholder-dark: var(--color-placeholder-dark, #4a4a4a);
+		--nc-color-main-text: var(--color-main-text, #D8D8D8);
+		--nc-color-text-light: var(--color-text-light, #bfbfbf);
+		--nc-color-text-lighter: var(--color-text-lighter, #a5a5a5);
+		--nc-color-text-maxcontrast: var(--color-text-maxcontrast, #8c8c8c);
+		--nc-color-scrollbar: var(--color-scrollbar, #3d3d3d);
+		--nc-color-error: var(--color-error, #e9322d);
+		--nc-color-error-rgb: var(--color-error-rgb, 233, 50, 45);
+		--nc-color-error-hover: var(--color-error-hover, #ed5a56);
+		--nc-color-warning: var(--color-warning, #eca700);
+		--nc-color-warning-rgb: var(--color-warning-rgb, 236, 167, 0);
+		--nc-color-warning-hover: var(--color-warning-hover, #efb832);
+		--nc-color-success: var(--color-success, #46ba61);
+		--nc-color-success-rgb: var(--color-success-rgb, 70, 186, 97);
+		--nc-color-success-hover: var(--color-success-hover, #6ac780);
+		--nc-color-loading-light: var(--color-loading-light, #777);
+		--nc-color-loading-dark: var(--color-loading-dark, #CCC);
+		--nc-color-box-shadow-rgb: var(--color-box-shadow-rgb, 0, 0, 0);
+		--nc-color-box-shadow: var(--color-box-shadow, #000000);
+		--nc-color-border: var(--color-border, #292929);
+		--nc-color-border-dark: var(--color-border-dark, #3b3b3b);
+		--nc-color-border-maxcontrast: var(--color-border-maxcontrast, #646464);
+		--nc-font-face: var(--font-face, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, sans-serif, 'Noto Color Emoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol');
+		--nc-default-font-size: var(--default-font-size, 15px);
+		--nc-default-line-height: var(--default-line-height, 24px);
+		--nc-animation-quick: var(--animation-quick, 100ms);
+		--nc-animation-slow: var(--animation-slow, 300ms);
+		--nc-border-radius: var(--border-radius, 3px);
+		--nc-border-radius-large: var(--border-radius-large, 8px);
+		--nc-border-radius-pill: var(--border-radius-pill, 100px);
+		--nc-default-grid-baseline: var(--default-grid-baseline, 4px);
+		--nc-navigation-width: var(--navigation-width, 300px);
+		--nc-sidebar-min-width: var(--sidebar-min-width, 300px);
+		--nc-sidebar-max-width: var(--sidebar-max-width, 500px);
+		--nc-list-min-width: var(--list-min-width, 200px);
+		--nc-list-max-width: var(--list-max-width, 300px);
+		--nc-breakpoint-mobile: var(--breakpoint-mobile, 1024px);
+		--nc-color-primary: var(--color-primary, #00639a);
+		--nc-color-primary-default: var(--color-primary-default, #0082c9);
+		--nc-color-primary-text: var(--color-primary-text, #ffffff);
+		--nc-color-primary-hover: var(--color-primary-hover, #04537f);
+		--nc-color-primary-light: var(--color-primary-light, #141e24);
+		--nc-color-primary-light-text: var(--color-primary-light-text, #99c0d6);
+		--nc-color-primary-light-hover: var(--color-primary-light-hover, #1d272d);
+		--nc-color-primary-text-dark: var(--color-primary-text-dark, #ededed);
+		--nc-color-primary-element: var(--color-primary-element, #00639a);
+		--nc-color-primary-element-text: var(--color-primary-element-text, #ffffff);
+		--nc-color-primary-element-hover: var(--color-primary-element-hover, #04537f);
+		--nc-color-primary-element-light: var(--color-primary-element-light, #141e24);
+		--nc-color-primary-element-light-text: var(--color-primary-element-light-text, #99c0d6);
+		--nc-color-primary-element-light-hover: var(--color-primary-element-light-hover, #1d272d);
+		--nc-color-primary-element-text-dark: var(--color-primary-element-text-dark, #ededed);
+	}
+}
+
+/* #endregion */
+
+/*
+ * Icons
+ */
+/* #region icons */
+
+#rl-app .iconcolor-green {
+	color: var(--nc-color-success) !important;
+}
+
+#rl-app .iconcolor-red {
+	color: var(--nc-color-error) !important;
+}
+
+#rl-app i.fontastic {
+	line-height: unset;
+}
+
+#rl-app [data-icon]::before {
+	vertical-align: -10%;
+}
+
+#rl-app .drag-handle {
+	color: var(--nc-color-text-lighter);
+}
+
+/* #endregion */
+
+/*
+ *  Elements
+ */
+
+/* #region elements */
+
+/* #region link */
+
+:root {
+	--link-color: var(--nc-color-primary-element-light-text);
+}
+
+#rl-app a[target="_blank"] {
+	color: var(--nc-color-primary-element-light-text);
+}
+
+#rl-app a[target="_blank"]:visited,
+#rl-app a[target="_blank"]:active {
+	color: var(--nc-color-primary-element);
+}
+
+/* #endregion */
+
+/* #region scrollbar */
+
+::-webkit-scrollbar {
+	width: 12px;
+	height: 12px;
+}
+
+::-webkit-scrollbar-thumb {
+	background: var(--nc-color-scrollbar);
+	border-radius: var(--nc-border-radius-large);
+	border: 2px solid transparent;
+	background-clip: content-box;
+}
+
+::-webkit-scrollbar-corner,
+::-webkit-scrollbar-track-piece {
+	background-color: transparent;
+}
+
+/* #endregion */
+
+/* #region resizer */
+
+#rl-app .resizer {
+	opacity: 1;
+	background-color: unset;
+	border-right: solid 1px var(--nc-color-border);
+}
+
+::-webkit-resizer {
+	border: 10px solid transparent;
+	border-radius: var(--nc-border-radius);
+	border-bottom-color: var(--nc-color-border-dark);
+}
+
+::-webkit-resizer {
+	border-right-color: var(--nc-color-border-dark);
+}
+
+[dir="rtl"] ::-webkit-resizer {
+	border-right-color: transparent;
+	border-left-color: var(--nc-color-border-dark);
+}
+
+/* #endregion */
+
+/* #region meter */
+
+#rl-app meter::-webkit-meter-bar {
+	background-color: var(--nc-color-border-dark);
+	border-color: var(--nc-color-border-dark);
+	border-width: 2px;
+	height: 10px;
+}
+
+/* #endregion */
+
+/* #region horizontal rule */
+
+:root {
+	--hr-color: var(--nc-color-border-dark);
+}
+
+#rl-app hr {
+	border-color: var(--nc-color-border-dark);
+}
+
+/* #endregion */
+
+/* #region tooltip */
+
+#rl-app [data-rainloopErrorTip]::before,
+#rl-app .help-block span {
+	border: 1px solid var(--nc-color-border);
+	border-radius: var(--nc-border-radius);
+	box-shadow: 0 0 2px var(--nc-color-box-shadow);
+	background-color: var(--nc-color-background-dark);
+	font-size: 13px;
+	color: unset;
+	left: 10px;
+	right: unset;
+	padding: 5px;
+	margin: 7px;
+}
+
+#rl-app [data-rainloopErrorTip]::before {
+	color: var(--nc-color-error);
+	font-weight: 700;
+}
+
+/* #endregion */
+
+/* #region alert */
+
+#rl-app .alert {
+	text-shadow: unset;
+	border: unset;
+	color: var(--nc-color-main-text);
+	background-color: rgba(var(--nc-color-warning-rgb), 0.1);
+	border-inline-start: 4px solid var(--nc-color-warning);
+	border-radius: var(--nc-border-radius);
+	margin: 1rem;
+	padding: 1rem;
+}
+
+#rl-app .alert h4 {
+	font-weight: bold;
+	font-size: 20px;
+	margin-top: unset;
+	margin-bottom: 12px;
+	line-height: 30px;
+	color: var(--nc-color-text-light);
+}
+
+#rl-app .alert.alert-info {
+	background-color: var(--nc-color-background-dark);
+	border-color: var(--nc-color-background-darker);
+}
+
+#rl-app .alert.alert-warning {
+	background-color: rgba(var(--nc-color-warning-rgb), 0.1);
+	border-color: var(--nc-color-warning);
+}
+
+#rl-app .alert.alert-success {
+	background-color: rgba(var(--nc-color-success-rgb), 0.1);
+	border-color: var(--nc-color-success);
+}
+
+#rl-app .alert.alert-error {
+	background-color: rgba(var(--nc-color-error-rgb), 0.1);
+	border-color: var(--nc-color-error);
+}
+
+#rl-app .alert .close {
+	top: -0.6rem;
+	right: unset;
+}
+
+#rl-app .alert br {
+	display: none;
+}
+
+/* #endregion */
+
+/* #region button */
+
+#rl-app .btn,
+#rl-app button,
+#rl-app button.btn:not(.button-vue) {
+	min-height: 36px;
+	height: 36px;
+	box-sizing: border-box;
+	padding: 8px 14px;
+	line-height: 20px;
+	color: var(--nc-color-main-text);
+	background-color: var(--nc-color-background-dark);
+	border: 1px solid var(--nc-color-border-dark) !important;
+	border-radius: var(--nc-border-radius-large);
+	font-size: var(--nc-default-font-size);
+	text-shadow: none;
+	box-shadow: none;
+}
+
+#rl-app .btn:hover,
+#rl-app .btn:focus,
+#rl-app .btn:active,
+#rl-app .btn.active,
+#rl-app button:hover,
+#rl-app button:focus,
+#rl-app button:active,
+#rl-app button.active,
+#rl-app span.fontastic:hover,
+#rl-app span.fontastic:focus,
+#rl-app span.fontastic:active {
+	outline: none;
+	opacity: unset;
+}
+
+#rl-app .btn.fontastic,
+#rl-app button.fontastic {
+	border-radius: var(--nc-border-radius-large);
+}
+
+#rl-app .btn.btn-thin,
+#rl-app button.btn-thin {
+	padding-right: 9px;
+	padding-left: 9px;
+}
+
+#rl-app .btn.btn-transparent,
+#rl-app button.btn-transparent {
+	background: unset !important;
+	border: unset !important;
+	opacity: 0.6;
+}
+
+#rl-app .btn.btn-warning,
+#rl-app button.btn-warning {
+	color: var(--nc-color-primary-element-text);
+	background-color: var(--nc-color-warning);
+	border-color: var(--nc-color-warning) !important;
+}
+
+#rl-app .btn.btn-warning:hover,
+#rl-app .btn.btn-warning:focus,
+#rl-app button.btn-warning:hover,
+#rl-app button.btn-warning:focus {
+	color: var(--nc-color-primary-element-text);
+	background-color: var(--nc-color-warning-hover);
+	border-color: var(--nc-color-warning-hover) !important;
+}
+
+#rl-app .btn.btn-danger,
+#rl-app button.btn-danger {
+	color: var(--nc-color-primary-element-text);
+	background-color: var(--nc-color-error);
+	border-color: var(--nc-color-error) !important;
+}
+
+#rl-app .btn.btn-danger:hover,
+#rl-app .btn.btn-danger:focus,
+#rl-app button.btn-danger:hover,
+#rl-app button.btn-danger:focus {
+	color: var(--nc-color-primary-element-text);
+	background-color: var(--nc-color-error-hover);
+	border-color: var(--nc-color-error-hover) !important;
+}
+
+#rl-app .btn.btn-success,
+#rl-app button.btn-success,
+#rl-app button.btn.buttonLogin {
+	color: var(--nc-color-primary-element-text);
+	background-color: var(--nc-color-primary-element);
+	border-color: var(--nc-color-primary-element) !important;
+}
+
+#rl-app .btn.btn-success:hover,
+#rl-app .btn.btn-success:focus,
+#rl-app button.btn-success:hover,
+#rl-app button.btn-success:focus,
+#rl-app button.btn.buttonLogin:hover,
+#rl-app button.btn.buttonLogin:focus {
+	color: var(--nc-color-primary-element-text);
+	background-color: var(--nc-color-primary-element-hover);
+	border-color: var(--nc-color-primary-element-hover) !important;
+}
+
+#rl-app span.fontastic {
+	padding: 6px;
+	height: fit-content;
+	border-radius: var(--nc-border-radius);
+}
+
+#rl-app span.fontastic:hover {
+	background-color: var(--nc-color-background-hover);
+}
+
+#rl-app span.fontastic:active {
+	background-color: var(--nc-color-primary-light);
+}
+
+#rl-app .btn.disabled, .btn[disabled],
+#rl-app .btn.disabled:hover, .btn[disabled]:hover,
+#rl-app .btn.disabled:focus, .btn[disabled]:focus,
+#rl-app .btn.disabled:active, .btn[disabled]:active,
+#rl-app button.disabled, button[disabled],
+#rl-app button.disabled:hover, button[disabled]:hover,
+#rl-app button.disabled:focus, button[disabled]:focus,
+#rl-app button.disabled:active, button[disabled]:active,
+#rl-app span.fontastic.disabled, span.fontastic[disabled],
+#rl-app span.fontastic.disabled:hover, span.fontastic[disabled]:hover,
+#rl-app span.fontastic.disabled:focus, span.fontastic[disabled]:focus,
+#rl-app span.fontastic.disabled:active, span.fontastic[disabled]:active {
+	opacity: .5;
+	filter: saturate(0.7);
+}
+
+#rl-app .btn:not(.disabled, [disabled]):hover,
+#rl-app .btn:not(.disabled, [disabled]):focus,
+#rl-app button:not(.disabled, [disabled]):hover,
+#rl-app button:not(.disabled, [disabled]):focus,
+#rl-app span.fontastic:not(.disabled, [disabled]):hover,
+#rl-app span.fontastic:not(.disabled, [disabled]):focus {
+	border-color: var(--nc-color-primary-element) !important;
+}
+
+#rl-app .btn:not(.disabled, [disabled]):active,
+#rl-app .btn:not(.disabled, [disabled]).active,
+#rl-app button:not(.disabled, [disabled]):active,
+#rl-app button:not(.disabled, [disabled]).active,
+#rl-app span.fontastic:not(.disabled, [disabled]):active,
+#rl-app span.fontastic:not(.disabled, [disabled]).active {
+	background-color: var(--nc-color-main-background);
+	color: var(--nc-color-text-light);
+}
+
+/* #endregion */
+
+/* #region button group */
+
+#rl-app .btn-group .btn:nth-child(1 of :not([style*="display: none;"])) {
+	margin-right: 0.5px;
+}
+
+/* fallback */
+#rl-app .btn-group .btn:first-of-type {
+	margin-right: 0.5px;
+}
+
+#rl-app .btn-group .btn:nth-last-child(1 of :not([style*="display: none;"])) {
+	margin-left: 0.5px;
+}
+
+/* fallback */
+#rl-app .btn-group .btn:last-of-type {
+	margin-left: 0.5px;
+}
+
+#rl-app .btn-group .btn:nth-child(n+2 of :not([style*="display: none;"])):nth-last-child(n+2 of :not([style*="display: none;"])) {
+	border-radius: 0 !important;
+	margin-right: 0.5px;
+	margin-left: 0.5px;
+}
+
+/* fallback */
+#rl-app .btn-group .btn:not(:first-of-type):not(:last-of-type) {
+	border-radius: 0;
+	margin: 0 0.5px;
+}
+
+#rl-app .btn-group .btn:nth-child(1 of :not([style*="display: none;"])),
+[dir="rtl"] #rl-app .btn-group .btn:nth-last-child(1 of :not([style*="display: none;"])) {
+	border-radius: 0 !important;
+	border-top-left-radius: var(--nc-border-radius-large) !important;
+	border-bottom-left-radius: var(--nc-border-radius-large) !important;
+}
+
+/* fallback */
+#rl-app .btn-group .btn:first-of-type,
+[dir="rtl"] #rl-app .btn-group .btn:last-of-type {
+	border-radius: 0;
+	border-top-left-radius: var(--nc-border-radius-large);
+	border-bottom-left-radius: var(--nc-border-radius-large);
+}
+
+#rl-app .btn-group .btn:nth-last-child(1 of :not([style*="display: none;"])),
+[dir="rtl"] #rl-app .btn-group .btn:nth-child(1 of :not([style*="display: none;"])) {
+	border-radius: 0 !important;
+	border-top-right-radius: var(--nc-border-radius-large) !important;
+	border-bottom-right-radius: var(--nc-border-radius-large) !important;
+}
+
+/* fallback */
+#rl-app .btn-group .btn:last-of-type,
+[dir="rtl"] #rl-app .btn-group .btn:first-of-type {
+	border-radius: 0;
+	border-top-right-radius: var(--nc-border-radius-large);
+	border-bottom-right-radius: var(--nc-border-radius-large);
+}
+
+#rl-app .btn-group .btn:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])),
+[dir="rtl"] #rl-app .btn-group .btn:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])) {
+	border-radius: var(--nc-border-radius-large) !important;
+}
+
+/* fallback */
+#rl-app .btn-group .btn:first-of-type:last-of-type,
+[dir="rtl"] #rl-app .btn-group .btn:first-of-type:last-of-type {
+	border-radius: var(--nc-border-radius-large) !important;
+}
+
+#rl-app .btn-group .btn.fontastic:nth-child(1 of :not([style*="display: none;"])),
+[dir="rtl"] #rl-app .btn-group .btn.fontastic:nth-last-child(1 of :not([style*="display: none;"])) {
+	border-radius: 0 !important;
+	border-top-left-radius: var(--nc-border-radius-large) !important;
+	border-bottom-left-radius: var(--nc-border-radius-large) !important;
+}
+
+/* fallback */
+#rl-app .btn-group .btn.fontastic:first-of-type,
+[dir="rtl"] #rl-app .btn-group .btn.fontastic:last-of-type {
+	border-radius: 0;
+	border-top-left-radius: var(--nc-border-radius-large);
+	border-bottom-left-radius: var(--nc-border-radius-large);
+}
+
+#rl-app .btn-group .btn.fontastic:nth-last-child(1 of :not([style*="display: none;"])),
+[dir="rtl"] #rl-app .btn-group .btn.fontastic:nth-child(1 of :not([style*="display: none;"])) {
+	border-radius: 0 !important;
+	border-top-right-radius: var(--nc-border-radius-large) !important;
+	border-bottom-right-radius: var(--nc-border-radius-large) !important;
+}
+
+/* fallback */
+#rl-app .btn-group .btn.fontastic:last-of-type,
+[dir="rtl"] #rl-app .btn-group .btn.fontastic:first-of-type {
+	border-radius: 0;
+	border-top-right-radius: var(--nc-border-radius-large);
+	border-bottom-right-radius: var(--nc-border-radius-large);
+}
+
+#rl-app .btn-group .btn.fontastic:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])),
+[dir="rtl"] #rl-app .btn-group .btn.fontastic:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])) {
+	border-radius: var(--nc-border-radius-large) !important;
+}
+
+/* fallback */
+#rl-app .btn-group .btn.fontastic:first-of-type:last-of-type,
+[dir="rtl"] #rl-app .btn-group .btn.fontastic:first-of-type:last-of-type {
+	border-radius: var(--nc-border-radius-large) !important;
+}
+
+/* #endregion */
+
+/* #region input & select */
+
+#rl-app select,
+#rl-app .select,
+#rl-app .emailaddresses,
+#rl-app input:not([type="checkbox"]) {
+	padding: 0 12px;
+	font-size: var(--nc-default-font-size);
+	color: var(--nc-color-main-text);
+	background-color: unset;
+	height: 36px;
+	border: 2px solid var(--nc-color-border-maxcontrast);
+	border-radius: var(--nc-border-radius-large);
+	line-height: 32px;
+	outline: none;
+}
+
+#rl-app select:hover,
+#rl-app select:active,
+#rl-app select:focus,
+#rl-app .select:hover,
+#rl-app .select:active,
+#rl-app .select:focus,
+#rl-app .emailaddresses:hover,
+#rl-app .emailaddresses:active,
+#rl-app .emailaddresses:focus,
+#rl-app input:hover,
+#rl-app input:active,
+#rl-app input:focus,
+#rl-app input:not([type="checkbox"]):hover,
+#rl-app input:not([type="checkbox"]):active,
+#rl-app input:not([type="checkbox"]):focus {
+	border-color: var(--nc-color-primary-element);
+}
+
+/* #endregion */
+
+/* #region input */
+
+#rl-app input {
+	box-shadow: none;
+}
+
+#rl-app input[type="search"]::-webkit-search-decoration,
+#rl-app input[type="search"]::-webkit-search-cancel-button,
+#rl-app input[type="search"]::-webkit-search-results-button,
+#rl-app input[type="search"]::-webkit-search-results-decoration {
+	-webkit-appearance: none;
+}
+
+#rl-app input::-webkit-outer-spin-button,
+#rl-app input::-webkit-inner-spin-button {
+	-webkit-appearance: none;
+	margin: 0;
+}
+
+#rl-app input[type=number] {
+	appearance: textfield;
+	margin: 0;
+	/* ? margin: 0 5px 0 0; */
+}
+
+#rl-app .search-input-wrp a {
+	position: absolute;
+	top: 2px;
+	right: 1px;
+	min-width: unset;
+	min-height: unset;
+	height: 32px;
+	font-size: 20px;
+	line-height: 30px;
+}
+
+/* #endregion */
+
+/* #region checkbox */
+
+#rl-app .e-checkbox.material-design {
+	width: fit-content !important;
+	width: -moz-fit-content !important;
+	display: flex;
+	position: relative;
+	align-items: center;
+	user-select: none;
+	height: 44px;
+	border-radius: 44px;
+	padding: 0 14px;
+	margin: 0;
+}
+
+#rl-app .e-checkbox.material-design:hover,
+#rl-app .e-checkbox.material-design:focus-within {
+	background-color: var(--nc-color-primary-light);
+	outline: none;
+}
+
+#rl-app .e-checkbox input[type="checkbox"] {
+	display: none;
+}
+
+#rl-app .e-checkbox:focus {
+	outline: none;
+}
+
+input[type="checkbox"] {
+	background-color: transparent;
+	-webkit-appearance: none;
+	appearance: none;
+}
+
+#rl-app .e-checkbox.material-design>div {
+	position: relative;
+	width: 18px;
+	top: 2px;
+}
+
+#rl-app input[type="checkbox"],
+#rl-app .e-checkbox.material-design input+div {
+	position: unset;
+	height: 18px !important;
+	width: 18px !important;
+	min-width: 18px !important;
+	flex-shrink: 0 !important;
+	border: 2px solid var(--nc-color-primary-element);
+	border-radius: 2px;
+	box-sizing: border-box;
+	animation: none;
+	transform: unset;
+}
+
+#rl-app input[type="checkbox"]:checked,
+#rl-app .e-checkbox.material-design input:checked+div {
+	--nc-svg-checked: url("data:image/svg+xml,");
+	-webkit-mask-image: var(--nc-svg-checked);
+	mask-image: var(--nc-svg-checked);
+	background: var(--nc-color-primary-element);
+	border-width: 0;
+	animation: none;
+	transform: unset;
+}
+
+/* #endregion */
+
+/* #region select */
+
+#rl-app select option,
+#rl-app select::-webkit-scrollbar-corner,
+#rl-app select::-webkit-scrollbar-track-piece {
+	background-color: var(--nc-color-main-background);
+	color: var(--nc-color-main-text);
+}
+
+/* #endregion */
+
+/* #region select email address */
+
+#rl-app .emailaddresses {
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	padding: 0 0 4px;
+	width: 100%;
+	height: auto;
+	min-height: 44px;
+	max-height: calc(44px*2);
+	line-height: var(--nc-default-line-height);
+	background-color: var(--nc-color-main-background);
+	white-space: normal;
+}
+
+#rl-app .emailaddresses.emailaddresses-focused {
+	border: 2px solid var(--nc-color-primary-element);
+}
+
+#rl-app .emailaddresses li {
+	margin: 4px 2px 0;
+}
+
+#rl-app .emailaddresses li.emailaddresses-input>input[type="text"],
+#rl-app .emailaddresses li.emailaddresses-input>input[type="text"]:focus,
+#rl-app .emailaddresses li.emailaddresses-input>input[type="text"]:hover {
+	padding: 0 7px;
+	height: 36px;
+	max-width: 390px;
+	color: var(--nc-color-main-text);
+	font-size: var(--nc-default-font-size);
+	line-height: var(--nc-default-line-height);
+}
+
+#rl-app .emailaddresses li[draggable] {
+	display: flex;
+	align-items: center;
+	padding: 0 0.5em;
+	min-height: 36px;
+	line-height: var(--nc-default-line-height);
+	color: var(--nc-color-main-text);
+	border: 0;
+	border-radius: var(--nc-border-radius-large);
+	background-color: var(--nc-color-background-dark);
+	box-shadow: none;
+}
+
+#rl-app .emailaddresses li[draggable]>span {
+	max-width: calc(100vw - 140px);
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+#rl-app .emailaddresses li[draggable]>a.ficon {
+	position: unset;
+	color: transparent;
+	text-shadow: 0 0 0 var(--nc-color-text-maxcontrast);
+	background: none;
+	border: 0;
+	cursor: pointer;
+	display: inline-flex;
+	margin-left: 4px;
+	padding: 0;
+}
+
+@media screen and (max-width: 480px) {
+	#rl-app .emailaddresses li.emailaddresses-input>input[type="text"] {
+		max-width: calc(100vw - 116px) !important;
+	}
+}
+
+/* #endregion */
+
+/* #region textarea */
+
+#rl-app .squire-toolbar {
+	height: 50px;
+	padding: 5px;
+	box-sizing: content-box;
+	border: none;
+}
+
+#rl-app textarea,
+#rl-app div[contenteditable],
+#rl-app .squire-wysiwyg,
+#rl-app .squire-plain {
+	padding: 8px 12px;
+	margin: unset;
+	font-size: var(--nc-default-font-size);
+	color: var(--nc-color-main-text);
+	background-color: unset;
+	outline: none;
+	border: 2px solid var(--nc-color-border-dark);
+	border-radius: var(--nc-border-radius-large);
+}
+
+#rl-app textarea:hover,
+#rl-app textarea:active,
+#rl-app textarea:focus,
+#rl-app div[contenteditable=true]:hover,
+#rl-app div[contenteditable=true]:active,
+#rl-app div[contenteditable=true]:focus,
+#rl-app .squire-wysiwyg:hover,
+#rl-app .squire-wysiwyg:active,
+#rl-app .squire-wysiwyg:focus,
+#rl-app .squire-plain:hover,
+#rl-app .squire-plain:active,
+#rl-app .squire-plain:focus {
+	border-color: var(--nc-color-primary-element);
+}
+
+/* #endregion */
+
+/* #region dropdown */
+
+#rl-app .dropdown.show {
+	box-shadow: none;
+}
+
+#rl-app .dropdown-menu {
+	background-color: var(--nc-color-main-background);
+	filter: drop-shadow(0 1px 5px var(--nc-color-box-shadow));
+	border-radius: var(--nc-border-radius-large);
+	color: var(--nc-color-main-text);
+	padding: 4px;
+}
+
+#rl-app .dropdown-menu a {
+	background-color: unset;
+	color: unset;
+	height: 22px;
+	line-height: 22px;
+	border-radius: 3px;
+	margin: 2px;
+	box-sizing: content-box;
+	text-align: start;
+}
+
+#rl-app .dropdown-menu li.disabled>a,
+#rl-app .dropdown-menu li.disabled>a:hover,
+#rl-app .dropdown-menu li.disabled>a:focus,
+#rl-app .dropdown-menu li.disabled>a:active {
+	opacity: .5;
+	filter: saturate(0.7);
+}
+
+#rl-app .dropdown-menu li:not(.disabled)>a:hover,
+#rl-app .dropdown-menu li:not(.disabled)>a:focus {
+	background-color: var(--nc-color-background-hover);
+	color: unset;
+	opacity: unset;
+}
+
+#rl-app .dropdown-menu li:not(.disabled)>a:active {
+	background-color: var(--nc-color-primary-element-light);
+}
+
+#rl-app .dropdown-menu *+.dividerbar {
+	border-color: var(--nc-color-border);
+}
+
+#rl-app .dropdown-menu::-webkit-scrollbar-track-piece {
+	background-color: inherit;
+	border-top-right-radius: inherit;
+	border-bottom-right-radius: inherit;
+}
+
+.rl-left-panel-disabled #rl-app .dropdown-menu:not(.right-edge) {
+	position: fixed;
+	top: auto;
+	left: 5px;
+	right: auto;
+}
+
+/* #endregion */
+
+/* #region dropdown account */
+
+#rl-app #V-SystemDropDown {
+	margin: 2px 5px 0 5px;
+}
+
+#rl-app #V-SystemDropDown .btn-toolbar {
+	border: solid 1px var(--nc-color-border-dark);
+	border-radius: var(--nc-border-radius-large);
+	height: 36px;
+	padding: 2px;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	box-sizing: content-box;
+}
+
+#rl-app #V-SystemDropDown .accountPlace {
+	background: unset;
+	color: unset;
+	text-shadow: none;
+	border-color: var(--nc-color-border);
+}
+
+#rl-app #V-SystemDropDown #top-system-dropdown-id {
+	background-color: unset;
+	border: unset !important;
+	border-radius: var(--nc-border-radius-large) !important;
+	height: 20px;
+}
+
+#rl-app #V-SystemDropDown #top-system-dropdown-id:hover,
+#rl-app #V-SystemDropDown #top-system-dropdown-id:focus {
+	background-color: var(--nc-color-background-hover);
+}
+
+#rl-app #V-SystemDropDown #top-system-dropdown-id:active {
+	background-color: var(--nc-color-background-dark);
+}
+
+/* #endregion */
+
+/* #region tab */
+
+#rl-app .tabs>[id^=tab]:checked+label {
+	background-color: var(--nc-color-main-background);
+	border-color: var(--nc-color-primary-element);
+	border-bottom-color: transparent;
+}
+
+#rl-app .tabs>label {
+	margin: 0 2px -1px 2px;
+	border-radius: 0;
+	border-top-left-radius: var(--nc-border-radius);
+	border-top-right-radius: var(--nc-border-radius);
+	overflow-wrap: anywhere;
+}
+
+#rl-app .tabs>label:first-of-type {
+  margin-left: 0px;
+}
+
+#rl-app .tabs>label:last-of-type {
+  margin-right: 0px;
+}
+
+
+#rl-app .tabs>label:hover {
+	border-color: transparent;
+	border-bottom-color: var(--nc-color-primary-element);
+	background-color: var(--nc-color-background-hover)
+}
+
+#rl-app .tabs .tab-content {
+	border-top: solid 1px;
+	border-radius: 4px;
+	border-color: var(--nc-color-primary-element);
+}
+
+@media screen and (max-width: 480px) {
+	#rl-app .tabs>label>i,
+	#rl-app .tabs>label::before {
+		display: none;
+	}
+}
+
+/* #endregion */
+
+/* #region table */
+
+#rl-app .table td,
+#rl-app .table th,
+#rl-app .table-bordered {
+	border-color: var(--nc-color-border-dark);
+}
+
+#rl-app .table-hover tbody tr:hover td,
+#rl-app .table-hover tbody tr:hover th {
+	background-color: var(--nc-color-background-hover);
+}
+
+#rl-app .table-striped tbody tr:nth-child(odd) td,
+#rl-app .table-striped tbody tr:nth-child(odd) th {
+	background-color: var(--nc-color-background-dark);
+}
+
+/* #endregion */
+
+/* #region attachment */
+
+#rl-app .attachmentItem {
+	background-color: var(--nc-color-background-dark);
+	border-radius: var(--nc-border-radius);
+	box-shadow: none;
+	padding: 2px;
+}
+
+#rl-app .attachmentListSimple {
+  flex-wrap: wrap;
+  display: flex;
+}
+
+#rl-app .attachmentListSimple .attachmentItem {
+	display: flex;
+	width: min-content;
+	max-width: unset;
+}
+
+#rl-app .attachmentListSimple .attachmentName {
+	max-width: 200px;
+	margin: 5px;
+}
+
+#rl-app .attachmentListSimple .checkboxAttachment {
+	position: initial;
+  margin: 5px;
+  margin-left: 0;
+}
+
+#rl-app .attachmentItem:hover,
+#rl-app .attachmentItem:active {
+	background-color: var(--nc-color-background-darker);
+}
+
+#rl-app .attachmentItem:focus {
+	outline: none;
+}
+
+#rl-app .attachmentItem .iconProgress {
+	background-color: var(--nc-color-background-darker);
+}
+
+#rl-app .attachmentItem .iconBG {
+	font-weight: 700;
+	line-height: 48px;
+	font-size: unset;
+	text-shadow: unset;
+}
+
+#rl-app .attachmentItem .attachmentNameParent {
+	border-color: var(--nc-color-border-dark);
+}
+
+#rl-app .attachmentItem .iconMain,
+#rl-app .attachmentItem .iconPreview {
+	color: var(--nc-color-text-light);
+}
+
+/* #endregion */
+
+/* #endregion */
+
+/*
+ *  Views
+ */
+
+/* #region views */
+
+/* #region app */
+
+#rl-app {
+	color: var(--nc-color-main-text);
+	background-color: transparent;
+	font-family: var(--nc-font-face);
+	font-size: var(--nc-default-font-size);
+}
+
+#rl-app #rl-left {
+	background-color: var(--nc-color-main-background-blur, var(--nc-color-main-background));
+	-webkit-backdrop-filter: var(--nc-filter-background-blur, none);
+	backdrop-filter: var(--nc-filter-background-blur, none);
+	border-color: var(--nc-color-border);
+	width: 300px;
+}
+
+html:not(.rl-left-panel-disabled) #rl-left {
+	max-width: var(--nc-sidebar-max-width);
+}
+
+html.rl-left-panel-disabled #rl-app #rl-left {
+	width: 65px !important;
+}
+
+html.rl-mobile.rl-left-panel-disabled #rl-app #rl-left {
+	width: 0px !important;
+}
+
+#rl-app #rl-right {
+	background-color: var(--nc-color-main-background);
+}
+
+#rl-app::selection {
+	background-color: var(--nc-color-primary);
+	color: var(--nc-color-primary-text);
+}
+
+#rl-app .control-group {
+	margin-bottom: 0.5em;
+}
+
+#rl-app .form-horizontal .control-group {
+	display: flex;
+	align-items: center;
+	margin-left: 0;
+}
+
+#rl-app .form-horizontal .control-group {
+	margin-bottom: 1em;
+}
+
+@media screen and (max-width: 799px) {
+	#rl-app .form-horizontal .control-group>label {
+		text-align: right;
+	}
+}
+
+/* #endregion */
+
+/* #region login & loading */
+
+#rl-app #V-Login,
+#rl-app #rl-loading,
+#rl-app #rl-loading-error {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	gap: 10px;
+
+	top: unset;
+	position: unset;
+	min-width: unset;
+	max-width: unset;
+	transform: unset;
+	text-shadow: none;
+	transition: none;
+
+	background-color: var(--nc-color-main-background-blur, var(--nc-color-main-background));
+	-webkit-backdrop-filter: var(--nc-filter-background-blur, none);
+	backdrop-filter: var(--nc-filter-background-blur, none);
+
+	color: var(--nc-color-main-text);
+	width: 100%;
+	height: 100%;
+}
+
+#rl-app .LoginView .descWrapper {
+	color: var(--nc-color-main-text);
+}
+
+#rl-app .LoginView .alert {
+	position: unset;
+}
+
+#rl-app .LoginView form {
+	min-width: 250px;
+	max-width: 500px;
+	width: 90%;
+
+	background-color: var(--nc-color-main-background);
+	border: unset;
+	border-radius: var(--nc-border-radius-large);
+	box-shadow: 0 0 10px var(--nc-color-box-shadow);
+	color: var(--nc-color-main-text);
+}
+
+#rl-app .LoginView .controls>.fontastic:first-child {
+	padding: unset;
+	left: 10px;
+}
+
+#rl-app .LoginView .controls span.fontastic {
+	user-select: none;
+}
+
+#rl-app .LoginView .controls span.fontastic:active,
+#rl-app .LoginView .controls span.fontastic:hover {
+	background: unset;
+}
+
+#rl-app .LoginView .controls input:not([type="checkbox"]) {
+	padding-left: 30px;
+}
+
+#rl-app #rl-loading[hidden],
+#rl-app #rl-loading-error[hidden],
+#rl-app .LoginView .alert[hidden] {
+	display: none;
+}
+
+/* #endregion */
+
+/* #region side panel */
+
+html.rl-left-panel-disabled #rl-app #rl-left:has(#V-SettingsMenu:not([hidden])) {
+	width: 250px !important;
+}
+
+#rl-app #V-AdminPane>.b-toolbar,
+#rl-app #V-SettingsMenu>.b-toolbar {
+	top: 0;
+	left: 0;
+	height: auto !important;
+	padding-top: calc(var(--nc-default-grid-baseline) * 2) !important;
+	padding-bottom: calc(var(--nc-default-grid-baseline) * 2) !important;
+	font-weight: bold;
+}
+
+#rl-app .b-folders .b-toolbar {
+	height: unset;
+	display: flex;
+	flex-direction: row;
+	padding: 8px;
+}
+
+html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
+	flex-direction: column;
+}
+
+#rl-app .b-folders .b-toolbar .btn.buttonCompose,
+#rl-app .b-folders .b-toolbar .btn.buttonContacts,
+#rl-app .b-footer .btn {
+	box-sizing: border-box;
+	padding: 4px 14px;
+	line-height: 36px;
+	height: 44px;
+	min-width: fit-content;
+	width: stretch;
+	width: -moz-available;
+	width: -webkit-fill-available;
+	margin: 3px !important;
+
+	font-size: var(--nc-default-font-size);
+}
+
+#rl-app .b-folders .b-toolbar .btn.buttonCompose {
+	min-width: 16px;
+	max-width: 100%;
+	font-weight: bold;
+	box-sizing: content-box !important;
+}
+
+#rl-app .b-folders .b-toolbar .btn.buttonContacts {
+	width: 44px;
+	min-width: 44px;
+}
+
+#rl-app #V-AdminMenu nav,
+#rl-app #V-SettingsMenu nav,
+#rl-app .b-folders .b-content {
+	padding: calc(var(--nc-default-grid-baseline) * 2);
+}
+
+#rl-app .b-folders .b-content {
+	top: 60px;
+	bottom: 162px;
+	color: unset;
+}
+
+#rl-app .b-folders .b-content.show-on-panel-disabled {
+	bottom: 56px;
+}
+
+#rl-app #V-AdminMenu nav a,
+#rl-app #V-AdminPane>.b-toolbar,
+#rl-app #V-SettingsMenu nav a,
+#rl-app #V-SettingsMenu>.b-toolbar,
+#rl-app .b-folders li a.selectable {
+	margin: 2px;
+	padding: 0 2em 0 15px;
+	height: 38px;
+	line-height: 38px !important;
+	border-radius: var(--nc-border-radius-large);
+	color: unset;
+	border: none;
+}
+
+#rl-app #V-AdminMenu nav a,
+#rl-app #V-AdminPane>.b-toolbar,
+#rl-app #V-SettingsMenu nav a,
+#rl-app #V-SettingsMenu>.b-toolbar {
+	height: 44px;
+	min-height: 44px;
+	line-height: 44px !important;
+}
+
+#rl-app #V-AdminMenu nav a.selected,
+#rl-app #V-SettingsMenu nav a.selected,
+#rl-app .b-folders li a.selectable.selected {
+	color: unset;
+	background-color: var(--nc-color-primary-light);
+}
+
+#rl-app #V-AdminMenu nav a:not(.selected):hover,
+#rl-app #V-AdminMenu nav a:not(.selected):focus,
+#rl-app #V-SettingsMenu nav a:not(.selected):hover,
+#rl-app #V-SettingsMenu nav a:not(.selected):focus,
+#rl-app .b-folders li a.selectable:not(.selected):hover,
+#rl-app .b-folders li a.selectable:not(.selected):focus {
+	color: unset;
+	background-color: var(--nc-color-background-hover);
+}
+
+#rl-app .b-folders .b-folders-system a[data-unread]::after,
+#rl-app .b-folders .b-folders-user a[data-unread]::after {
+	display: block;
+	margin: 0;
+	padding: 2px 6px;
+	top: 50%;
+	transform: translateY(-50%);
+
+	color: var(--nc-color-primary-element);
+	background-color: var(--nc-color-primary-element-light);
+
+	font-size: 12px;
+	text-shadow: none;
+}
+
+html.rl-left-panel-disabled #rl-app .b-folders .b-folders-system a.selectable {
+	text-overflow: clip;
+}
+
+#rl-app .b-folders hr {
+	border-top: solid var(--nc-color-main-text);
+	border-radius: var(--nc-border-radius-large);
+	opacity: .1;
+}
+
+#rl-app .b-folders .search-input-wrp {
+	width: calc(100% - 20px);
+	margin: 5px 10px;
+	opacity: .7;
+}
+
+#rl-app .b-folders .search-input-wrp input {
+	width: 100%;
+}
+
+#rl-app .b-footer.btn-toolbar.hide-mobile,
+#rl-app .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled {
+	display: flex;
+	flex-direction: column;
+	align-content: stretch;
+	justify-content: flex-start;
+	height: unset;
+	box-sizing: border-box;
+}
+
+#rl-app .b-footer.btn-toolbar.hide-mobile,
+#rl-app .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled {
+	margin: 0;
+	padding: 0;
+	bottom: 0;
+}
+
+#rl-app .b-footer.btn-toolbar {
+	overflow: unset;
+	padding: 3px;
+}
+
+#rl-app .b-footer.btn-toolbar .btn {
+	background: transparent;
+	border: unset !important;
+}
+
+#rl-app .b-footer.btn-toolbar .btn {
+	text-align: left;
+	font-size: 22px;
+	user-select: none;
+}
+
+#rl-app .b-footer.btn-toolbar .btn-group .btn:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])),
+#rl-app .b-footer.btn-toolbar .btn-group .btn.fontastic:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])),
+[dir="rtl"] #rl-app .b-footer.btn-toolbar .btn-group .btn:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])),
+[dir="rtl"] #rl-app .b-footer.btn-toolbar .btn-group .btn.fontastic:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])) {
+	border-radius: var(--nc-border-radius-large) !important;
+}
+
+/* fallback */
+#rl-app .b-footer.btn-toolbar .btn-group .btn,
+#rl-app .b-footer.btn-toolbar .btn-group .btn.fontastic,
+[dir="rtl"] #rl-app .b-footer.btn-toolbar .btn-group .btn,
+[dir="rtl"] #rl-app .b-footer.btn-toolbar .btn-group .btn.fontastic {
+	border-radius: var(--nc-border-radius-large) !important;
+}
+
+#rl-app .b-footer.btn-toolbar .btn:hover,
+#rl-app .b-footer.btn-toolbar .btn.fontastic:hover {
+	background-color: var(--nc-color-background-hover);
+}
+
+#rl-app .b-footer.btn-toolbar .btn:active,
+#rl-app .b-footer.btn-toolbar .btn.fontastic:active {
+	background-color: var(--nc-color-primary-light);
+}
+
+#rl-app .b-footer.btn-toolbar .btn:focus,
+#rl-app .b-footer.btn-toolbar .btn.fontastic:focus {
+	outline: none;
+}
+
+#rl-app .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn {
+	width: -webkit-fill-available;
+	width: -moz-available;
+	width: fill-available;
+	overflow: hidden;
+}
+
+#rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn.fontastic {
+	background-color: var(--nc-color-main-background);
+}
+
+#rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn:after,
+[dir="rtl"] #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn.fontastic:before {
+	font-family: var(--nc-font-face);
+	font-size: var(--nc-default-font-size);
+	margin-left: 15px;
+}
+
+#rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn:after {
+	position: absolute;
+}
+
+[dir="rtl"] #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn:after {
+	position: unset;
+}
+
+#rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn.fontastic:after,
+[dir="rtl"] #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn.fontastic:before {
+	content: attr(title);
+	width: inherit;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+[dir="rtl"] #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn.fontastic:after {
+	content: unset;
+}
+
+#rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group .btn.icon-folder-add:before {
+	line-height: unset;
+}
+
+#rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group .btn.icon-folder-add:after {
+	content: attr(title);
+	width: inherit;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+html.rl-left-panel-disabled #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group .btn.fontastic:after,
+html.rl-left-panel-disabled #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group .btn.icon-folder-add:after,
+html.rl-left-panel-disabled[dir="rtl"] #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group .btn.fontastic:before {
+	content: '';
+}
+
+#rl-app #V-MailFolderList .b-footer .btn[data-bind*="toggleLeftPanel"] {
+	width: unset !important;
+}
+
+/* #endregion */
+
+/* #region message list & view */
+
+#rl-app .messageList,
+#rl-app .messageView {
+	height: calc(100% - 65px);
+	margin: 0 5px;
+	border: 0;
+	border-top: 1px solid transparent;
+	box-shadow: none !important;
+	background: var(--nc-color-main-background);
+}
+
+#rl-app #V-MailMessageList .btn-toolbar,
+#rl-app #V-MailMessageView .btn-toolbar {
+	padding: 10px;
+	margin-top: 5px;
+}
+
+/* fallback */
+#rl-app #V-MailMessageList .btn-toolbar .btn-group .btn,
+#rl-app #V-MailMessageView .btn-toolbar .btn-group .btn {
+	border-radius: var(--nc-border-radius-large);
+}
+
+/* #endregion */
+
+/* #region message list */
+
+#rl-app #V-MailMessageList {
+	overflow: unset;
+}
+
+#rl-app #V-MailMessageList .btn-toolbar {
+	background: var(--nc-color-primary-light);
+	border-radius: var(--nc-border-radius-large);
+	margin: 5px 5px 0 5px;
+	text-align: start;
+}
+
+html.sm-msgView-side #V-MailMessageList .btn-toolbar {
+	text-align: center !important;
+}
+
+#rl-app #V-MailMessageList .btn-toolbar .btn:not(.btn-success) {
+	background: var(--nc-color-main-background);
+}
+
+#rl-app #V-MailMessageList .messageList {
+	min-width: 370px;
+}
+
+html.sm-msgView-bottom #rl-app .messageList {
+	height: 35vh;
+}
+
+#rl-app .messageList .second-toolbar,
+#rl-app .messageList .b-footer {
+	border-color: var(--nc-color-border);
+	background: unset !important;
+}
+
+#rl-app .messageList .second-toolbar {
+	align-items: center;
+}
+
+#rl-app .messageList .b-footer {
+	padding-bottom: 10px;
+}
+
+#rl-app .messageList .inputSearch {
+	max-width: unset;
+}
+
+#rl-app .messageList .checkboxCheckAll {
+	margin: 0 12px;
+}
+
+#rl-app .messageList .checkboxCheckAll:hover,
+#rl-app .messageList .checkboxCheckAll:focus {
+	color: var(--nc-color-primary-element);
+}
+
+#rl-app .messageList .checkboxCheckAll:active {
+	color: var(--nc-color-primary-element-hover);
+}
+
+html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
+	display: none;
+}
+
+#rl-app .messageList .btn.buttonMoreSearch {
+	background: unset;
+	border-radius: var(--nc-border-radius-large);
+	margin: 0 0 0 8px;
+	line-height: 20px !important;
+}
+
+#rl-app .messageList .checkboxCheckAll,
+#rl-app .messageList .btn.buttonMoreSearch {
+	font-size: var(--nc-default-font-size);
+	height: 28px;
+	line-height: 28px;
+}
+
+#rl-app .messageList .b-content .listThreadUidDesc {
+	margin: 8px;
+	color: var(--nc-color-main-text);
+	background: unset;
+	border: solid 1px;
+	border-radius: var(--nc-border-radius-large);
+	border-color: var(--nc-color-border-dark);
+}
+
+#rl-app .messageList .b-content .listThreadUidDesc:hover,
+#rl-app .messageList .b-content .listThreadUidDesc:focus {
+	background: var(--nc-color-background-hover);
+}
+
+#rl-app .messageList .b-content .listThreadUidDesc:active {
+	background-color: var(--nc-color-primary-element-light);
+}
+
+#rl-app .messageList .b-content .listSearchDesc {
+	border-color: var(--nc-color-border);
+}
+
+#rl-app .messageList .b-content .listError {
+	color: var(--nc-color-error);
+}
+
+#rl-app .messageList .b-content .listDragOver.dragOverEnter {
+	background-color: var(--nc-color-background-dark);
+	border-radius: var(--nc-border-radius);
+	margin: 5px;
+}
+
+#rl-app .messageList .b-content .listDragOver,
+#rl-app .messageList .b-content .listEmptyMessage,
+#rl-app .messageList .b-content .listError,
+#rl-app .messageList .b-content .listLoading {
+	color: var(--nc-color-text-lighter);
+}
+
+#rl-app .messageList .groupLabel {
+	background-color: var(--nc-color-background-dark);
+	border-radius: var(--nc-border-radius);
+	margin: 2px 0;
+}
+
+/* #endregion */
+
+/* #region message list item */
+
+#rl-app .messageListItem .checkboxMessage {
+	border-color: var(--nc-color-text-lighter);
+	color: var(--nc-color-text-lighter);
+}
+
+#rl-app .messageListItem .checkboxMessage:hover,
+#rl-app .messageListItem .checkboxMessage:focus {
+	background-color: var(--nc-color-background-darker);
+}
+
+#rl-app .messageListItem .checkboxMessage:active {
+	background-color: var(--nc-color-primary-light-hover);
+}
+
+#rl-app .messageListItem .threads-len {
+	color: var(--nc-color-text-light);
+	border-color: var(--nc-color-text-light);
+	padding: 0 4px;
+	margin-right: 5px;
+}
+
+#rl-app .messageListItem .threads-len:hover,
+#rl-app .messageListItem .threads-len:focus {
+	background-color: var(--nc-color-background-darker);
+	border-color: unset;
+}
+
+#rl-app .messageListItem .threads-len:active {
+	background-color: var(--nc-color-primary-element-light-hover);
+}
+
+#rl-app .messageListItem {
+	padding: 8px;
+	margin: 2px 0;
+	border-bottom: unset;
+	border-radius: var(--nc-border-radius);
+}
+
+#rl-app .messageListItem,
+#rl-app .messageListItem.focused {
+	background-color: var(--nc-color-background);
+	border-color: var(--nc-color-border);
+}
+
+#rl-app .messageListItem:hover,
+#rl-app .messageListItem.focused:hover {
+	background-color: var(--nc-color-background-hover);
+	border-color: var(--nc-color-primary-light-hover);
+}
+
+#rl-app .messageListItem.selected,
+#rl-app .messageListItem.selected:hover {
+	background-color: var(--nc-color-primary-light) !important;
+	border-color: var(--nc-color-primary-light-text) !important;
+}
+
+#rl-app .messageListItem.unseen {
+	background-color: unset;
+	border-color: var(--nc-color-primary);
+}
+
+#rl-app .messageListItem.unseen.focused,
+#rl-app .messageListItem.unseen.focused:hover {
+	background-color: var(--nc-color-primary-light);
+	border-color: var(--nc-color-primary);
+}
+
+#rl-app .messageListItem.unseen:hover {
+	background-color: var(--nc-color-background-hover);
+	border-color: var(--nc-color-primary-hover);
+}
+
+#rl-app .messageListItem [data-unseen] {
+	border-color: var(--nc-color-primary-element);
+	background-color: var(--nc-color-primary-element-light);
+	border-width: 2px;
+	font-weight: 700;
+}
+
+#rl-app .messageListItem [data-unseen]:hover {
+	border-color: var(--nc-color-primary-element-hover);
+	background-color: var(--nc-color-primary-element-light-hover);
+}
+
+#rl-app .messageListItem.checked {
+	background-color: unset;
+	border-color: var(--nc-color-primary-light-text);
+}
+
+#rl-app .messageListItem.checked.focused {
+	background-color: inherit;
+	border-color: var(--nc-color-primary-light-text);
+}
+
+#rl-app .messageListItem.checked:hover,
+#rl-app .messageListItem.checked.focused:hover {
+	background-color: var(--nc-color-background-hover);
+	border-color: inherit;
+}
+
+#rl-app #messagesDragImage {
+	padding: 5px 5px 5px 10px;
+	color: var(--nc-color-text-lighter);
+	background-color: var(--nc-color-background-darker);
+	border-radius: var(--nc-border-radius);
+	box-shadow: 0 0 4px var(--nc-color-box-shadow);
+	height: unset;
+	min-width: unset;
+}
+
+/* #endregion */
+
+/* #region message view */
+
+#rl-app #V-MailMessageView {
+	bottom: 0;
+}
+
+html.sm-msgView-bottom #rl-app .messageView {
+	height: 100%;
+}
+
+#rl-app .messageView .b-message .message-fixed-button-toolbar .btn.buttonEdit {
+	padding: 4px 8px;
+	min-height: 28px;
+	height: 28px;
+	opacity: 0.8;
+}
+
+#rl-app .messageView .b-message .message-fixed-button-toolbar .btn.buttonEdit:hover,
+#rl-app .messageView .b-message .message-fixed-button-toolbar .btn.buttonEdit:focus,
+#rl-app .messageView .b-message .message-fixed-button-toolbar .btn.buttonEdit:active {
+	opacity: unset;
+}
+
+#rl-app .messageView .b-message-view-desc,
+#rl-app .messageView .b-message-view-checked-helper {
+	color: var(--nc-color-text-lighter);
+}
+
+#rl-app .messageView .b-message-view-desc.error {
+	color: var(--nc-color-error);
+}
+
+#rl-app .messageView .messageItemHeader .informationShort meter::-webkit-meter-optimum-value {
+	background-color: var(--nc-color-success);
+	border-radius: var(--nc-border-radius-large);
+}
+
+#rl-app .messageView .messageItemHeader .informationShort meter::-webkit-meter-suboptimum-value {
+	background-color: var(--nc-color-warning);
+	border-radius: var(--nc-border-radius-large);
+}
+
+#rl-app .messageView .messageItemHeader .informationShort meter::-webkit-meter-even-less-good-value {
+	background-color: var(--nc-color-error);
+	border-radius: var(--nc-border-radius-large);
+}
+
+#rl-app .messageView .messageItemHeader .hasVirus {
+	background: unset;
+	border: solid 2px var(--nc-color-error);
+	border-radius: var(--nc-border-radius);
+	margin: 5px;
+}
+
+#rl-app .messageView .messageItemHeader .subject {
+	line-height: 30px;
+	height: 30px;
+}
+
+#rl-app .messageView .crypto-control.encrypted,
+#rl-app .messageView .crypto-control.signed {
+	border-radius: var(--nc-border-radius);
+}
+
+#rl-app #V-MailMessageView .b-message-view-backdrop {
+	background-color: var(--nc-color-main-background-blur);
+	-webkit-backdrop-filter: blur(2px);
+	backdrop-filter: blur(2px);
+}
+
+#rl-app #V-MailMessageView .b-message-view-backdrop .backdrop-message {
+	background-color: var(--nc-color-main-background);
+	border: solid 1px var(--nc-color-primary);
+	border-radius: var(--nc-border-radius-large);
+	text-shadow: none;
+	margin: 10px;
+	color: unset;
+}
+
+#rl-app .messageView .messageAssignedTags {
+	margin: 0 5px;
+}
+
+#rl-app .messageView .messageAssignedTags span {
+	border-radius: var(--nc-border-radius-large);
+	background: unset;
+	padding: 2px 5px;
+}
+
+#rl-app #messageItem .bodySubHeader {
+	background-color: unset;
+}
+
+#rl-app #messageItem .bodySubHeader>* {
+	border-color: var(--nc-color-border);
+}
+
+.rl-left-panel-disabled #rl-app #messageItem .dropdown-menu {
+	position: absolute;
+}
+
+#rl-app #messageItem .readReceipt,
+#rl-app #messageItem .showImages {
+	margin: 8px;
+	padding: 10px;
+	color: var(--nc-color-main-text);
+	border: solid 1px var(--nc-color-primary);
+	background-color: var(--nc-color-primary-light);
+	border-radius: var(--nc-border-radius-large);
+}
+
+#rl-app #messageItem .showImages>.btn,
+#rl-app #messageItem .showImages>.btn-group {
+	margin: 2px;
+}
+
+#rl-app #messageItem .readReceipt:hover {
+	background-color: var(--nc-color-primary-light-hover);
+}
+
+#rl-app .messageView .messageItemHeader,
+#rl-app #messageItem .attachmentsPlace {
+	background-color: unset;
+	border-color: var(--nc-color-border);
+	color: var(--nc-color-main-text);
+}
+
+#rl-app #messageItem .attachmentsPlace {
+	border-top: 1px solid var(--nc-color-border);
+	top: -1px;
+}
+
+#rl-app #messageItem .attachmentsPlace .controls-handle {
+	-webkit-user-select: none;
+	user-select: none;
+}
+
+#rl-app #messageItem .attachmentsControls {
+	background-color: unset;
+	border-color: var(--nc-color-border);
+	-webkit-user-select: none;
+	user-select: none;
+}
+
+#rl-app #messageItem .attachmentsControls .icon-file-archive,
+#rl-app #messageItem .attachmentsControls .fontastic {
+	color: var(--nc-color-main-text);
+}
+
+/* #endregion */
+
+/* #region settings */
+
+#rl-app #V-SettingsPane {
+	margin: 62px 0 8px 0;
+	height: calc(100% - 62px - 8px);
+	background-color: unset;
+	box-shadow: none;
+	border: none;
+}
+
+#rl-app #V-SettingsPane .btn-toolbar {
+	padding: 8px;
+}
+
+#rl-app .row {
+	margin-left: unset;
+}
+
+#rl-app .legend,
+#rl-app #V-AdminPane hr,
+#rl-app #V-SettingsPane hr {
+	color: unset;
+	border-color: var(--nc-color-border);
+}
+
+#rl-app #V-Settings-Themes figure,
+#rl-app #V-Settings-Themes img {
+	border-radius: var(--nc-border-radius-large);
+}
+
+#rl-app #V-Settings-Themes figure:not(.selected):hover {
+	background-color: var(--nc-color-background-hover);
+	border-color: transparent;
+}
+
+#rl-app #V-Settings-Themes figure:not(.selected):active {
+	background-color: var(--nc-color-primary-element-light);
+}
+
+#rl-app #V-Settings-Themes figure:not(.selected):focus {
+	outline: none;
+}
+
+#rl-app #V-Settings-Themes figure.selected {
+	background-color: var(--nc-color-primary-element);
+	border-color: transparent;
+	color: var(--nc-color-primary-element-text);
+}
+
+/* hide additional theme settings, as these are made via Nextcloud theming */
+
+/* fonts */
+#rl-app #V-SettingsPane #V-Settings-Themes .form-horizontal:nth-of-type(3) {
+	display: none !important;
+}
+
+/* background */
+#content.app-snappymail #rl-app #V-SettingsPane #V-Settings-Themes .form-horizontal:nth-of-type(4) {
+	display: none !important;
+}
+
+/* #endregion */
+
+/* #region settings admin */
+
+#rl-app #V-AdminPane {
+	margin: 8px 0px;
+	height: calc(100% - 2*8px);
+	background-color: unset;
+	box-shadow: none;
+	border: none;
+}
+
+#rl-app #V-AdminPane>.b-toolbar {
+	width: 300px;
+	text-shadow: none;
+}
+
+html.rl-mobile #rl-app #V-AdminPane {
+	margin: 60px 0px 8px 0px;
+	height: calc(100% - 60px - 8px);
+}
+
+html.rl-mobile #rl-app #V-AdminPane>.b-toolbar {
+	width: unset;
+}
+
+#rl-app #V-Settings-Config th {
+	background-color: var(--nc-color-background-dark);
+}
+
+#rl-app #V-Settings-Config em {
+	word-break: break-word;
+}
+
+#rl-app #V-Settings-General label[data-i18n="TAB_GENERAL/LABEL_ATTACHMENT_SIZE_LIMIT"] {
+	align-self: self-start;
+}
+
+#rl-app #V-Settings-General label[data-i18n="TAB_GENERAL/LABEL_ATTACHMENT_SIZE_LIMIT"]~div .alert.alert-info {
+	margin-left: -130px;
+}
+
+#rl-app #V-Settings-Domains .btn[data-i18n="GLOBAL/TEST"] {
+	margin-left: 1rem;
+}
+
+@media screen and (max-width: 1024px) {
+	#rl-app #V-AdminPane table {
+		width: 100%;
+	}
+
+	#rl-app #V-AdminPane [class*="span"] {
+		width: unset;
+	}
+}
+
+@media screen and (max-width: 480px) {
+	#rl-app #V-Settings-Config .table {
+		border-collapse: collapse;
+	}
+
+	#rl-app #V-Settings-Config .table tr {
+		border-top: 10px solid transparent;
+	}
+
+	#rl-app #V-Settings-Config .table td,
+	#rl-app #V-Settings-Config .table th {
+		display: block;
+		border-style: solid;
+		border-width: 1px 0px;
+	}
+}
+
+/* #endregion */
+
+/* #region popup */
+
+#rl-app dialog {
+	background: var(--nc-color-main-background);
+	color: var(--nc-color-main-text);
+	border-radius: var(--nc-border-radius-large);
+	filter: drop-shadow(0 1px 5px var(--nc-color-box-shadow));
+	box-shadow: none;
+	border-color: var(--nc-color-border);
+}
+
+#rl-app dialog>header,
+#rl-app dialog>footer {
+	border-color: var(--nc-color-border);
+}
+
+#rl-app dialog>footer .btn+.btn,
+#rl-app dialog>footer button+button {
+	margin: 0 0 0 5px;
+}
+
+#rl-app #V-PopupsPlugin .help-block {
+	margin-left: 5px;
+}
+
+#rl-app #V-PopupsIdentity .e-signature-place {
+	border: none;
+}
+
+#rl-app #V-PopupsLanguages label {
+	background-color: var(--nc-color-background-dark) !important;
+	border-color: var(--nc-color-border);
+	border-radius: var(--nc-border-radius);
+	padding: 8px 15px;
+}
+
+#rl-app #V-PopupsLanguages label:hover {
+	border-color: var(--nc-color-primary-element);
+	background-color: unset;
+}
+
+#rl-app #V-PopupsLanguages label.user {
+	background-color: var(--nc-color-main-background) !important;
+	color: var(--nc-color-text-light);
+}
+
+#rl-app #V-PopupsLanguages label.selected {
+	background-color: var(--nc-color-primary-element-light) !important;
+	border-color: var(--nc-color-primary-element);
+}
+
+@media screen and (max-width: 480px) {
+	#rl-app #V-PopupsAdvancedSearch .e-component.e-checkbox {
+		margin-left: -100%;
+	}
+
+	#rl-app #V-PopupsLanguages label {
+		margin-left: 0;
+		margin-right: 0;
+	}
+
+	#rl-app #V-PopupsKeyboardShortcutsHelp .modal-body,
+	#rl-app #V-PopupsDomain .modal-body {
+		padding-left: 0;
+		padding-right: 0;
+		overflow-x: hidden;
+	}
+}
+
+#rl-app #V-PopupsOpenPgpImport textarea {
+	width: 100%;
+}
+
+/* #endregion */
+
+/* #region popup contacts */
+
+#rl-app #V-PopupsContacts .right,
+#rl-app #V-PopupsContacts .b-list-toolbar,
+#rl-app #V-PopupsContacts .b-list-footer-toolbar,
+#rl-app #V-PopupsContacts .b-view-content-toolbar {
+	border-color: var(--nc-color-border);
+}
+
+#rl-app #V-PopupsContacts .b-list-toolbar {
+	height: 55px;
+}
+
+#rl-app #V-PopupsContacts .b-list-toolbar .e-search {
+	margin: 9px 5px;
+	width: calc(100% - 2*5px);
+}
+
+#rl-app #V-PopupsContacts .b-view-content {
+	margin-top: 20px;
+	height: calc(100% - 72px);
+	overflow: hidden;
+}
+
+#rl-app #V-PopupsContacts .b-list-content {
+	height: calc(100% - 35px - 72px);
+}
+
+#rl-app #V-PopupsContacts .b-list-content .listClear {
+	box-shadow: none;
+}
+
+#rl-app #V-PopupsContacts .tabs {
+	height: 100%;
+}
+
+#rl-app #V-PopupsContacts .tab-content {
+	overflow: auto;
+}
+
+#rl-app #V-PopupsContacts .e-contact-item {
+	padding: 4px;
+	margin: 2px 4px;
+	max-height: unset;
+	border-bottom: 0 !important;
+	border-radius: var(--nc-border-radius);
+}
+
+#rl-app #V-PopupsContacts .e-contact-item,
+#rl-app #V-PopupsContacts .e-contact-item.focused {
+	background-color: var(--nc-color-background);
+	border-color: var(--nc-color-border);
+}
+
+#rl-app #V-PopupsContacts .e-contact-item:hover,
+#rl-app #V-PopupsContacts .e-contact-item.focused:hover {
+	background-color: var(--nc-color-background-hover);
+	border-color: var(--nc-color-primary-light-hover);
+}
+
+#rl-app #V-PopupsContacts .e-contact-item.selected,
+#rl-app #V-PopupsContacts .e-contact-item.selected:hover {
+	background-color: var(--nc-color-primary-light);
+	border-color: var(--nc-color-primary-light-text);
+}
+
+#rl-app #V-PopupsContacts .e-contact-item.checked {
+	background-color: unset;
+	border-color: var(--nc-color-primary-light-text);
+}
+
+#rl-app #V-PopupsContacts .e-contact-item.checked.focused {
+	background-color: inherit;
+	border-color: var(--nc-color-primary-light-text);
+}
+
+#rl-app #V-PopupsContacts .e-contact-item.checked:hover,
+#rl-app #V-PopupsContacts .e-contact-item.checked.focused:hover {
+	background-color: var(--nc-color-background-hover);
+	border-color: inherit;
+}
+
+@media screen and (max-width: 799px) {
+	#rl-app #V-PopupsContacts .modal-body {
+		flex-direction: column;
+	}
+
+	#rl-app #V-PopupsContacts .left {
+		max-width: unset;
+		height: 40%;
+	}
+
+	#rl-app #V-PopupsContacts .b-list-footer-toolbar {
+		display: none;
+	}
+
+	#rl-app #V-PopupsContacts .b-list-content {
+		height: calc(100% - 55px);
+		border-bottom: 1px solid var(--nc-color-border);
+	}
+
+	#rl-app #V-PopupsContacts .right {
+		height: 60%;
+		border-left: unset;
+	}
+
+	#rl-app #V-PopupsContacts .control-group {
+		margin-right: 1em;
+	}
+}
+
+/* #endregion */
+
+/* #region popup compose */
+
+#rl-app #V-PopupsCompose header {
+	background-color: unset;
+	color: unset;
+}
+
+#rl-app #V-PopupsCompose header .close,
+#rl-app #V-PopupsCompose header .minimize-custom {
+	border-color: unset;
+}
+
+#rl-app #V-PopupsCompose .b-header {
+	background: unset;
+}
+
+#rl-app #V-PopupsCompose .b-header .error-to {
+	color: var(--nc-color-error);
+}
+
+#rl-app #V-PopupsCompose .pull-right>.btn,
+#rl-app #V-PopupsCompose .pull-right>.btn-group {
+	margin-left: 3px;
+}
+
+#rl-app #V-PopupsCompose .no-attachments-desc {
+	text-shadow: unset;
+}
+
+#rl-app #V-PopupsCompose .attachmentAreaParent .attachmentItem:hover,
+#rl-app #V-PopupsCompose .attachmentAreaParent .attachmentItem:active {
+	background-color: var(--nc-color-background-dark);
+}
+
+#rl-app #V-PopupsCompose .b-attachment-place {
+	border-color: var(--nc-color-border);
+	background-color: var(--nc-color-background-dark);
+}
+
+#rl-app #V-PopupsCompose .b-attachment-place.dragAndDropOver {
+	border-color: var(--nc-color-border);
+}
+
+#rl-app #V-PopupsCompose .tabs label[for="tab-attachments"] b {
+	padding: 2px 6px;
+	border-radius: 1em;
+	color: var(--nc-color-primary-element);
+	background-color: var(--nc-color-primary-element-light);
+	font-size: 12px;
+}
+
+/* #endregion */
+
+/* #region popup nextcloud files */
+
+#rl-app #V-PopupsCompose .btn[data-bind*="nextcloudAttach"] {
+	font-size: 0;
+}
+
+#rl-app #V-PopupsCompose .btn[data-bind*="nextcloudAttach"]::before {
+	display: block;
+	content: "";
+	height: 100%;
+	width: 30px;
+	--nc-logo: url("data:image/svg+xml,");
+	-webkit-mask-image: var(--nc-logo);
+	mask-image: var(--nc-logo);
+	-webkit-mask-position: center;
+	mask-position: center;
+	-webkit-mask-repeat: no-repeat;
+	mask-repeat: no-repeat;
+	-webkit-mask-size: 30px;
+	mask-size: 30px;
+	background-color: var(--nc-color-main-text);
+}
+
+#rl-app #V-PopupsNextcloudFiles {
+	user-select: none;
+}
+
+#rl-app #V-PopupsNextcloudFiles li {
+	line-height: unset;
+}
+
+#rl-app #V-PopupsNextcloudFiles li[data-icon],
+#rl-app #V-PopupsNextcloudFiles li:has(>button[name="create"]),
+#rl-app #V-PopupsNextcloudFiles li details summary {
+	padding: 5px 10px;
+	display: flex;
+	align-items: center !important;
+	overflow-wrap: anywhere;
+}
+
+/* fallback (Firefox ignores complete selector list if :has is used) */
+#rl-app #V-PopupsNextcloudFiles li[data-icon],
+#rl-app #V-PopupsNextcloudFiles li details summary {
+	padding: 5px 10px;
+	display: flex;
+	align-items: center !important;
+	overflow-wrap: anywhere;
+}
+
+#rl-app #V-PopupsNextcloudFiles li button,
+#rl-app #V-PopupsNextcloudFiles li input {
+	margin-left: auto !important;
+	align-self: center;
+}
+
+#rl-app #V-PopupsNextcloudFiles li input {
+	min-width: 100px;
+	flex-shrink: 1;
+}
+
+#rl-app #V-PopupsNextcloudFiles li button {
+	flex-shrink: 0;
+}
+
+#rl-app #V-PopupsNextcloudFiles li button[name="create"] {
+	margin-left: 10px !important;
+}
+
+#rl-app #V-PopupsNextcloudFiles li:not(:last-child),
+#rl-app #V-PopupsNextcloudFiles li details[open]>summary {
+	border-bottom: 1px solid var(--nc-color-border);
+}
+
+#rl-app #V-PopupsNextcloudFiles li details[open]>summary {
+	background-color: var(--nc-color-primary-element-light);
+	border-bottom-color: var(--nc-color-primary-element-hover);
+}
+
+#rl-app #V-PopupsNextcloudFiles li:hover {
+	background-color: unset;
+}
+
+#rl-app #V-PopupsNextcloudFiles li[data-icon]:hover,
+#rl-app #V-PopupsNextcloudFiles li details:not([open]):hover,
+#rl-app #V-PopupsNextcloudFiles li details[open]>summary:hover {
+	background-color: var(--nc-color-background-hover);
+}
+
+#rl-app #V-PopupsNextcloudFiles li details summary[data-icon] {
+	list-style-type: none;
+}
+
+#rl-app #V-PopupsNextcloudFiles li details summary[data-icon]::before {
+	color: var(--nc-color-primary);
+	font-size: 20px;
+}
+
+#rl-app #V-PopupsNextcloudFiles li[data-icon]::before,
+#rl-app #V-PopupsNextcloudFiles li details summary[data-icon]::before {
+	margin: 5px 10px 5px 0;
+}
+
+/* #endregion */
+
+/* #region popup nextcloud calendars */
+
+#rl-app #V-PopupsNextcloudCalendars li {
+	padding: 5px;
+	display: flex;
+	align-items: center !important;
+	border-bottom: solid 1px var(--nc-color-border);
+}
+
+#rl-app #V-PopupsNextcloudCalendars li button {
+	border: 0px !important;
+	margin-left: 8px !important;
+	color: var(--nc-color-primary-element-light-text) !important;
+}
+
+/* #endregion */
+
+/* #region popup openpgp generate */
+
+#rl-app #openpgp-generate.form-horizontal .control-group:has(.e-checkbox) {
+	flex-direction: column;
+	align-items: flex-start;
+}
+
+#rl-app #openpgp-generate.form-horizontal .control-group:has(.e-checkbox) br {
+	display: none;
+}
+
+/* #endregion */
+
+/* #endregion */
+
+/*
+ * Extensions
+ */
+
+/* #region extensions */
+
+/* #region avatars */
+
+#rl-app .messageCheckbox .fromPic {
+	margin: -5px 0 -9px 8px;
+	height: 32px;
+	width: 32px;
+}
+
+/* #endregion */
+
+/* #endregion */
+
+/*
+ * Message Flags
+ */
+
+/* #region message flags */
+
+:root {
+	--msgflag-\$label1-color: #ae2c35;
+	--msgflag-\$label1-color-hover: #e13a45;
+	--msgflag-\$label2-color: #cc9827;
+	--msgflag-\$label2-color-hover: #ffbf31;
+	--msgflag-\$label3-color: #005235;
+	--msgflag-\$label3-color-hover: #008557;
+	--msgflag-\$label4-color: #005cc4;
+	--msgflag-\$label4-color-hover: #0074f8;
+	--msgflag-\$label5-color: #5631c0;
+	--msgflag-\$label5-color-hover: #6d3ff3;
+
+	--msgflag-\\flagged-color: #ffca32;
+}
+
+#rl-app .msgflag-\$label5:not(.focused) { border-color: var(--msgflag-\$label5-color); }
+#rl-app .msgflag-\$label4:not(.focused) { border-color: var(--msgflag-\$label4-color); }
+#rl-app .msgflag-\$label3:not(.focused) { border-color: var(--msgflag-\$label3-color); }
+#rl-app .msgflag-\$label2:not(.focused) { border-color: var(--msgflag-\$label2-color); }
+#rl-app .msgflag-\$label1:not(.focused) { border-color: var(--msgflag-\$label1-color); }
+
+#rl-app .msgflag-\$label5.focused:not(.selected) { border-color: var(--msgflag-\$label5-color) !important; }
+#rl-app .msgflag-\$label4.focused:not(.selected) { border-color: var(--msgflag-\$label4-color) !important; }
+#rl-app .msgflag-\$label3.focused:not(.selected) { border-color: var(--msgflag-\$label3-color) !important; }
+#rl-app .msgflag-\$label2.focused:not(.selected) { border-color: var(--msgflag-\$label2-color) !important; }
+#rl-app .msgflag-\$label1.focused:not(.selected) { border-color: var(--msgflag-\$label1-color) !important; }
+
+#rl-app .msgflag-\$label5:not(.focused):hover { border-color: var(--msgflag-\$label5-color-hover); }
+#rl-app .msgflag-\$label4:not(.focused):hover { border-color: var(--msgflag-\$label4-color-hover); }
+#rl-app .msgflag-\$label3:not(.focused):hover { border-color: var(--msgflag-\$label3-color-hover); }
+#rl-app .msgflag-\$label2:not(.focused):hover { border-color: var(--msgflag-\$label2-color-hover); }
+#rl-app .msgflag-\$label1:not(.focused):hover { border-color: var(--msgflag-\$label1-color-hover); }
+
+#rl-app .msgflag-\$label1:not(.focused), #rl-app .msgflag-\$label1 .checkboxMessage,
+#rl-app .msgflag-\$label2:not(.focused), #rl-app .msgflag-\$label2 .checkboxMessage,
+#rl-app .msgflag-\$label3:not(.focused), #rl-app .msgflag-\$label3 .checkboxMessage,
+#rl-app .msgflag-\$label4:not(.focused), #rl-app .msgflag-\$label4 .checkboxMessage,
+#rl-app .msgflag-\$label5:not(.focused), #rl-app .msgflag-\$label5 .checkboxMessage {
+	background-color: unset;
+	color: unset;
+}
+
+#rl-app .messageListItem.msgflag-\$label1:hover,
+#rl-app .messageListItem.msgflag-\$label2:hover,
+#rl-app .messageListItem.msgflag-\$label3:hover,
+#rl-app .messageListItem.msgflag-\$label4:hover,
+#rl-app .messageListItem.msgflag-\$label5:hover {
+	background-color: var(--nc-color-background-hover);
+}
+
+#rl-app a.msgflag-\$label1,
+#rl-app a.msgflag-\$label2,
+#rl-app a.msgflag-\$label3,
+#rl-app a.msgflag-\$label4,
+#rl-app a.msgflag-\$label5 {
+	border-left: solid 5px;
+}
+
+#rl-app .btn-group.show .dropdown-menu div li a[class^='msgflag-']:not(.msgflag-\$label1, .msgflag-\$label2, .msgflag-\$label3, .msgflag-\$label4, .msgflag-\$label5),
+#rl-app .btn-group.show .dropdown-menu div li a[class*='msgflag-']:not(.msgflag-\$label1, .msgflag-\$label2, .msgflag-\$label3, .msgflag-\$label4, .msgflag-\$label5) {
+	border-left: solid 5px gray;
+}
+
+#rl-app .b-folders .is-flagged .flag-icon::after,
+#rl-app .messageListItem.hasFlaggedSubMessage .flagParent::after,
+#rl-app .messageListItem.msgflag-\\flagged .flagParent::after {
+	color: var(--msgflag-\\flagged-color);
+}
+
+#rl-app #messageItem .b-text-part.swapColors {
+	background-color: var(--nc-color-primary);
+	color: var(--nc-color-primary-text);
+}
+
+/* #endregion */
+
+/* #endregion */
+
+/*
+ * Tablet Layout
+ */
+
+/* #region tablet layout */
+
+@media screen and (min-width: 800px) and (max-width: 1024px) {
+	#rl-app #rl-left {
+		width: 250px;
+	}
+
+	html:not(.rl-left-panel-disabled) #rl-left {
+		max-width: calc(var(--nc-sidebar-max-width) / 2);
+	}
+
+	#rl-app #V-SystemDropDown .accountPlace {
+		display: none;
+	}
+}
+
+/* #endregion */
+
+/*
+ * Keyframes
+ */
+
+/* #region keyframes */
+
+@keyframes highlight-folder-row {
+	0% {
+		transform: scale(1)
+	}
+
+	50% {
+		transform: scale(.95)
+	}
+
+	100% {
+		transform: scale(1)
+	}
+}
diff --git a/snappymail/v/0.0.0/themes/NightShine/images/background.jpg b/snappymail/v/0.0.0/themes/NightShine/images/background.jpg
new file mode 100644
index 000000000..c4cd14986
Binary files /dev/null and b/snappymail/v/0.0.0/themes/NightShine/images/background.jpg differ
diff --git a/snappymail/v/0.0.0/themes/NightShine/images/preview.png b/snappymail/v/0.0.0/themes/NightShine/images/preview.png
new file mode 100644
index 000000000..5ab6a9229
Binary files /dev/null and b/snappymail/v/0.0.0/themes/NightShine/images/preview.png differ
diff --git a/snappymail/v/0.0.0/themes/NightShine/styles.css b/snappymail/v/0.0.0/themes/NightShine/styles.css
new file mode 100644
index 000000000..fd221a07b
--- /dev/null
+++ b/snappymail/v/0.0.0/themes/NightShine/styles.css
@@ -0,0 +1,139 @@
+:root {
+	color-scheme: dark;
+
+	/* MAIN */
+	--main-color: #fff;
+	--main-bg-color: #48525C;
+	--main-bg-image: url("images/background.jpg");
+	--main-bg-size: cover;
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #333;
+
+	/* LOADING */
+	--loading-color: #ddd;
+	--loading-text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+
+	/* LOGIN */
+	--login-color: #eee;
+	--login-bg-color: rgba(0,0,0,0.5);
+	--login-box-shadow: 0px 2px 10px rgba(0,0,0,0.5);
+	--login-border: none;
+	--login-border-radius: 7px;
+
+	/* MENU */
+	--dropdown-menu-color: #999;
+	--dropdown-menu-bg-color: #333;
+	--dropdown-menu-hover-bg-color: #48525C;
+	--dropdown-menu-hover-color: #eee;
+	--dropdown-menu-disable-color: #999;
+
+	/* FOLDERS */
+	--folders-color: #fff;
+	--folders-disabled-color: #aaa;
+	--folders-selected-color: #fff;
+	--folders-selected-bg-color: #444;
+	--folders-focused-color: #fff;
+	--folders-focused-bg-color: rgba(0,0,0,0.7);
+	--folders-hover-color: #fff;
+	--folders-hover-bg-color: rgba(0,0,0,0.5);
+	--folders-drop-color: #fff;
+	--folders-drop-bg-color: rgba(0,0,0,0.5);
+
+	/* SETTINGS */
+	--settings-menu-color: #fff;
+	--settings-menu-selected-color: #fff;
+	--settings-menu-selected-bg-color: #444;
+	--settings-menu-hover-color: #fff;
+	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
+
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #111;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #333;
+	--dialog-border-clr: #555;
+
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #222;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #222;
+	--input-border-clr: #aaa;
+}
+
+::-webkit-scrollbar {
+	width: 0.8em;
+}
+::-webkit-scrollbar-track {
+	background-color: #000;
+}
+::-webkit-scrollbar-thumb {
+	background: #666;
+	border-radius: 5px;
+	box-shadow: inset 0 0 3px #000;
+}
+
+.dropdown-menu {
+	padding: 0;
+}
+
+.dropdown-menu *+.dividerbar {
+	margin-top: 0 !important;
+	padding-top: 0 !important;
+}
+
+#V-SystemDropDown .accountPlace {
+	color: #ccc;
+}
+
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
+	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
+	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
+}
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
+	box-shadow: inset 0 2px 4px rgba(255,255,255,.5), 0 1px 2px rgba(255,255,255,.25);
+}
+.btn .icon-spinner {
+    border-color: #333;
+    border-top-color: #ccc;
+}
+
+.messageListItem {
+	border-left-color: #111;
+}
+
+.table-hover tbody tr:hover td,
+.table-hover tbody tr:hover th {
+	background-color: #333;
+}
+
+.table-striped tbody tr:nth-child(2n+1) td,
+.table-striped tbody tr:nth-child(2n+1) th {
+	background-color: #111;
+}
+
+#V-Settings-About .rl-logo {
+	filter: invert(1);
+}
+
+.tabs [id^="tab"]:checked + label {
+	background: linear-gradient(#555 0%, #000 100%);
+}
+
+.select, select {
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
+}
+
+#messageItem .b-text-part blockquote,
+.b-settings-general .editMainIdentity {
+    border-color: #999;
+}
diff --git a/snappymail/v/0.0.0/themes/Snow/styles.css b/snappymail/v/0.0.0/themes/Snow/styles.css
index e9d486ae3..299c3b83b 100644
--- a/snappymail/v/0.0.0/themes/Snow/styles.css
+++ b/snappymail/v/0.0.0/themes/Snow/styles.css
@@ -4,6 +4,7 @@
 	--main-color: #333;
 	--main-bg-color: #48525C;
 	--main-bg-image: url("images/background.jpg");
+	--main-bg-size: cover;
 
 	/* LOADING */
 	--loading-color: #fff;
diff --git a/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css b/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css
index 4ff960a1d..34ad09cdb 100644
--- a/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css
+++ b/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css
@@ -1,9 +1,17 @@
 
 :root {
+	color-scheme: dark;
+
 	/* MAIN */
 	--main-color: #fff;
 	--main-bg-color: #48525C;
 	--main-bg-image: url("images/background.jpg");
+	--main-bg-size: cover;
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #333;
 
 	/* LOADING */
 	--loading-color: #ddd;
@@ -42,8 +50,23 @@
 	--settings-menu-hover-color: #fff;
 	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
 
-	/* MESSAGE LIST */
-	--message-list-toolbar-bg-color: #eee;
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #111;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #333;
+	--dialog-border-clr: #555;
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #222;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #222;
+	--input-border-clr: #aaa;
 }
 
 ::-webkit-scrollbar {
@@ -71,17 +94,9 @@
 	color: #ccc;
 }
 
-.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar {
-    background-color: #111 !important;
-	color: var(--main-color);
-}
-
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
-	border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25);
 	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
-	color: var(--main-color);
 	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
-	background-color: #222;
 }
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
@@ -91,57 +106,9 @@
     border-color: #333;
     border-top-color: #ccc;
 }
-.btn .caret {
-	border-top-color: var(--main-color);
-}
-
-#rl-popups > dialog,
-#rl-settings-subscreen,
-.messageList,
-.messageView,
-.alert-info,
-#V-PopupsCompose .b-attachment-place {
-	background-color: #333;
-	border-color: #555;
-	color: var(--main-color);
-}
-
-.legend,
-dialog header, dialog footer,
-.table td, .table th {
-	border-color: #555 !important;
-}
-
-.legend,
-.messageView #messageItem {
-	color: var(--main-color);
-}
-
-.rl-mobile .squire-toolbar,
-#V-PopupsCompose .b-attachment-place.dragAndDropOver {
-	background-color: #222;
-}
-
-.g-ui-link,
-.messageView .messageItemHeader .informationShort a,
-.messageView #messageItem .bodyText .b-text-part a {
-	color: #6AE;
-}
-
-.messageView .messageItemHeader,
-.messageView #messageItem .pgpEncrypted,
-.messageView #messageItem .pgpSigned,
-.messageView #messageItem .readReceipt,
-.messageView #messageItem .showImages,
-.messageView #messageItem .attachmentsPlace,
-.messageView #messageItem .attachmentsControls {
-	background-color: #222;
-	border-bottom-color: #444;
-}
 
 .messageListItem {
 	border-left-color: #111;
-    color: #EEE;
 }
 
 .table-hover tbody tr:hover td,
@@ -158,27 +125,14 @@ dialog header, dialog footer,
 	filter: invert(1);
 }
 
-.b-folders li a.focused {
-	background-color: #111;
-}
-
 .tabs [id^="tab"]:checked + label {
 	background: linear-gradient(#555 0%, #000 100%);
 }
 
-input, textarea, .select, select, .emailaddresses {
-    background-color: #222;
-    border-color: #aaa;
-    color: #fff;
-}
 .select, select {
     background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
-hr {
-	border-color: #666;
-}
-
 #messageItem .b-text-part blockquote,
 .b-settings-general .editMainIdentity {
     border-color: #999;
diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.css b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
index 886ade640..a570ee3d8 100644
--- a/snappymail/v/0.0.0/themes/SquaresDark/styles.css
+++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
@@ -4,9 +4,13 @@
 
 	/* MAIN */
 	--main-color: #fff;
-	--main-bg-color: #48525C;
+	--main-bg-color: #3C454D;
 	--main-bg-image: url("images/background.jpg");
+	--link-color: #6AE;
 	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #000;
 
 	/* LOADING */
 	--loading-color: #ddd;
@@ -45,10 +49,20 @@
 	--settings-menu-hover-color: #fff;
 	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
 
-	/* MESSAGE LIST */
+	/* MESSAGES */
 	--message-list-toolbar-bg-color: #222;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #000;
+	--dialog-border-clr: #555;
 
 	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #000;
+	--btn-border-clr: rgba(255,255,255,.20);
+
 	--input-clr: #fff;
 	--input-bg-clr: #000;
 	--input-border-clr: #aaa;
@@ -68,16 +82,11 @@
 
 .thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar {
 	background-image: linear-gradient(to bottom,#444,#111) !important;
-	background-repeat: repeat-x !important;
-	color: var(--main-color);
 }
 
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
-	border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25);
 	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
-	color: var(--main-color);
 	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
-	background-color: #000;
 }
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
@@ -87,46 +96,9 @@
 	border-color: #333;
 	border-top-color: #ccc;
 }
-.btn .caret {
-	border-top-color: var(--main-color);
-}
-
-#rl-popups > dialog,
-#rl-settings-subscreen,
-.messageList,
-.messageView,
-.alert-info,
-#V-PopupsCompose .b-attachment-place {
-	background-color: #000;
-	border-color: #555;
-	color: var(--main-color);
-}
-
-.legend,
-.messageView #messageItem {
-	color: var(--main-color);
-}
-
-.rl-mobile .squire-toolbar,
-#V-PopupsCompose .b-attachment-place.dragAndDropOver {
-	background-color: #222;
-}
-
-.g-ui-link,
-.messageView .messageItemHeader .informationShort a,
-.messageView #messageItem .bodyText .b-text-part a {
-	color: #6AE;
-}
-
-.messageView .messageItemHeader,
-.messageView #messageItem .bodySubHeader > * {
-	background-color: #222;
-	border-bottom-color: #444;
-}
 
 .messageListItem {
 	border-left-color: #111;
-	color: #EEE;
 }
 
 .table-hover tbody tr:hover td,
@@ -143,10 +115,6 @@
 	filter: invert(1);
 }
 
-.b-folders li a.focused {
-	background-color: #111;
-}
-
 .tabs [id^="tab"]:checked + label {
 	background: linear-gradient(#555 0%, #000 100%);
 }
@@ -155,10 +123,6 @@
 	background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
-hr {
-	border-color: #666;
-}
-
 #messageItem .b-text-part blockquote,
 .b-settings-general .editMainIdentity {
 	border-color: #999;
diff --git a/snappymail/v/0.0.0/themes/Stripes/styles.css b/snappymail/v/0.0.0/themes/Stripes/styles.css
index a515c9c53..d7e810349 100644
--- a/snappymail/v/0.0.0/themes/Stripes/styles.css
+++ b/snappymail/v/0.0.0/themes/Stripes/styles.css
@@ -4,6 +4,7 @@
 	--main-color: #333;
 	--main-bg-color: #010101;
 	--main-bg-image: url("images/background.jpg");
+	--main-bg-size: cover;
 
 	/* LOADING */
 	--loading-color: #fff;
diff --git a/snappymail/v/0.0.0/themes/StripesDark/images/background.jpg b/snappymail/v/0.0.0/themes/StripesDark/images/background.jpg
new file mode 100644
index 000000000..58189f688
Binary files /dev/null and b/snappymail/v/0.0.0/themes/StripesDark/images/background.jpg differ
diff --git a/snappymail/v/0.0.0/themes/StripesDark/images/preview.png b/snappymail/v/0.0.0/themes/StripesDark/images/preview.png
new file mode 100644
index 000000000..8909b5da2
Binary files /dev/null and b/snappymail/v/0.0.0/themes/StripesDark/images/preview.png differ
diff --git a/snappymail/v/0.0.0/themes/StripesDark/styles.css b/snappymail/v/0.0.0/themes/StripesDark/styles.css
new file mode 100644
index 000000000..e1ecf4126
--- /dev/null
+++ b/snappymail/v/0.0.0/themes/StripesDark/styles.css
@@ -0,0 +1,138 @@
+:root {
+	color-scheme: dark;
+
+	/* MAIN */
+	--main-color: #fff;
+	--main-bg-color: #48525C;
+	--main-bg-image: url("images/background.jpg");
+	--main-bg-size: cover;
+	--link-color: #6AE;
+	--border-color: #555;
+	--hr-color: #666;
+
+	--panel-bg-clr: #333;
+
+	/* LOADING */
+	--loading-color: #ddd;
+	--loading-text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+
+	/* LOGIN */
+	--login-color: #eee;
+	--login-bg-color: rgba(0,0,0,0.5);
+	--login-box-shadow: 0px 2px 10px rgba(0,0,0,0.5);
+	--login-border: none;
+	--login-border-radius: 7px;
+
+	/* MENU */
+	--dropdown-menu-color: #999;
+	--dropdown-menu-bg-color: #333;
+	--dropdown-menu-hover-bg-color: #48525C;
+	--dropdown-menu-hover-color: #eee;
+	--dropdown-menu-disable-color: #999;
+
+	/* FOLDERS */
+	--folders-color: #fff;
+	--folders-disabled-color: #aaa;
+	--folders-selected-color: #fff;
+	--folders-selected-bg-color: #444;
+	--folders-focused-color: #fff;
+	--folders-focused-bg-color: rgba(0,0,0,0.7);
+	--folders-hover-color: #fff;
+	--folders-hover-bg-color: rgba(0,0,0,0.5);
+	--folders-drop-color: #fff;
+	--folders-drop-bg-color: rgba(0,0,0,0.5);
+
+	/* SETTINGS */
+	--settings-menu-color: #fff;
+	--settings-menu-selected-color: #fff;
+	--settings-menu-selected-bg-color: #444;
+	--settings-menu-hover-color: #fff;
+	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
+
+	/* MESSAGES */
+	--message-list-toolbar-bg-color: #111;
+	--message-header-bg-clr: #222;
+
+	/* DIALOGS */
+	--dialog-clr: #fff;
+	--dialog-bg-clr: #333;
+	--dialog-border-clr: #555;
+
+	/* FORMS */
+	--btn-clr: #fff;
+	--btn-bg-clr: #222;
+	--btn-border-clr: rgba(255,255,255,.20);
+
+	--input-clr: #fff;
+	--input-bg-clr: #222;
+	--input-border-clr: #aaa;
+}
+
+::-webkit-scrollbar {
+	width: 0.8em;
+}
+::-webkit-scrollbar-track {
+	background-color: #000;
+}
+::-webkit-scrollbar-thumb {
+	background: #666;
+	border-radius: 5px;
+	box-shadow: inset 0 0 3px #000;
+}
+
+.dropdown-menu {
+	padding: 0;
+}
+
+.dropdown-menu *+.dividerbar {
+	margin-top: 0 !important;
+	padding-top: 0 !important;
+}
+
+#V-SystemDropDown .accountPlace {
+	color: #ccc;
+}
+
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
+	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
+	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
+}
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active,
+.btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active {
+	box-shadow: inset 0 2px 4px rgba(255,255,255,.5), 0 1px 2px rgba(255,255,255,.25);
+}
+.btn .icon-spinner {
+    border-color: #333;
+    border-top-color: #ccc;
+}
+
+.messageListItem {
+	border-left-color: #111;
+}
+
+.table-hover tbody tr:hover td,
+.table-hover tbody tr:hover th {
+	background-color: #333;
+}
+
+.table-striped tbody tr:nth-child(2n+1) td,
+.table-striped tbody tr:nth-child(2n+1) th {
+	background-color: #111;
+}
+
+#V-Settings-About .rl-logo {
+	filter: invert(1);
+}
+
+.tabs [id^="tab"]:checked + label {
+	background: linear-gradient(#555 0%, #000 100%);
+}
+
+.select, select {
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
+}
+
+#messageItem .b-text-part blockquote,
+.b-settings-general .editMainIdentity {
+    border-color: #999;
+}
diff --git a/snappymail/v/0.0.0/themes/example.css b/snappymail/v/0.0.0/themes/example.css
index 32d392527..a6c95f7b5 100644
--- a/snappymail/v/0.0.0/themes/example.css
+++ b/snappymail/v/0.0.0/themes/example.css
@@ -1,5 +1,7 @@
 
 :root {
+	color-scheme: light;
+
 	/* MAIN */
 	--main-color: #333;
 	--main-bg-color: #e3e3e3;
@@ -12,6 +14,8 @@
 	--border-radius: 5px;
 	--hr-color: #eee;
 
+	--panel-bg-clr: #fff;
+
 	--warning-clr: #c09853;
 	--warning-bg-clr: #fcf8e3;
 	--warning-border-clr: #fbeed5;
@@ -60,18 +64,15 @@
 	--unread-count-bg-color: #333;
 
 	/* SETTINGS */
-	--settings-bg-clr: #fff;
 	--settings-menu-color: #333;
 	--settings-menu-selected-color: #eee;
 	--settings-menu-selected-bg-color: #333;
 	--settings-menu-hover-color: #eee;
 	--settings-menu-hover-bg-color: #333;
 
-	/* MESSAGE LIST */
+	/* MESSAGES */
 	--message-list-toolbar-bg-color: #eee;
-
-	/* MESSAGE */
-	--message-bg-color: #fff;
+	--message-header-bg-clr: #f8f8f8;
 
 	/* DIALOGS */
 	--dialog-clr: #333;
@@ -83,6 +84,7 @@
 	--btn-clr: #333;
 	--btn-bg-clr: #fff;
 	--btn-border-clr: #fff;
+	--btn-border-radius: 3px;
 	--btn-success-bg-clr: #84AB04;
 	--btn-danger-bg-clr: #ee5f5b;
 
@@ -100,4 +102,6 @@
 	--tab-active-bg-clr: #fff;
 	--tab-hover-border-clr: #eee;
 
+	--smDialogShrink: 20px;
+	--smMainShadow: 0 2px 8px rgba(0, 0, 0, 0.2);
 }
diff --git a/tasks/assets.js b/tasks/assets.js
deleted file mode 100644
index 0f967dc84..000000000
--- a/tasks/assets.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */
-const gulp = require('gulp');
-const { config } = require('./config');
-
-const assetsCopy = () => gulp.src(config.paths.assets.src).pipe(gulp.dest(config.paths.static));
-
-exports.assets = gulp.series(assetsCopy);
diff --git a/tasks/common.js b/tasks/common.js
index 1f88d14ed..3ad2894a3 100644
--- a/tasks/common.js
+++ b/tasks/common.js
@@ -1,17 +1,8 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */
-const gulp = require('gulp');
 const del = require('del');
-const fs = require('fs');
 
 const { config } = require('./config');
 
 exports.del = (dir) => del(dir);
 
-exports.copy = (sFile, sNewFile, done) => {
-	fs.writeFileSync(sNewFile, fs.readFileSync(sFile));
-	done();
-};
-
-exports.getHead = () => config.head.agpl;
-
-exports.cleanStatic = () => del(config.paths.static);
+exports.cleanStatic = () => del(config.paths.staticJS) && del(config.paths.staticCSS);
diff --git a/tasks/config.js b/tasks/config.js
index 99dd40a6a..02aa050a6 100644
--- a/tasks/config.js
+++ b/tasks/config.js
@@ -14,15 +14,10 @@ const config = {
 };
 
 config.paths.globjs = 'dev/**/*.js';
-config.paths.static = 'snappymail/v/' + config.devVersion + '/static/';
 config.paths.staticJS = 'snappymail/v/' + config.devVersion + '/static/js/';
 config.paths.staticMinJS = 'snappymail/v/' + config.devVersion + '/static/js/min/';
 config.paths.staticCSS = 'snappymail/v/' + config.devVersion + '/static/css/';
 
-config.paths.assets = {
-	src: ['assets/**/*.*', 'assets/**/.htaccess']
-};
-
 config.paths.less = {
 	main: {
 		src: 'dev/Styles/@Main.less',
@@ -68,7 +63,9 @@ config.paths.js = {
 			'vendors/bootstrap/js/bootstrap.native.js',
 			'vendors/knockout/build/output/knockout-latest.js',
 //			'vendors/knockout/build/output/knockout-latest.debug.js',
-			'vendors/squire/build/squire-raw.js',
+			'vendors/squire2/dist/squire-raw.js',
+			'vendors/mathiasbynens/punycode.js',
+			'vendors/turndown/turndown.js',
 			'dev/External/SquireUI.js'
 		]
 	},
diff --git a/tasks/css.js b/tasks/css.js
index e3b89362a..498130ea7 100644
--- a/tasks/css.js
+++ b/tasks/css.js
@@ -8,6 +8,7 @@ const eol = require('gulp-eol');
 const filter = require('gulp-filter');
 const expect = require('gulp-expect-file');
 const gcmq = require('gulp-group-css-media-queries');
+const less = require('gulp-less');
 
 const { config } = require('./config');
 const { del } = require('./common');
@@ -29,7 +30,6 @@ const cssBootBuild = () => {
 
 const cssMainBuild = () => {
 	const
-		less = require('gulp-less'),
 		lessFilter = filter('**/*.less', { restore: true }),
 		src = config.paths.css.main.src.concat([config.paths.less.main.src]);
 
@@ -51,7 +51,6 @@ const cssMainBuild = () => {
 
 const cssAdminBuild = () => {
 	const
-		less = require('gulp-less'),
 		lessFilter = filter('**/*.less', { restore: true }),
 		src = config.paths.css.admin.src;
 
diff --git a/tasks/js.js b/tasks/js.js
index 5da1937e0..a150487f2 100644
--- a/tasks/js.js
+++ b/tasks/js.js
@@ -2,7 +2,7 @@
 const gulp = require('gulp');
 
 const concat = require('gulp-concat'),
-	header = require('gulp-header'),
+	gap = require('gulp-append-prepend'),
 	rename = require('gulp-rename'),
 	replace = require('gulp-replace'),
 	terser = require('gulp-terser'),
@@ -10,16 +10,17 @@ const concat = require('gulp-concat'),
 	eslint = require('gulp-eslint'),
 	cache = require('gulp-cached'),
 	expect = require('gulp-expect-file'),
-	size = require('gulp-size'),
-	gutil = require('gulp-util');
+	size = require('gulp-size');
 
 const { config } = require('./config');
-const { del, getHead } = require('./common');
+const { del } = require('./common');
 
 const { rollupJS } = require('./rollup');
 
 const jsClean = () => del(config.paths.staticJS + '/**/*.{js,map}');
 
+const prepend = () => gap.prependText(config.head.agpl + '\n');
+
 // boot
 const jsBoot = () => {
 	return gulp
@@ -57,27 +58,24 @@ const jsLibs = () => {
 const jsSieve = async () =>
 	(await rollupJS(config.paths.js.sieve.name))
 //		.pipe(sourcemaps.write('.'))
-		.pipe(header(getHead() + '\n'))
+		.pipe(prepend())
 		.pipe(eol('\n', true))
-		.pipe(gulp.dest(config.paths.staticJS))
-		.on('error', gutil.log);
+		.pipe(gulp.dest(config.paths.staticJS));
 
 // app
 const jsApp = async () =>
 	(await rollupJS(config.paths.js.app.name))
 //		.pipe(sourcemaps.write('.'))
-		.pipe(header(getHead() + '\n'))
+		.pipe(prepend())
 		.pipe(eol('\n', true))
-		.pipe(gulp.dest(config.paths.staticJS))
-		.on('error', gutil.log);
+		.pipe(gulp.dest(config.paths.staticJS));
 
 const jsAdmin = async () =>
 	(await rollupJS(config.paths.js.admin.name))
 //		.pipe(sourcemaps.write('.'))
-		.pipe(header(getHead() + '\n'))
+		.pipe(prepend())
 		.pipe(eol('\n', true))
-		.pipe(gulp.dest(config.paths.staticJS))
-		.on('error', gutil.log);
+		.pipe(gulp.dest(config.paths.staticJS));
 
 const jsMin = () =>
 	gulp
@@ -118,8 +116,7 @@ const jsMin = () =>
 				showTotal: false
 			})
 		)
-		.pipe(gulp.dest(config.paths.staticMinJS))
-		.on('error', gutil.log);
+		.pipe(gulp.dest(config.paths.staticMinJS));
 
 const jsLint = () =>
 	gulp
diff --git a/tasks/rollup.js b/tasks/rollup.js
index 097d5ca5c..b4cc1f37c 100644
--- a/tasks/rollup.js
+++ b/tasks/rollup.js
@@ -2,14 +2,13 @@
 const rollup2 = require('gulp-rollup-2');
 const includePaths = require('rollup-plugin-includepaths');
 const externalGlobals = require('rollup-plugin-external-globals');
-const html = require('rollup-plugin-html');
 const { config } = require('./config');
 
 let includePathOptions = {
 	include: {},
 	paths: ['dev'],
 	external: [],
-	extensions: ['.js', '.html']
+	extensions: ['.js']
 };
 
 exports.rollupJS = (inputFile) =>
@@ -23,9 +22,6 @@ exports.rollupJS = (inputFile) =>
 			includePaths(includePathOptions),
 			externalGlobals({
 				ko: 'ko'
-			}),
-			html({
-				include: '**/*.html'
 			})
 		]
 	});
diff --git a/tasks/vendors.js b/tasks/vendors.js
index 357d4d29a..fbb8286a0 100644
--- a/tasks/vendors.js
+++ b/tasks/vendors.js
@@ -1,7 +1,5 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */
 const gulp = require('gulp');
-const header = require('gulp-header');
-const stripbom = require('gulp-stripbom');
 
 const { config } = require('./config');
 const { del } = require('./common');
@@ -11,7 +9,7 @@ const fontasticFontsClear = () => del('snappymail/v/' + config.devVersion + '/st
 
 const fontasticFontsCopy = () =>
 	gulp
-		.src('vendors/fontastic/fonts/snappymail.*')
+		.src('vendors/fontastic/fonts/snappymail.*', { encoding: false })
 		.pipe(gulp.dest('snappymail/v/' + config.devVersion + '/static/css/fonts'));
 
 const fontastic = gulp.series(fontasticFontsClear, fontasticFontsCopy);
diff --git a/test/header-unfold.php b/test/header-unfold.php
new file mode 100644
index 000000000..4b33c8d2f
--- /dev/null
+++ b/test/header-unfold.php
@@ -0,0 +1,51 @@
+ValueByName('Subject');
+}
+
+$cases = [
+	// plain word, then a folded encoded word: the space stays
+	"Traiter les =?utf-8?Q?vuln=C3=A9rabilit=C3=A9s?= de vos\r\n =?utf-8?Q?=C3=A9quipements?= : plan de =?utf-8?Q?rem=C3=A9diation?= et\r\n checklist =?utf-8?Q?sign=C3=A9e?="
+		=> 'Traiter les vulnérabilités de vos équipements : plan de remédiation et checklist signée',
+	// two encoded words split across lines: no space between them (RFC 2047 §6.2)
+	"=?utf-8?Q?r=C3=A9pon?=\r\n =?utf-8?Q?se?=" => 'réponse',
+	"=?utf-8?B?w6l0w6k=?=\r\n\t=?utf-8?B?IGZpbg==?=" => 'été fin',
+	// encoded word, then a folded plain word: the space stays
+	"=?utf-8?Q?r=C3=A9union?=\r\n demain" => 'réunion demain',
+	// no encoding at all
+	"Hello\r\n world" => 'Hello world',
+];
+foreach ($cases as $raw => $want) {
+	// exact: a fold is one space, never two ("et  checklist" ended up in replies)
+	$got = subject($raw);
+	check($got === $want, "got [{$got}], want [{$want}]");
+}
+
+echo "header-unfold: ".count($cases)." checks OK\n";
diff --git a/vendors/bootstrap/less/alerts.less b/vendors/bootstrap/less/alerts.less
index dfd741cc9..124326743 100644
--- a/vendors/bootstrap/less/alerts.less
+++ b/vendors/bootstrap/less/alerts.less
@@ -33,10 +33,22 @@
 .alert-error {
   background-color: var(--error-bg-clr, #f2dede);
   border-color: var(--error-border-clr, #eed3d7);
-  color: var(--error-clr, #b94a48);
 }
 .alert-info {
   background-color: var(--info-bg-clr, #d9edf7);
   border-color: var(--info-border-clr, #bce8f1);
+}
+
+.alert a:not(.close) {
+  text-decoration: underline;
+}
+
+.alert-info,
+.alert.alert-info a:not(.close) {
   color: var(--info-clr, #3a87ad);
 }
+
+.alert-error,
+.alert.alert-error a:not(.close) {
+  color: var(--error-clr, #b94a48);
+}
diff --git a/vendors/bootstrap/less/button-groups.less b/vendors/bootstrap/less/button-groups.less
index d3ef30963..0f33b22be 100644
--- a/vendors/bootstrap/less/button-groups.less
+++ b/vendors/bootstrap/less/button-groups.less
@@ -5,46 +5,44 @@
 
 // Make the div behave like a button
 .btn-group {
+  margin-right: 3px;
   position: relative;
   white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
 }
 
-.btn-group + .btn-group {
-  margin-left: 3px;
-}
-
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
   .btn-group {
     display: inline-block;
   }
-  .btn + .btn,
-  .btn-group + .btn,
-  .btn + .btn-group {
-    margin-left: 3px;
+  * {
+    margin-right: 3px;
+  }
+  *:last-child {
+    margin-right: 0;
   }
 }
 
 // Float them, remove border radius, then re-add to first and last elements
-.btn-group > .btn {
-  position: relative;
+.btn-group > * {
   border-radius: 0;
+  position: relative;
+  margin-right: 0;
 }
-.btn-group > .btn + .btn {
+.btn-group > * + * {
   margin-left: -1px;
 }
 
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group > .btn:first-child {
-  margin-left: 0;
-  border-top-left-radius: 3px;
-  border-bottom-left-radius: 3px;
+  border-top-left-radius: var(--btn-border-radius, 3px);
+  border-bottom-left-radius: var(--btn-border-radius, 3px);
 }
 // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
 .btn-group > .btn:last-child,
 .btn-group > .dropdown-toggle {
-  border-top-right-radius: 3px;
-  border-bottom-right-radius: 3px;
+  border-top-right-radius: var(--btn-border-radius, 3px);
+  border-bottom-right-radius: var(--btn-border-radius, 3px);
 }
 
 // On hover/focus/active, bring the proper btn to front
diff --git a/vendors/bootstrap/less/buttons.less b/vendors/bootstrap/less/buttons.less
index 5f208a925..8bc88fd67 100644
--- a/vendors/bootstrap/less/buttons.less
+++ b/vendors/bootstrap/less/buttons.less
@@ -16,8 +16,7 @@
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
-  border: 1px solid var(--btn-border-clr, #bbb);
-  border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25);
+  border: 1px solid var(--btn-border-clr, rgba(0,0,0,.20));
   box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
   color: var(--btn-clr, #333);
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
diff --git a/vendors/bootstrap/less/close.less b/vendors/bootstrap/less/close.less
index 7afba005b..476946d23 100644
--- a/vendors/bootstrap/less/close.less
+++ b/vendors/bootstrap/less/close.less
@@ -4,7 +4,7 @@
 
 
 .close {
-  float: right;
+  float: var(--right, right);
   font-size: 143%;
   font-weight: bold;
   line-height: 1.43em;
diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less
index 1a802fe9e..f9da001c0 100644
--- a/vendors/bootstrap/less/forms.less
+++ b/vendors/bootstrap/less/forms.less
@@ -13,7 +13,7 @@ form {
 
 // Identify controls by their labels
 label {
-  display: block;
+  display: inline-block;
   font-weight: normal;
   line-height: 1.43em;
   margin-bottom: 5px;
@@ -62,6 +62,12 @@ input {
   }
 }
 
+//input:invalid,
+input:user-invalid {
+  background-color: var(--error-bg-clr, #f2dede);
+  border-color: var(--error-border-clr, #eed3d7);
+  color: var(--error-clr, #b94a48);
+}
 
 // Position radios and checkboxes better
 input[type="radio"],
diff --git a/vendors/bootstrap/less/tables.less b/vendors/bootstrap/less/tables.less
index b0908eaec..d7815f708 100644
--- a/vendors/bootstrap/less/tables.less
+++ b/vendors/bootstrap/less/tables.less
@@ -18,7 +18,7 @@
   td {
     padding: 8px;
     line-height: 1.43em;
-    text-align: left;
+    text-align: inherit;
     vertical-align: text-top;
     border-top: 1px solid var(--border-color, #ddd);
   }
diff --git a/vendors/bootstrap/less/type.less b/vendors/bootstrap/less/type.less
index a79d01b67..4c4d881a1 100644
--- a/vendors/bootstrap/less/type.less
+++ b/vendors/bootstrap/less/type.less
@@ -36,12 +36,12 @@ h1, h2, h3, h4, h5, h6 {
   margin: 0.715em 0;
   text-rendering: optimizelegibility; // Fix the character spacing for headings
 }
-h1 { font-size: 36px; }
-h2 { font-size: 30px; }
-h3 { font-size: 24px; }
-h4 { font-size: 18px; }
-h5 { font-size: 14px; }
-h6 { font-size: 12px; }
+h1 { font-size: 257%; }
+h2 { font-size: 214%; }
+h3 { font-size: 171%; }
+h4 { font-size: 128%; }
+h5 { font-size: 100%; }
+h6 { font-size: 85%; }
 h4, h5, h6 { line-height: 20px; }
 
 
diff --git a/vendors/bootstrap/less/utilities.less b/vendors/bootstrap/less/utilities.less
index 61e38562a..e819c62be 100644
--- a/vendors/bootstrap/less/utilities.less
+++ b/vendors/bootstrap/less/utilities.less
@@ -5,7 +5,7 @@
 
 // Quick floats
 .pull-right {
-  float: right;
+  float: var(--right, right);
 }
 
 // Toggling content
diff --git a/vendors/fontastic/fonts/snappymail.woff b/vendors/fontastic/fonts/snappymail.woff
index c970b6c43..b73b105b8 100644
Binary files a/vendors/fontastic/fonts/snappymail.woff and b/vendors/fontastic/fonts/snappymail.woff differ
diff --git a/vendors/fontastic/fonts/snappymail.woff2 b/vendors/fontastic/fonts/snappymail.woff2
index ad2f5d83d..9ef766059 100644
Binary files a/vendors/fontastic/fonts/snappymail.woff2 and b/vendors/fontastic/fonts/snappymail.woff2 differ
diff --git a/vendors/fontastic/styles.css b/vendors/fontastic/styles.css
index 0faf4e8e5..c93837357 100644
--- a/vendors/fontastic/styles.css
+++ b/vendors/fontastic/styles.css
@@ -38,7 +38,7 @@
   content: "\e005";
 }
 .icon-paper-plane::before {
-  content: "\e007";
+  content: "📧";
 }
 .icon-right-mini::before {
   content: "›";
@@ -46,9 +46,6 @@
 .icon-down-mini::before {
   content: "⌄";
 }
-.icon-cross::before {
-  content: "✖";
-}
 .icon-ok::before {
   content: "✔";
 }
@@ -59,31 +56,31 @@
   content: "\e030";
 }
 .icon-file-presentation::before {
-  content: "\e031"; /* 📊 */
+  content: "📊";
 }
 .icon-file-archive::before {
-  content: "\e032";
+  content: "📦";
 }
 .icon-file-audio::before {
-  content: "\e033";
+  content: "🔊";
 }
 .icon-file-text::before {
   content: "📄";
 }
 .icon-file-image::before {
-  content: "\e036"; /* 🖻 */
+  content: "🖻";
 }
 .icon-file-certificate::before {
-  content: "\e038";
+  content: "\e038"; /* 🔏 🔐 */
 }
 .icon-attachment::before {
   content: "📎";
 }
 .icon-file-spreadsheet::before {
-  content: "\e03a";
+  content: "▦";
 }
 .icon-file-video::before {
-  content: "\e03b";
+  content: "🎬";
 }
 .icon-folder-add::before {
   content: "\e03c";
@@ -106,3 +103,6 @@
 .icon-check-mark-circle-two::before {
   content: "\e073";
 }
+.icon-file-calendar::before {
+  content: "📅";
+}
diff --git a/vendors/jua/jua.js b/vendors/jua/jua.js
index 0f8724143..84ff57a59 100644
--- a/vendors/jua/jua.js
+++ b/vendors/jua/jua.js
@@ -44,11 +44,9 @@
 		{
 			return oFile.size
 				? {
-					FileName: (oFile.name || '').replace(/^.*\/([^/]*)$/, '$1'),
-					Size: oFile.size,
-					Type: oFile.type,
-					Folder: '',
-					File : oFile
+					fileName: (oFile.name || '').replace(/^.*\/([^/]*)$/, '$1'),
+					size: oFile.size,
+					file: oFile
 				}
 				: null; // Folder
 		},
@@ -233,7 +231,7 @@
 		 */
 		uploadTask(sUid, oFileInfo)
 		{
-			if (false === this.oUids[sUid] || !oFileInfo || !oFileInfo['File'])
+			if (false === this.oUids[sUid] || !oFileInfo || !oFileInfo.file)
 			{
 				return false;
 			}
@@ -285,7 +283,7 @@
 
 				fStartFunction && fStartFunction(sUid);
 
-				oFormData.append(this.options.name, oFileInfo['File']);
+				oFormData.append(this.options.name, oFileInfo.file);
 
 				oXhr.send(oFormData);
 
@@ -329,11 +327,9 @@
 						getDataFromFiles(oInput.files, fFileCallback, limit);
 					} else {
 						fFileCallback({
-							FileName: oInput.value.split(/\\\//).pop(),
-							Size: null,
-							Type: null,
-							Folder: '',
-							File : null
+							fileName: oInput.value.split(/\\\//).pop(),
+							size: null,
+							file : null
 						});
 					}
 				});
diff --git a/vendors/knockout/build/fragments/extern-post.js b/vendors/knockout/build/fragments/extern-post.js
index 9652d073b..7011c1a5d 100644
--- a/vendors/knockout/build/fragments/extern-post.js
+++ b/vendors/knockout/build/fragments/extern-post.js
@@ -1,2 +1,2 @@
-	window['ko'] = koExports;
+    window['ko'] = ko;
 })(this);
diff --git a/vendors/knockout/build/fragments/extern-pre.js b/vendors/knockout/build/fragments/extern-pre.js
index 19e295221..9bb21fae1 100644
--- a/vendors/knockout/build/fragments/extern-pre.js
+++ b/vendors/knockout/build/fragments/extern-pre.js
@@ -1,5 +1,4 @@
 (window => {
     // (0, eval)('this') is a robust way of getting a reference to the global object
     // For details, see http://stackoverflow.com/questions/14119988/return-this-0-evalthis/14120023#14120023
-    var document = window['document'],
-        koExports = {};
+    var document = window['document'];
diff --git a/vendors/knockout/build/fragments/source-references.js b/vendors/knockout/build/fragments/source-references.js
index 1229585af..71edd3e1f 100644
--- a/vendors/knockout/build/fragments/source-references.js
+++ b/vendors/knockout/build/fragments/source-references.js
@@ -1,7 +1,7 @@
 knockoutDebugCallback([
     'src/namespace.js',
     'src/google-closure-compiler-utils.js',
-    'src/version.js',
+//    'src/version.js',
 //    'src/options.js',
     'src/utils.js',
     'src/utils.domData.js',
@@ -27,7 +27,7 @@ knockoutDebugCallback([
 //    'src/components/customElements.js',
     'src/components/componentBinding.js',
     'src/binding/defaultBindings/attr.js',
-//    'src/binding/defaultBindings/checked.js',
+    'src/binding/defaultBindings/checked.js',
     'src/binding/defaultBindings/css.js',
     'src/binding/defaultBindings/enableDisable.js',
     'src/binding/defaultBindings/event.js',
diff --git a/vendors/knockout/build/output/knockout-latest.debug.js b/vendors/knockout/build/output/knockout-latest.debug.js
index 3a5ee51e5..09cabb73d 100644
--- a/vendors/knockout/build/output/knockout-latest.debug.js
+++ b/vendors/knockout/build/output/knockout-latest.debug.js
@@ -7,11 +7,10 @@
 (window => {
     // (0, eval)('this') is a robust way of getting a reference to the global object
     // For details, see http://stackoverflow.com/questions/14119988/return-this-0-evalthis/14120023#14120023
-    var document = window['document'],
-        koExports = {};
+    var document = window['document'];
 // Internally, all KO objects are attached to koExports (even the non-exported ones whose names will be minified by the closure compiler).
 // In the future, the following "ko" variable may be made distinct from "koExports" so that private objects are not externally reachable.
-var ko = typeof koExports !== 'undefined' ? koExports : {};
+const ko = {};
 // Google Closure Compiler helpers (used only to make the minified file smaller)
 ko.exportSymbol = (koPath, object) => {
     var tokens = koPath.split(".");
@@ -24,14 +23,15 @@ ko.exportSymbol = (koPath, object) => {
         target = target[tokens[i]];
     target[tokens[l]] = object;
 };
-ko.exportProperty = (owner, publicName, object) => owner[publicName] = object;
-ko.exportSymbol('version', "3.5.1-sm");
 ko.utils = {
     extend: (target, source) => source ? Object.assign(target, source) : target,
 
     objectForEach: (obj, action) => obj && Object.entries(obj).forEach(prop => action(prop[0], prop[1])),
 
     emptyDomNode: domNode => [...domNode.childNodes].forEach(child => ko.removeNode(child)),
+//    emptyDomNode: domNode => {while (domNode.lastChild) ko.removeNode(domNode.lastChild)},
+    // Safari 14+
+//    emptyDomNode: domNode => domNode.replaceChildren(),
 
     moveCleanedNodesToContainerElement: nodes => {
         // Ensure it's a real array, as we're about to reparent the nodes and
@@ -50,6 +50,7 @@ ko.utils = {
             : node => node.cloneNode(true)),
 
     setDomNodeChildren: (domNode, childNodes) => {
+//        domNode.replaceChildren(...childNodes);
         ko.utils.emptyDomNode(domNode);
         childNodes && domNode.append(...childNodes);
     },
@@ -109,7 +110,7 @@ ko.utils = {
 
     triggerEvent: (element, eventType) => {
         if (!element?.nodeType)
-            throw new Error("element must be a DOM node when calling triggerEvent");
+            throw Error("element must be a DOM node when calling triggerEvent");
 
         element.dispatchEvent(new Event(eventType));
     },
@@ -117,10 +118,10 @@ ko.utils = {
     unwrapObservable: value => ko.isObservable(value) ? value() : value,
 
     setTextContent: (element, textContent) =>
-        element.textContent = ko.utils.unwrapObservable(textContent) || ""
+        element.textContent = ko.utils.unwrapObservable(textContent)
 };
 
-ko.exportSymbol('utils', ko.utils);
+//ko.exportSymbol('utils', ko.utils);
 ko.exportSymbol('unwrap', ko.utils.unwrapObservable); // Convenient shorthand, because this is used so commonly
 (() => {
 
@@ -138,7 +139,7 @@ ko.utils.domData = {
         }
         return value;
     },
-    getOrSet: function(node, key, value) {
+    getOrSet(node, key, value) {
         return this.get(node, key) || this.set(node, key, value);
     },
     clear: node => dataStore.delete(node),
@@ -196,7 +197,7 @@ ko.utils.domNodeDisposal = (() => {
     return {
         addDisposeCallback : (node, callback) => {
             if (typeof callback != "function")
-                throw new Error("Callback must be a function");
+                throw Error("Callback must be a function");
             getDisposeCallbacksCollection(node, 1).add(callback);
         },
 
@@ -231,24 +232,12 @@ ko.utils.domNodeDisposal = (() => {
 })();
 ko.cleanNode = ko.utils.domNodeDisposal.cleanNode; // Shorthand name for convenience
 ko.removeNode = ko.utils.domNodeDisposal.removeNode; // Shorthand name for convenience
-ko.exportSymbol('utils.domNodeDisposal', ko.utils.domNodeDisposal);
-ko.exportSymbol('utils.domNodeDisposal.addDisposeCallback', ko.utils.domNodeDisposal.addDisposeCallback);
-ko.extenders = {
+//ko.exportSymbol('utils.domNodeDisposal', ko.utils.domNodeDisposal);
+ko.exportSymbol('addDisposeCallback', ko.utils.domNodeDisposal.addDisposeCallback);
+ko['extenders'] = {
     'debounce': (target, timeout) => target.limit(callback => debounce(callback, timeout)),
 
-    'rateLimit': (target, options) => {
-        var timeout, method, limitFunction;
-
-        if (typeof options == 'number') {
-            timeout = options;
-        } else {
-            timeout = options['timeout'];
-            method = options['method'];
-        }
-
-        limitFunction = typeof method == 'function' ? method : throttle;
-        target.limit(callback => limitFunction(callback, timeout, options));
-    },
+    'rateLimit': (target, timeout) => target.limit(callback => throttle(callback, timeout)),
 
     'notify': (target, notifyWhen) => {
         target.equalityComparer = notifyWhen == "always" ?
@@ -257,9 +246,8 @@ ko.extenders = {
     }
 };
 
-var primitiveTypes = { 'undefined':1, 'boolean':1, 'number':1, 'string':1 };
 function valuesArePrimitiveAndEqual(a, b) {
-    return (a === null || primitiveTypes[typeof(a)]) ? (a === b) : false;
+    return a === b && a !== Object(a);
 }
 
 function throttle(callback, timeout) {
@@ -282,8 +270,6 @@ function debounce(callback, timeout) {
     };
 }
 
-ko.exportSymbol('extenders', ko.extenders);
-
 class koSubscription
 {
     constructor (target, callback, disposeCallback) {
@@ -293,10 +279,9 @@ class koSubscription
         this._isDisposed = false;
         this._node = null;
         this._domNodeDisposalCallback = null;
-        ko.exportProperty(this, 'dispose', this.dispose);
     }
 
-    dispose() {
+    'dispose'() {
         var self = this;
         if (!self._isDisposed) {
             self._domNodeDisposalCallback
@@ -311,25 +296,29 @@ class koSubscription
     disposeWhenNodeIsRemoved(node) {
         // MutationObserver ?
         this._node = node;
-        ko.utils.domNodeDisposal.addDisposeCallback(node, this._domNodeDisposalCallback = this.dispose.bind(this));
+        ko.utils.domNodeDisposal.addDisposeCallback(node, this._domNodeDisposalCallback = this['dispose'].bind(this));
     }
 }
 
 ko.subscribable = function () {
     Object.setPrototypeOf(this, ko_subscribable_fn);
-    ko_subscribable_fn.init(this);
+    ko_subscribable_fn['init'](this);
 }
 
 var defaultEvent = "change";
 
+//const IS_SUBSCRIBABLE = Symbol('IS_SUBSCRIBABLE');
+
 var ko_subscribable_fn = {
-    init: instance => {
+//    [IS_SUBSCRIBABLE]: 1,
+
+    'init': instance => {
         instance._subscriptions = new Map();
         instance._subscriptions.set("change", new Set);
         instance._versionNumber = 1;
     },
 
-    subscribe: function (callback, callbackTarget, event) {
+    'subscribe'(callback, callbackTarget, event) {
         var self = this;
 
         event = event || defaultEvent;
@@ -348,7 +337,7 @@ var ko_subscribable_fn = {
         return subscription;
     },
 
-    notifySubscribers: function (valueToNotify, event) {
+    notifySubscribers(valueToNotify, event) {
         event = event || defaultEvent;
         if (event === defaultEvent) {
             this.updateVersion();
@@ -368,19 +357,19 @@ var ko_subscribable_fn = {
         }
     },
 
-    getVersion: function () {
+    getVersion() {
         return this._versionNumber;
     },
 
-    hasChanged: function (versionToCheck) {
+    hasChanged(versionToCheck) {
         return this.getVersion() !== versionToCheck;
     },
 
-    updateVersion: function () {
+    updateVersion() {
         ++this._versionNumber;
     },
 
-    limit: function(limitFunction) {
+    limit(limitFunction) {
         var self = this, selfIsObservable = ko.isObservable(self),
             ignoreBeforeChange, notifyNextChange, previousValue, pendingValue, didUpdate,
             beforeChange = 'beforeChange';
@@ -441,21 +430,21 @@ var ko_subscribable_fn = {
         };
     },
 
-    hasSubscriptionsForEvent: function(event) {
+    hasSubscriptionsForEvent(event) {
         return (this._subscriptions.get(event) || []).size;
     },
 
-    isDifferent: function(oldValue, newValue) {
+    isDifferent(oldValue, newValue) {
         return !this.equalityComparer || !this.equalityComparer(oldValue, newValue);
     },
 
     toString: () => '[object Object]',
 
-    extend: function(requestedExtenders) {
+    'extend'(requestedExtenders) {
         var target = this;
         if (requestedExtenders) {
             ko.utils.objectForEach(requestedExtenders, (key, value) => {
-                var extenderHandler = ko.extenders[key];
+                var extenderHandler = ko['extenders'][key];
                 if (typeof extenderHandler == 'function') {
                     target = extenderHandler(target, value) || target;
                 }
@@ -465,23 +454,17 @@ var ko_subscribable_fn = {
     }
 };
 
-ko.exportProperty(ko_subscribable_fn, 'init', ko_subscribable_fn.init);
-ko.exportProperty(ko_subscribable_fn, 'subscribe', ko_subscribable_fn.subscribe);
-ko.exportProperty(ko_subscribable_fn, 'extend', ko_subscribable_fn.extend);
-
 // For browsers that support proto assignment, we overwrite the prototype of each
 // observable instance. Since observables are functions, we need Function.prototype
 // to still be in the prototype chain.
-Object.setPrototypeOf(ko_subscribable_fn, Function.prototype);
-
-ko.subscribable['fn'] = ko_subscribable_fn;
-
+ko.subscribable['fn'] = Object.setPrototypeOf(ko_subscribable_fn, Function.prototype);
 
+//ko.isSubscribable = obj => !!(obj && obj[IS_SUBSCRIBABLE]);
 ko.isSubscribable = instance =>
-    typeof instance?.subscribe == "function" && typeof instance.notifySubscribers == "function";
+    typeof instance?.['subscribe'] == "function" && typeof instance.notifySubscribers == "function";
 (() => {
 
-var outerFrames = [],
+let outerFrames = [],
     currentFrame,
     lastId = 0,
 
@@ -500,13 +483,13 @@ ko.dependencyDetection = {
     registerDependency: subscribable => {
         if (currentFrame) {
             if (!ko.isSubscribable(subscribable))
-                throw new Error("Only subscribable things can act as dependencies");
+                throw Error("Only subscribable things can act as dependencies");
             currentFrame.callback.call(currentFrame.callbackTarget, subscribable,
                 subscribable._id || (subscribable._id = ++lastId));
         }
     },
 
-    ignore: (callback, callbackTarget, callbackArgs) => {
+    ignore(callback, callbackTarget, callbackArgs) {
         try {
             begin();
             return callback.apply(callbackTarget, callbackArgs || []);
@@ -525,6 +508,7 @@ ko.dependencyDetection = {
 })();
 const observableLatestValue = Symbol('_latestValue'),
     length = 'length';
+//const IS_OBSERVABLE = Symbol('IS_OBSERVABLE');
 
 ko.observable = initialValue => {
     function observable() {
@@ -535,7 +519,7 @@ ko.observable = initialValue => {
             if (observable.isDifferent(observable[observableLatestValue], arguments[0])) {
                 observable.valueWillMutate();
                 observable[observableLatestValue] = arguments[0];
-                observable.valueHasMutated();
+                observable['valueHasMutated']();
             }
             return this; // Permits chained assignments
         }
@@ -547,31 +531,30 @@ ko.observable = initialValue => {
     observable[observableLatestValue] = initialValue;
 
     Object.defineProperty(observable, length, {
-        get: () => null == observable[observableLatestValue] ? undefined : observable[observableLatestValue][length]
+        get: () => observable[observableLatestValue]?.[length]
     });
 
     // Inherit from 'subscribable'
-    ko.subscribable['fn'].init(observable);
+    ko.subscribable['fn']['init'](observable);
 
     // Inherit from 'observable'
-    Object.setPrototypeOf(observable, observableFn);
-
-    return observable;
+    return Object.setPrototypeOf(observable, observableFn);
 }
 
 // Define prototype for observables
 var observableFn = {
-    'toJSON': function() {
+//    [IS_OBSERVABLE]: 1,
+    'toJSON'() {
         let value = this[observableLatestValue];
         return value?.toJSON?.() || value;
     },
     equalityComparer: valuesArePrimitiveAndEqual,
-    peek: function() { return this[observableLatestValue]; },
-    valueHasMutated: function () {
+    peek() { return this[observableLatestValue]; },
+    'valueHasMutated'() {
         this.notifySubscribers(this[observableLatestValue], 'spectate');
         this.notifySubscribers(this[observableLatestValue]);
     },
-    valueWillMutate: function () { this.notifySubscribers(this[observableLatestValue], 'beforeChange'); }
+    valueWillMutate() { this.notifySubscribers(this[observableLatestValue], 'beforeChange'); }
 };
 
 // Note that for browsers that don't support proto assignment, the
@@ -581,6 +564,7 @@ Object.setPrototypeOf(observableFn, ko.subscribable['fn']);
 var protoProperty = ko.observable.protoProperty = '__ko_proto__';
 observableFn[protoProperty] = ko.observable;
 
+//ko.isObservable = obj => !!(obj && obj[IS_OBSERVABLE]);
 ko.isObservable = instance => {
     var proto = typeof instance == 'function' && instance[protoProperty];
     if (proto && proto !== observableFn[protoProperty] && proto !== ko.computed['fn'][protoProperty]) {
@@ -598,20 +582,22 @@ ko.isWriteableObservable = instance => {
 ko.exportSymbol('observable', ko.observable);
 ko.exportSymbol('isObservable', ko.isObservable);
 ko.exportSymbol('observable.fn', observableFn);
-ko.exportProperty(observableFn, 'valueHasMutated', observableFn.valueHasMutated);
-ko.observableArray = initialValues => {
+ko['observableArray'] = initialValues => {
     initialValues = initialValues || [];
 
-    if (typeof initialValues != 'object' || !('length' in initialValues))
-        throw new Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");
+    if (!Array.isArray(initialValues))
+        throw Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");
 
-    var result = ko.observable(initialValues);
-    Object.setPrototypeOf(result, ko.observableArray['fn']);
-    return result.extend({'trackArrayChanges':true});
+    return Object.setPrototypeOf(ko.observable(initialValues), ko['observableArray']['fn']).extend({'trackArrayChanges':true});
 };
 
-ko.observableArray['fn'] = {
-    'remove': function (valueOrPredicate) {
+const IS_OBSERVABLE_ARRAY = Symbol('IS_OBSERVABLE_ARRAY');
+
+// Note that for browsers that don't support proto assignment, the
+// inheritance chain is created manually in the ko.observableArray constructor
+ko['observableArray']['fn'] = Object.setPrototypeOf({
+    [IS_OBSERVABLE_ARRAY]: 1,
+    'remove'(valueOrPredicate) {
         var underlyingArray = this.peek();
         var removed = false;
         var predicate = typeof valueOrPredicate == "function" && !ko.isObservable(valueOrPredicate)
@@ -628,13 +614,9 @@ ko.observableArray['fn'] = {
                 underlyingArray.splice(i, 1);
             }
         }
-        removed && this.valueHasMutated();
+        removed && this['valueHasMutated']();
     }
-};
-
-// Note that for browsers that don't support proto assignment, the
-// inheritance chain is created manually in the ko.observableArray constructor
-Object.setPrototypeOf(ko.observableArray['fn'], ko.observable['fn']);
+}, ko.observable['fn']);
 
 // Populate ko.observableArray.fn with native arrays functions
 Object.getOwnPropertyNames(Array.prototype).forEach(methodName => {
@@ -645,36 +627,29 @@ Object.getOwnPropertyNames(Array.prototype).forEach(methodName => {
             // https://developer.mozilla.org/tr/docs/Web/JavaScript/Reference/Global_Objects/Array/prototype#mutator_methods
             // Important: Do not add any additional functions here that may reasonably be used to *read* data from the array
             // because we'll eval them without causing subscriptions, so ko.computed output could end up getting stale
-            ko.observableArray['fn'][methodName] = function (...args) {
+            ko['observableArray']['fn'][methodName] = function (...args) {
                 // Use "peek" to avoid creating a subscription in any computed that we're executing in the context of
                 // (for consistency with mutating regular observables)
                 var underlyingArray = this.peek();
                 this.valueWillMutate();
                 this.cacheDiffForKnownOperation(underlyingArray, methodName, args);
                 var methodCallResult = underlyingArray[methodName](...args);
-                this.valueHasMutated();
+                this['valueHasMutated']();
                 // The native sort and reverse methods return a reference to the array, but it makes more sense to return the observable array instead.
                 return methodCallResult === underlyingArray ? this : methodCallResult;
             };
         } else {
             // Accessor and Iteration methods
-            ko.observableArray['fn'][methodName] = function (...args) {
+            ko['observableArray']['fn'][methodName] = function (...args) {
                 return this()[methodName](...args);
             };
         }
     }
 });
 
-ko.isObservableArray = instance => {
-    return ko.isObservable(instance)
-        && typeof instance["remove"] == "function"
-        && typeof instance["push"] == "function";
-};
-
-ko.exportSymbol('observableArray', ko.observableArray);
-ko.exportSymbol('isObservableArray', ko.isObservableArray);
+ko['isObservableArray'] = obj => !!(obj && obj[IS_OBSERVABLE_ARRAY]);
 const arrayChangeEventName = 'arrayChange';
-ko.extenders['trackArrayChanges'] = (target, options) => {
+ko['extenders']['trackArrayChanges'] = (target, options) => {
     // Use the provided options--each call to trackArrayChanges overwrites the previously set options
     target.compareArrayOptions = {};
     if (typeof options == "object") {
@@ -706,37 +681,36 @@ ko.extenders['trackArrayChanges'] = (target, options) => {
     target.afterSubscriptionRemove = event => {
         underlyingAfterSubscriptionRemoveFunction?.call(target, event);
         if (event === arrayChangeEventName && !target.hasSubscriptionsForEvent(arrayChangeEventName)) {
-            changeSubscription?.dispose();
-            spectateSubscription?.dispose();
+            changeSubscription?.['dispose']();
+            spectateSubscription?.['dispose']();
             spectateSubscription = changeSubscription = null;
             trackingChanges = false;
             previousContents = undefined;
         }
     };
 
-    function trackChanges() {
+    function notifyChanges() {
+        if (pendingChanges) {
+            // Make a copy of the current contents and ensure it's an array
+            var currentContents = [].concat(target.peek() || []), changes;
 
-        function notifyChanges() {
-            if (pendingChanges) {
-                // Make a copy of the current contents and ensure it's an array
-                var currentContents = [].concat(target.peek() || []), changes;
+            // Compute the diff and issue notifications, but only if someone is listening
+            if (target.hasSubscriptionsForEvent(arrayChangeEventName)) {
+                changes = getChanges(previousContents, currentContents);
+            }
 
-                // Compute the diff and issue notifications, but only if someone is listening
-                if (target.hasSubscriptionsForEvent(arrayChangeEventName)) {
-                    changes = getChanges(previousContents, currentContents);
-                }
+            // Eliminate references to the old, removed items, so they can be GCed
+            previousContents = currentContents;
+            cachedDiff = null;
+            pendingChanges = 0;
 
-                // Eliminate references to the old, removed items, so they can be GCed
-                previousContents = currentContents;
-                cachedDiff = null;
-                pendingChanges = 0;
-
-                if (changes?.length) {
-                    target.notifySubscribers(changes, arrayChangeEventName);
-                }
+            if (changes?.length) {
+                target.notifySubscribers(changes, arrayChangeEventName);
             }
         }
+    }
 
+    function trackChanges() {
         if (trackingChanges) {
             // Whenever there's a new subscription and there are pending notifications, make sure all previous
             // subscriptions are notified of the change so that all subscriptions are in sync.
@@ -747,13 +721,13 @@ ko.extenders['trackArrayChanges'] = (target, options) => {
         trackingChanges = true;
 
         // Track how many times the array actually changed value
-        spectateSubscription = target.subscribe(() => ++pendingChanges, null, "spectate");
+        spectateSubscription = target['subscribe'](() => ++pendingChanges, null, "spectate");
 
         // Each time the array changes value, capture a clone so that on the next
         // change it's possible to produce a diff
         previousContents = [].concat(target.peek() || []);
         cachedDiff = null;
-        changeSubscription = target.subscribe(notifyChanges);
+        changeSubscription = target['subscribe'](notifyChanges);
     }
 
     function getChanges(previousContents, currentContents) {
@@ -777,16 +751,15 @@ ko.extenders['trackArrayChanges'] = (target, options) => {
         var diff = [],
             arrayLength = rawArray.length,
             argsLength = args.length,
-            offset = 0;
+            offset = 0,
+            pushDiff = (status, value, index) =>
+                diff[diff.length] = { 'status': status, 'value': value, 'index': index };
 
-        function pushDiff(status, value, index) {
-            return diff[diff.length] = { 'status': status, 'value': value, 'index': index };
-        }
         switch (operationName) {
             case 'push':
                 offset = arrayLength;
             case 'unshift':
-                for (let index = 0; index < argsLength; index++) {
+                for (let index = 0; index < argsLength; ++index) {
                     pushDiff('added', args[index], offset + index);
                 }
                 break;
@@ -848,8 +821,8 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
         pure: false,
         isSleeping: false,
         readFunction: options["read"],
-        disposeWhenNodeIsRemoved: options["disposeWhenNodeIsRemoved"] || options.disposeWhenNodeIsRemoved || null,
-        disposeWhen: options["disposeWhen"] || options.disposeWhen,
+        disposeWhenNodeIsRemoved: options.disposeWhenNodeIsRemoved || null,
+        disposeWhen: options.disposeWhen,
         domNodeDisposalCallback: null,
         dependencyTracking: {},
         dependenciesCount: 0,
@@ -859,7 +832,7 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
     function computedObservable() {
         if (arguments.length > 0) {
             if (typeof writeFunction !== "function") {
-                throw new Error("Cannot write a value to a ko.computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters.");
+                throw Error("Cannot write a value to a ko.computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters.");
             }
             // Writing a value
             writeFunction(...arguments);
@@ -877,7 +850,7 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
     computedObservable.hasWriteFunction = typeof writeFunction === "function";
 
     // Inherit from 'subscribable'
-    ko.subscribable['fn'].init(computedObservable);
+    ko.subscribable['fn']['init'](computedObservable);
 
     // Inherit from 'computed'
     Object.setPrototypeOf(computedObservable, computedFn);
@@ -910,7 +883,7 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
     // removed using ko.removeNode. But skip if isActive is false (there will never be any dependencies to dispose).
     if (state.disposeWhenNodeIsRemoved && computedObservable.isActive()) {
         ko.utils.domNodeDisposal.addDisposeCallback(state.disposeWhenNodeIsRemoved, state.domNodeDisposalCallback = () => {
-            computedObservable.dispose();
+            computedObservable['dispose']();
         });
     }
 
@@ -919,7 +892,7 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
 
 // Utility function that disposes a given dependencyTracking entry
 function computedDisposeDependencyCallback(id, entryToDispose) {
-    entryToDispose?.dispose?.();
+    entryToDispose?.['dispose']?.();
 }
 
 // This function gets called each time a dependency is detected while evaluating a computed.
@@ -966,10 +939,10 @@ function evaluateImmediate_CallReadThenEndDependencyDetection(state, dependencyD
 
 var computedFn = {
     equalityComparer: valuesArePrimitiveAndEqual,
-    getDependenciesCount: function () {
+    getDependenciesCount() {
         return this[computedState].dependenciesCount;
     },
-    getDependencies: function () {
+    getDependencies() {
         var dependencyTracking = this[computedState].dependencyTracking, dependentObservables = [];
 
         ko.utils.objectForEach(dependencyTracking, (id, dependency) =>
@@ -978,7 +951,7 @@ var computedFn = {
 
         return dependentObservables;
     },
-    hasAncestorDependency: function (obs) {
+    hasAncestorDependency(obs) {
         if (!this[computedState].dependenciesCount) {
             return false;
         }
@@ -986,7 +959,7 @@ var computedFn = {
         return dependencies.includes(obs)
             || !!dependencies.find(dep => dep.hasAncestorDependency && dep.hasAncestorDependency(obs));
     },
-    addDependencyTracking: function (id, target, trackingObj) {
+    addDependencyTracking(id, target, trackingObj) {
         if (this[computedState].pure && target === this) {
             throw Error("A 'pure' computed must not be called recursively");
         }
@@ -995,7 +968,7 @@ var computedFn = {
         trackingObj._order = this[computedState].dependenciesCount++;
         trackingObj._version = target.getVersion();
     },
-    haveDependenciesChanged: function () {
+    haveDependenciesChanged() {
         var id, dependency, dependencyTracking = this[computedState].dependencyTracking;
         for (id in dependencyTracking) {
             if (Object.prototype.hasOwnProperty.call(dependencyTracking, id)) {
@@ -1006,17 +979,17 @@ var computedFn = {
             }
         }
     },
-    markDirty: function () {
+    markDirty() {
         // Process "dirty" events if we can handle delayed notifications
         if (!this[computedState].isBeingEvaluated) {
             this._evalDelayed?.(false /*isChange*/);
         }
     },
-    isActive: function () {
+    isActive() {
         var state = this[computedState];
         return state.isDirty || state.dependenciesCount > 0;
     },
-    respondToChange: function () {
+    respondToChange() {
         // Ignore "change" events if we've already scheduled a delayed notification
         if (!this._notificationIsPending) {
             this.evaluatePossiblyAsync();
@@ -1024,24 +997,18 @@ var computedFn = {
             this[computedState].isStale = true;
         }
     },
-    subscribeToDependency: function (target) {
-        return target.subscribe(this.evaluatePossiblyAsync, this);
+    subscribeToDependency(target) {
+        return target['subscribe'](this.evaluatePossiblyAsync, this);
     },
-    evaluatePossiblyAsync: function () {
-        var computedObservable = this,
-            throttleEvaluationTimeout = computedObservable['throttleEvaluation'];
-        if (throttleEvaluationTimeout >= 0) {
-            clearTimeout(this[computedState].evaluationTimeoutInstance);
-            this[computedState].evaluationTimeoutInstance = setTimeout(() =>
-                computedObservable.evaluateImmediate(true /*notifyChange*/)
-            , throttleEvaluationTimeout);
-        } else if (computedObservable._evalDelayed) {
+    evaluatePossiblyAsync() {
+        var computedObservable = this;
+        if (computedObservable._evalDelayed) {
             computedObservable._evalDelayed(true /*isChange*/);
         } else {
             computedObservable.evaluateImmediate(true /*notifyChange*/);
         }
     },
-    evaluateImmediate: function (notifyChange) {
+    evaluateImmediate(notifyChange) {
         var computedObservable = this,
             state = computedObservable[computedState],
             disposeWhen = state.disposeWhen,
@@ -1060,7 +1027,7 @@ var computedFn = {
         if (state.disposeWhenNodeIsRemoved && !ko.utils.domNodeIsAttachedToDocument(state.disposeWhenNodeIsRemoved) || disposeWhen?.()) {
             // See comment above about suppressDisposalUntilDisposeWhenReturnsFalse
             if (!state.suppressDisposalUntilDisposeWhenReturnsFalse) {
-                computedObservable.dispose();
+                computedObservable['dispose']();
                 return;
             }
         } else {
@@ -1077,7 +1044,7 @@ var computedFn = {
 
         return changed;
     },
-    evaluateImmediate_CallReadWithDependencyDetection: function (notifyChange) {
+    evaluateImmediate_CallReadWithDependencyDetection(notifyChange) {
         // This function is really just part of the evaluateImmediate logic. You would never call it from anywhere else.
         // Factoring it out into a separate function means it can be independent of the try/catch block in evaluateImmediate,
         // which contributes to saving about 40% off the CPU overhead of computed evaluation (on V8 at least).
@@ -1108,7 +1075,7 @@ var computedFn = {
         var newValue = evaluateImmediate_CallReadThenEndDependencyDetection(state, dependencyDetectionContext);
 
         if (!state.dependenciesCount) {
-            computedObservable.dispose();
+            computedObservable['dispose']();
             changed = true; // When evaluation causes a disposal, make sure all dependent computeds get notified so they'll see the new state
         } else {
             changed = computedObservable.isDifferent(state.latestValue, newValue);
@@ -1139,7 +1106,7 @@ var computedFn = {
 
         return changed;
     },
-    peek: function (evaluate) {
+    peek(evaluate) {
         // By default, peek won't re-evaluate, except while the computed is sleeping.
         // Pass in true to evaluate if needed.
         var state = this[computedState];
@@ -1148,7 +1115,7 @@ var computedFn = {
         }
         return state.latestValue;
     },
-    limit: function (limitFunction) {
+    limit(limitFunction) {
         var self = this;
         // Override the limit function with one that delays evaluation as well
         ko.subscribable['fn'].limit.call(self, limitFunction);
@@ -1176,11 +1143,11 @@ var computedFn = {
             self._limitChange(self, !isChange /* isDirty */);
         };
     },
-    dispose: function () {
+    'dispose'() {
         var state = this[computedState];
         if (!state.isSleeping && state.dependencyTracking) {
             ko.utils.objectForEach(state.dependencyTracking, (id, dependency) =>
-                dependency.dispose?.()
+                dependency['dispose']?.()
             );
         }
         if (state.disposeWhenNodeIsRemoved && state.domNodeDisposalCallback) {
@@ -1199,7 +1166,7 @@ var computedFn = {
 };
 
 var pureComputedOverrides = {
-    beforeSubscriptionAdd: function (event) {
+    beforeSubscriptionAdd(event) {
         // If asleep, wake up the computed by subscribing to any dependencies.
         var computedObservable = this,
             state = computedObservable[computedState];
@@ -1238,24 +1205,24 @@ var pureComputedOverrides = {
             }
         }
     },
-    afterSubscriptionRemove: function (event) {
+    afterSubscriptionRemove(event) {
         var state = this[computedState];
         if (!state.isDisposed && event == 'change' && !this.hasSubscriptionsForEvent('change')) {
             ko.utils.objectForEach(state.dependencyTracking, (id, dependency) => {
-                if (dependency.dispose) {
+                if (dependency['dispose']) {
                     state.dependencyTracking[id] = {
                         _target: dependency._target,
                         _order: dependency._order,
                         _version: dependency._version
                     };
-                    dependency.dispose();
+                    dependency['dispose']();
                 }
             });
             state.isSleeping = true;
             this.notifySubscribers(undefined, "asleep");
         }
     },
-    getVersion: function () {
+    getVersion() {
         // Because a pure computed is not automatically updated while it is sleeping, we can't
         // simply return the version number. Instead, we check if any of the dependencies have
         // changed and conditionally re-evaluate the computed observable.
@@ -1274,11 +1241,10 @@ Object.setPrototypeOf(computedFn, ko.subscribable['fn']);
 // Set the proto values for ko.computed
 var protoProp = ko.observable.protoProperty; // == "__ko_proto__"
 computedFn[protoProp] = ko.computed;
+ko.computed['fn'] = computedFn;
 
 ko.exportSymbol('computed', ko.computed);
-ko.exportSymbol('isComputed', instance => (typeof instance == 'function' && instance[protoProp] === computedFn[protoProp]));
-ko.exportSymbol('computed.fn', computedFn);
-ko.exportProperty(computedFn, 'dispose', computedFn.dispose);
+ko['isComputed'] = instance => (typeof instance == 'function' && instance[protoProp] === computedFn[protoProp]);
 
 ko.pureComputed = (evaluatorFunctionOrOptions) => {
     if (typeof evaluatorFunctionOrOptions === 'function') {
@@ -1299,7 +1265,7 @@ ko.selectExtensions = {
         switch (element.nodeName) {
             case 'OPTION':
                 return (element[hasDomDataExpandoProperty] === true)
-                    ? ko.utils.domData.get(element, ko.bindingHandlers.options.optionValueDomDataKey)
+                    ? ko.utils.domData.get(element, ko.bindingHandlers['options'].optionValueDomDataKey)
                     : element.value;
             case 'SELECT':
                 return element.selectedIndex >= 0
@@ -1310,17 +1276,17 @@ ko.selectExtensions = {
         }
     },
 
-    writeValue: (element, value, allowUnset) => {
+    writeValue: (element, value) => {
         switch (element.nodeName) {
             case 'OPTION':
                 if (typeof value === "string") {
-                    ko.utils.domData.set(element, ko.bindingHandlers.options.optionValueDomDataKey, undefined);
+                    ko.utils.domData.set(element, ko.bindingHandlers['options'].optionValueDomDataKey, undefined);
                     delete element[hasDomDataExpandoProperty];
                     element.value = value;
                 }
                 else {
                     // Store arbitrary object using DomData
-                    ko.utils.domData.set(element, ko.bindingHandlers.options.optionValueDomDataKey, value);
+                    ko.utils.domData.set(element, ko.bindingHandlers['options'].optionValueDomDataKey, value);
                     element[hasDomDataExpandoProperty] = true;
 
                     // Special treatment of numbers is just for backward compatibility. KO 1.2.1 wrote numerical values to element.value.
@@ -1329,7 +1295,7 @@ ko.selectExtensions = {
                 break;
             case 'SELECT':
                 // A blank string or null value will select the caption
-                var selection = -1, noValue = ("" === value || null == value),
+                var selection = -1, noValue = ("" === (value ?? "")),
                     i = element.options.length, optionValue;
                 while (i--) {
                     optionValue = ko.selectExtensions.readValue(element.options[i]);
@@ -1339,18 +1305,20 @@ ko.selectExtensions = {
                         break;
                     }
                 }
-                if (allowUnset || selection >= 0 || (noValue && element.size > 1)) {
+                if (selection >= 0 || (noValue && element.size > 1)) {
                     element.selectedIndex = selection;
                 }
                 break;
             default:
-                element.value = (value == null) ? "" : value;
+                element.value = value ?? "";
                 break;
         }
     }
 };
 ko.expressionRewriting = (() => {
-    var javaScriptReservedWords = ["true", "false", "null", "undefined"],
+    var
+/*
+        javaScriptReservedWords = ["true", "false", "null", "undefined"],
 
     // Matches something that can be assigned to--either an isolated identifier or something ending with a property accessor
     // This is designed to be simple and avoid false negatives, but could produce false positives (e.g., a+b.c).
@@ -1363,7 +1331,7 @@ ko.expressionRewriting = (() => {
             var match = expression.match(javaScriptAssignmentTarget);
             return match === null ? false : match[1] ? ('Object(' + match[1] + ')' + match[2]) : expression;
         },
-
+*/
     // The following regular expressions will be used to split an object-literal string into tokens
 
         specials = ',"\'`{}()/:[\\]',    // These characters have special meaning to the parser and must not appear in the middle of a token, except as part of a string.
@@ -1394,9 +1362,9 @@ ko.expressionRewriting = (() => {
         divisionLookBehind = /[\])"'A-Za-z0-9_$]+$/,
         keywordRegexLookBehind = {'in':1,'return':1,'typeof':1},
 
-        parseObjectLiteral = objectLiteralString => {
+        preProcessBindings = bindingsStringOrKeyValueArray => {
             // Trim leading and trailing spaces from the string
-            var str = ko.utils.stringTrim(objectLiteralString);
+            var str = ko.utils.stringTrim(bindingsStringOrKeyValueArray);
 
             // Trim braces '{' surrounding the whole object literal
             if (str.charCodeAt(0) === 123) str = str.slice(1, -1);
@@ -1415,7 +1383,10 @@ ko.expressionRewriting = (() => {
                     // A comma signals the end of a key/value pair if depth is zero
                     if (c === 44) { // ","
                         if (depth <= 0) {
-                            result.push((key && values.length) ? {key: key, value: values.join('')} : {'unknown': key || values.join('')});
+                            if (key && values.length) {
+                                // Values are wrapped in a function so that each value can be accessed independently
+                                result.push("'" + key + "':()=>(" + values.join('') + ")");
+                            }
                             key = depth = 0;
                             values = [];
                             continue;
@@ -1456,65 +1427,20 @@ ko.expressionRewriting = (() => {
                     throw Error("Unbalanced parentheses, braces, or brackets");
                 }
             }
-            return result;
-        },
 
-    // Two-way bindings include a write function that allow the handler to update the value even if it's not an observable.
-        twoWayBindings = new Set,
+            result.push("'$data':()=>$data");
 
-        preProcessBindings = (bindingsStringOrKeyValueArray, bindingOptions) => {
-
-            var resultStrings = [],
-                propertyAccessorResultStrings = [],
-                makeValueAccessors = bindingOptions?.['valueAccessors'],
-                bindingParams = bindingOptions?.['bindingParams'],
-                keyValueArray = typeof bindingsStringOrKeyValueArray === "string" ?
-                    parseObjectLiteral(bindingsStringOrKeyValueArray) : bindingsStringOrKeyValueArray,
-
-                processKeyValue = (key, val) => {
-                    var writableVal,
-                        callPreprocessHook = obj =>
-                            obj?.['preprocess'] ? (val = obj['preprocess'](val, key, processKeyValue)) : true;
-                    if (!bindingParams) {
-                        if (!callPreprocessHook(ko.bindingHandlers[key]))
-                            return;
-
-                        if (twoWayBindings.has(key) && (writableVal = getWriteableValue(val))) {
-                            // For two-way bindings, provide a write method in case the value
-                            // isn't a writable observable.
-                            propertyAccessorResultStrings.push("'" + key + "':function(_z){" + writableVal + "=_z}");
-                        }
-                    }
-                    // Values are wrapped in a function so that each value can be accessed independently
-                    if (makeValueAccessors) {
-                        val = 'function(){return ' + val + ' }';
-                    }
-                    resultStrings.push("'" + key + "':" + val);
-                };
-
-            keyValueArray.forEach(keyValue =>
-                processKeyValue(keyValue.key || keyValue['unknown'], keyValue.value)
-            );
-
-            if (propertyAccessorResultStrings.length)
-                processKeyValue('_ko_property_writers', "{" + propertyAccessorResultStrings.join(",") + " }");
-
-            return resultStrings.join(",");
+            return result.join(",");
         };
 
     return {
-        bindingRewriteValidators: [],
-
-        twoWayBindings: twoWayBindings,
-
-        parseObjectLiteral: parseObjectLiteral,
-
         preProcessBindings: preProcessBindings,
 
         keyValueArrayContainsKey: (keyValueArray, key) =>
             -1 < keyValueArray.findIndex(v => v['key'] == key),
 
         // Internal, private KO utility for updating model properties from within bindings
+        // element:             the HTML element it belongs to
         // property:            If the property being updated is (or might be) an observable, pass it here
         //                      If it turns out to be a writable observable, it will be written to directly
         // allBindings:         An object with a get method to retrieve bindings in the current execution context.
@@ -1523,9 +1449,11 @@ ko.expressionRewriting = (() => {
         // value:               The value to be written
         // checkIfDifferent:    If true, and if the property being written is a writable observable, the value will only be written if
         //                      it is !== existing value on that writable observable
-        writeValueToProperty: (property, allBindings, key, value, checkIfDifferent) => {
+        writeValueToProperty: (element, property, allBindings, key, value, checkIfDifferent) => {
             if (!property || !ko.isObservable(property)) {
-                allBindings.get('_ko_property_writers')?.[key]?.(value);
+                console.log(`"${key}" should contain observable in ${element.outerHTML.replace(/>.+/,'>')}`);
+//                ko.dataFor(element).key = value;
+                allBindings.get('$data')[key] = value;
             } else if (ko.isWriteableObservable(property) && (!checkIfDifferent || property.peek() !== value)) {
                 property(value);
             }
@@ -1575,7 +1503,7 @@ ko.expressionRewriting = (() => {
                 ++depth;
         }
         if (!allowUnbalanced)
-            throw new Error("Cannot find closing comment tag to match: " + startComment.nodeValue);
+            throw Error("Cannot find closing comment tag to match: " + startComment.nodeValue);
         return null;
     }
 
@@ -1610,17 +1538,15 @@ ko.expressionRewriting = (() => {
                 ko.utils.setDomNodeChildren(node, childNodes);
         },
 
-        prepend: (containerNode, nodeToPrepend) => {
-            // Start comments must always have a parent and at least one following sibling (the end comment)
-            isStartComment(containerNode)
-                ? containerNode.nextSibling.before(nodeToPrepend)
-                : containerNode.prepend(nodeToPrepend);
-        },
-
         insertAfter: (containerNode, nodeToInsert, insertAfterNode) => {
             insertAfterNode
                 ? insertAfterNode.after(nodeToInsert)
-                : ko.virtualElements.prepend(containerNode, nodeToInsert);
+                : (
+                    // Start comments must always have a parent and at least one following sibling (the end comment)
+                    isStartComment(containerNode)
+                        ? containerNode.nextSibling.before(nodeToInsert)
+                        : containerNode.prepend(nodeToInsert)
+                );
         },
 
         firstChild: node => {
@@ -1630,7 +1556,7 @@ ko.expressionRewriting = (() => {
             }
             let first = node.firstChild;
             if (first && isEndComment(first)) {
-                throw new Error("Found invalid end comment, as the first child of " + node);
+                throw Error("Found invalid end comment, as the first child of " + node);
             }
             return first;
         },
@@ -1688,19 +1614,40 @@ ko.bindingProvider = new class
         var bindingsString = getBindingsString(node);
         if (bindingsString) {
             try {
-                let options = { 'valueAccessors': true },
-                    cacheKey = bindingsString,
+                let cacheKey = bindingsString,
                     bindingFunction = bindingCache.get(cacheKey);
+/*
                 if (!bindingFunction) {
                     // Build the source for a function that evaluates "expression"
                     // For each scope variable, add an extra level of "with" nesting
                     // Example result: with(sc1) { with(sc0) { return (expression) } }
-                    var rewrittenBindings = ko.expressionRewriting.preProcessBindings(bindingsString, options),
-                        functionBody = "with($context){with($data||{}){return{" + rewrittenBindings + "}}}";
-                    bindingFunction = new Function("$context", "$element", functionBody);
+                    // Deprecated: with is no longer recommended
+                    var rewrittenBindings = ko.expressionRewriting.preProcessBindings(bindingsString),
+                        functionBody = "with($data){return{" + rewrittenBindings + "}}";
+                    bindingFunction = new Function("$context", "$root", "$parent", "$data", functionBody);
                     bindingCache.set(cacheKey, bindingFunction);
                 }
-                return bindingFunction(bindingContext, node);
+                return bindingFunction(bindingContext,
+                    bindingContext["$root"], bindingContext["$parent"], bindingContext["$data"] || {}
+                );
+*/
+                if (!bindingFunction) {
+                    // Build the source for a function that evaluates "expression"
+                    // Use one "with" that has one secure scope handling Proxy
+                    // Deprecated: with is no longer recommended
+                    bindingFunction = new Function("$context",
+                        "with($context){return{" + ko.expressionRewriting.preProcessBindings(bindingsString) + "}}");
+                    bindingCache.set(cacheKey, bindingFunction);
+                }
+                bindingContext = new Proxy(
+                    bindingContext,
+                    {
+                        has: () => true,
+//                        get: (target, key) => target['$data'][key] || target[key]
+                        get: (target, key) => Reflect.has(target['$data'], key) ? target['$data'][key] : target[key]
+                    }
+                );
+                return bindingFunction(bindingContext);
             } catch (ex) {
                 ex.message = "Unable to parse bindings.\nBindings value: " + bindingsString
                     + "\nMessage: " + ex.message;
@@ -1725,7 +1672,7 @@ ko.bindingHandlers = {};
 // The ko.bindingContext constructor is only called directly to create the root context. For child
 // contexts, use bindingContext.createChildContext or bindingContext.extend.
 ko.bindingContext = class {
-    constructor(dataItemOrAccessor, parentContext, dataItemAlias, extendCallback, options)
+    constructor(dataItemOrAccessor, parentContext, extendCallback, options)
     {
         var self = this,
             shouldInheritData = dataItemOrAccessor === inheritParentVm,
@@ -1754,13 +1701,7 @@ ko.bindingContext = class {
                     self[contextAncestorBindingInfo] = parentContext[contextAncestorBindingInfo];
                 }
             } else {
-                self['$parents'] = [];
                 self['$root'] = dataItem;
-
-                // Export 'ko' in the binding context so it will be available in bindings and templates
-                // even if 'ko' isn't exported as a global, such as when using an AMD loader.
-                // See https://github.com/SteveSanderson/knockout/issues/490
-                self['ko'] = ko;
             }
 
             self[contextSubscribable] = subscribable;
@@ -1768,13 +1709,9 @@ ko.bindingContext = class {
             if (shouldInheritData) {
                 dataItem = self['$data'];
             } else {
-                self['$rawData'] = dataItemOrObservable;
                 self['$data'] = dataItem;
             }
 
-            if (dataItemAlias)
-                self[dataItemAlias] = dataItem;
-
             // The extendCallback function is provided when creating a child context or extending a context.
             // It handles the specific actions needed to finish setting up the binding context. Actions in this
             // function could also add dependencies to this binding context.
@@ -1819,21 +1756,11 @@ ko.bindingContext = class {
     // But this does not mean that the $data value of the child context will also get updated. If the child
     // view model also depends on the parent view model, you must provide a function that returns the correct
     // view model on each update.
-   'createChildContext'(dataItemOrAccessor, dataItemAlias, extendCallback, options) {
-        if (!options && dataItemAlias && typeof dataItemAlias == "object") {
-            options = dataItemAlias;
-            dataItemAlias = options['as'];
-            extendCallback = options['extend'];
-        }
-
-        return new ko.bindingContext(dataItemOrAccessor, this, dataItemAlias, (self, parentContext) => {
+   'createChildContext'(dataItemOrAccessor, options) {
+        return new ko.bindingContext(dataItemOrAccessor, this, (self, parentContext) => {
             // Extend the context hierarchy by setting the appropriate pointers
-            self['$parentContext'] = parentContext;
             self['$parent'] = parentContext['$data'];
-            self['$parents'] = (parentContext['$parents'] || []).slice(0);
-            self['$parents'].unshift(self['$parent']);
-            if (extendCallback)
-                extendCallback(self);
+            options['extend']?.(self);
         }, options);
     }
 
@@ -1841,20 +1768,20 @@ ko.bindingContext = class {
     // Similarly to "child" contexts, provide a function here to make sure that the correct values are set
     // when an observable view model is updated.
     'extend'(properties, options) {
-        return new ko.bindingContext(inheritParentVm, this, null, self =>
+        return new ko.bindingContext(inheritParentVm, this, self =>
             ko.utils.extend(self, typeof(properties) == "function" ? properties(self) : properties)
         , options);
     }
 };
 
-function asyncContextDispose(node) {
+const asyncContextDispose = node => {
     var bindingInfo = ko.utils.domData.get(node, boundElementDomDataKey),
         asyncContext = bindingInfo?.asyncContext;
     if (asyncContext) {
         bindingInfo.asyncContext = null;
         asyncContext.notifyAncestor();
     }
-}
+};
 
 class AsyncCompleteContext {
     constructor(node, bindingInfo, ancestorBindingInfo) {
@@ -1900,7 +1827,7 @@ ko.bindingEvent = {
         if (options?.['notifyImmediately'] && bindingInfo.notifiedEvents[event]) {
             ko.dependencyDetection.ignore(callback, context, [node]);
         }
-        return bindingInfo.eventSubscribable.subscribe(callback, context, event);
+        return bindingInfo.eventSubscribable['subscribe'](callback, context, event);
     },
 
     notify: (node, event) => {
@@ -1914,7 +1841,7 @@ ko.bindingEvent = {
                 } else if (bindingInfo.asyncContext === undefined && bindingInfo.eventSubscribable?.hasSubscriptionsForEvent(ko.bindingEvent.descendantsComplete)) {
                     // It's currently an error to register a descendantsComplete handler for a node that was never registered as completing asynchronously.
                     // That's because without the asyncContext, we don't have a way to know that all descendants have completed.
-                    throw new Error("descendantsComplete event not supported for bindings on this node");
+                    throw Error("descendantsComplete event not supported for bindings on this node");
                 }
             }
         }
@@ -1938,13 +1865,7 @@ ko.bindingEvent = {
     }
 };
 
-function validateThatBindingIsAllowedForVirtualElements(bindingName) {
-    var validator = ko.virtualElements.allowedBindings[bindingName];
-    if (!validator)
-        throw new Error("The binding '" + bindingName + "' cannot be used with virtual elements")
-}
-
-function applyBindingsToDescendantsInternal(bindingContext, elementOrVirtualElement) {
+const applyBindingsToDescendantsInternal = (bindingContext, elementOrVirtualElement) => {
     var currentChild, nextInQueue = ko.virtualElements.firstChild(elementOrVirtualElement);
 
     while (currentChild = nextInQueue) {
@@ -1953,18 +1874,16 @@ function applyBindingsToDescendantsInternal(bindingContext, elementOrVirtualElem
         applyBindingsToNodeAndDescendantsInternal(bindingContext, currentChild);
     }
     ko.bindingEvent.notify(elementOrVirtualElement, ko.bindingEvent.childrenComplete);
-}
+};
 
-function applyBindingsToNodeAndDescendantsInternal(bindingContext, nodeVerified) {
+const applyBindingsToNodeAndDescendantsInternal = (bindingContext, nodeVerified) => {
     var bindingContextForDescendants = bindingContext;
 
-    var isElement = (nodeVerified.nodeType === 1);
-
     // Perf optimisation: Apply bindings only if...
     // (1) We need to store the binding info for the node (all element nodes)
     // (2) It might have bindings (e.g., it has a data-bind attribute, or it's a marker for a containerless template)
-    if (isElement || ko.bindingProvider.nodeHasBindings(nodeVerified))
-        bindingContextForDescendants = applyBindingsToNodeInternal(nodeVerified, null, bindingContext)['bindingContextForDescendants'];
+    if ((1 === nodeVerified.nodeType) || ko.bindingProvider.nodeHasBindings(nodeVerified))
+        bindingContextForDescendants = applyBindingsToNodeInternal(nodeVerified, null, bindingContext);
 
     // Don't want bindings that operate on text nodes to mutate